main/minetest: various fixes

- fix segfault due to JIT and PaX. Use shared lua instead of luajit
- clean up init.d script. rename to minitest-server
- use shared irrlicht
- move pre-install script to -server subpackage
- start with gameid 'minimal' by default for testing

1 files changed, 39 insertions, 19 deletions

diff --git a/main/minetest/APKBUILD b/main/minetest/APKBUILD
index 3b788734e34..c3e02f2b17f 100644
--- a/main/minetest/APKBUILD
+++ b/main/minetest/APKBUILD
@@ -2,19 +2,24 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=minetest
 pkgver=0.4.11
-pkgrel=0
+pkgrel=1
 pkgdesc="An infinite-world block sandbox game and a game engine"
 url="http://minetest.net/"
 arch="all"
-install="$pkgname.pre-install"
+install="$pkgname-server.pre-install"
 license="LGPL2.1 CCBY-SA3.0"
 depends="$pkgname-common"
+pkgusers="minetest"
+pkggroups="minetest"
 makedepends="sqlite-dev bzip2-dev openssl-dev irrlicht-dev cmake libvorbis-dev
-	libjpeg-turbo-dev libpng-dev openal-soft-dev libogg-dev mesa-dev sqlite-dev
-	luajit-dev hiredis-dev"
+	libjpeg-turbo-dev libpng-dev openal-soft-dev libogg-dev mesa-dev
+	sqlite-dev lua5.1-dev hiredis-dev"
 source="$pkgname-$pkgver.tar.gz::https://codeload.github.com/minetest/${pkgname}/tar.gz/${pkgver}
-	$pkgname.confd
-	$pkgname.initd
+	minetest-server.confd
+	minetest-server.initd
+
+	shared-lua.patch
+	shared-irrlicht.patch
 	"
 subpackages="$pkgname-doc $pkgname-common $pkgname-server"
 
@@ -37,9 +42,11 @@ build() {
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCUSTOM_DOCDIR="/usr/share/doc/${pkgname}" \
 		-DCUSTOM_SHAREDIR="/usr/share/${pkgname}" \
+		-DDISABLE_LUAJIT=1 \
 		-DBUILD_CLIENT=1 \
 		-DBUILD_SERVER=0 \
 		-DENABLE_REDIS=0 \
+		-DENABLE_CURL=0 \
 		-DRUN_IN_PLACE=0 \
 		..
 	make || return 1
@@ -49,9 +56,11 @@ build() {
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCUSTOM_DOCDIR="/usr/share/doc/minetest" \
 		-DCUSTOM_SHAREDIR="/usr/share/minetest" \
+		-DDISABLE_LUAJIT=1 \
 		-DBUILD_CLIENT=0 \
 		-DBUILD_SERVER=1 \
 		-DENABLE_REDIS=1 \
+		-DENABLE_CURL=0 \
 		-DRUN_IN_PLACE=0 \
 		..
 	make || return 1
@@ -59,9 +68,13 @@ build() {
 
 common() {
 	arch="noarch"
+	install -o minetest -g minetest -d "$subpkgdir"/var/lib/minetest \
+		|| return 1
 	mkdir -p "${subpkgdir}/usr/share/minetest"
-	mv "${pkgdir}/usr/share/minetest/builtin" "${subpkgdir}/usr/share/minetest" || return 1
-	mv "${pkgdir}/usr/share/minetest/games" "${subpkgdir}/usr/share/minetest" || return 1
+	mv "${pkgdir}/usr/share/minetest/builtin" \
+		"${subpkgdir}/usr/share/minetest" || return 1
+	mv "${pkgdir}/usr/share/minetest/games" \
+		"${subpkgdir}/usr/share/minetest" || return 1
 }
 
 package() {
@@ -72,20 +85,27 @@ package() {
 server(){
 	mkdir -p "${subpkgdir}/usr/bin"
 	cd "${_builddir}"
-	install -m644 -D $pkgname.conf.example "$subpkgdir"/etc/$pkgname/$pkgname.conf
-	install -D -m755 "$srcdir"/$pkgname.initd \
-		"$subpkgdir"/etc/init.d/$pkgname || return 1
-	install -D -m644 "$srcdir"/$pkgname.confd \
-		"$subpkgdir"/etc/conf.d/$pkgname || return 1
+	install -m644 -D $pkgname.conf.example \
+		"$subpkgdir"/etc/$pkgname/$pkgname.conf || return 1
+	install -D -m755 "$srcdir"/minetest-server.initd \
+		"$subpkgdir"/etc/init.d/minetest-server || return 1
+	install -D -m644 "$srcdir"/minetest-server.confd \
+		"$subpkgdir"/etc/conf.d/minetest-server || return 1
 	cp bin/minetestserver ${subpkgdir}/usr/bin
 }
 
 md5sums="c84858129b822a246f4b66a4a425d0fb  minetest-0.4.11.tar.gz
-89529d4af9bddc6504979404d609bb96  minetest.confd
-3da0c6a91862cdbfe70665a6ed300085  minetest.initd"
+505dcc499ba84632cc3a5db97e9d56b5  minetest-server.confd
+e450cb79ca74345149bf1c18f3c3ad98  minetest-server.initd
+9abfd27a3f46b4b004ed9418eef8820a  shared-lua.patch
+83ef89fa320627dffa464f113c3169e6  shared-irrlicht.patch"
 sha256sums="aefcd25589be923e5a9f4343f5062984438ee6f1dd617bce1ae6eef9b71e4240  minetest-0.4.11.tar.gz
-f1d54fc223b5330d7b6cf20e2a0b96cfb4f56ee236072d9379c63b0b11452178  minetest.confd
-7489226264d91452e6048d8ff99e0c9451f3b9976c22c502722d6b280a489bd5  minetest.initd"
+b8b02cdb070037fe4a0d01279edb9598ecfaa8bedf66ed991c6a00f2edbc5d7b  minetest-server.confd
+7b6a9bc535c8fbdd82e29256a5d2a4c4256635a6231c6c3824f9c01df6672552  minetest-server.initd
+444d406183c3e5c6139386bfc870faef7062067a2a1cb3250c3ef41f02ff9b94  shared-lua.patch
+12d03fb8f9523028dacd5fd45d74dfe901b6d659698cf90aafa8f164018f28cc  shared-irrlicht.patch"
 sha512sums="8dcc531d41c86b9c66723a35d3dd8757e6f7c79a609330fcd826c8f83929ea957ab6eecbb3bbc1fef532fdcacd61928a359b4296d39f445ce901a389a8e4c63c  minetest-0.4.11.tar.gz
-98c4cf9b9957f69a0ceae771b7c2173fb4c7e4ad636081b6cb52168cb7a26f7f7f61c885718a2241c6f6d652d8d43bc5989b5fab95e3bf9dce4dd423c6ca3ab0  minetest.confd
-5fe9de23f90cecbe74a6d096de3c6bb2bacc376cdcd412ce36586e2bdac31906a97804d3c59a5f1cc9942b4305ac2ba77caad74a78c4ccd03d1fba00244ca6b1  minetest.initd"
+7bca17dc0bd59db9c07c160677498aa09297026104e922bf93b7629c274d0aebd226af60c5e82f49ffe3cc5c1e4448e3798b6c2a44144fc6eca4d3aaed3384bb  minetest-server.confd
+5dd13febee19f2360269a505a0bd0e99bdee3af1532e8ffc51d4be627a1ca686f7ca44d923e13c88e76812a4bc2e4fdb964375e4db0dbff6cd523a83c88d1f47  minetest-server.initd
+0716ea12458533b5687d84ac6b3047d8b257b9c1ccef807586dee7ef392ffbd19157e04a63c67ce3d3f221111c5ff12c02e8f9b224a31a7653ebd3f073487e79  shared-lua.patch
+d737d076db32bf62df73f6568f7423511ee27573c08fb975c8d876f7cd56a8f942804ed667b9988f3048cb1efdb52fca0ae9a4f1ff1e912607c7d3765b6149e7  shared-irrlicht.patch"