testing/xonotic{,-data}: update to 0.8.2

4 files changed, 106 insertions, 34 deletions

diff --git a/testing/xonotic-data/APKBUILD b/testing/xonotic-data/APKBUILD
index 135f21aeb10..3c132b41efc 100644
--- a/testing/xonotic-data/APKBUILD
+++ b/testing/xonotic-data/APKBUILD
@@ -2,25 +2,21 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: William Pitcock <nenolod@dereferenced.org>
 pkgname=xonotic-data
-pkgver=0.8.1
+pkgver=0.8.2
 pkgrel=0
 pkgdesc="Data files for Xonotic"
-url="http://www.xonotic.org/"
+url="https://www.xonotic.org/"
 arch="noarch"
 license="GPL-2.0-or-later"
 depends=""
-depends_dev=""
-makedepends="$depends_dev"
-install=""
-subpackages=""
-source="$pkgname-$pkgver.zip::http://dl.xonotic.org/${pkgname%-*}-${pkgver}.zip"
-
+makedepends=""
+options="!check"
+source="$pkgname-$pkgver.zip::https://dl.xonotic.org/${pkgname%-*}-${pkgver}.zip"
 builddir="$srcdir"/Xonotic
+
 package() {
 	mkdir -p "$pkgdir"/usr/share/xonotic/
 	mv "$srcdir"/Xonotic/data "$pkgdir"/usr/share/xonotic/
 }
 
-md5sums="f7a9cd8ab68a00336acca164f983b569  xonotic-data-0.8.1.zip"
-sha256sums="be8bcc41e2993a2f26d4d04c65a7eab810443bd98b11b45e482ffdbbf284c46f  xonotic-data-0.8.1.zip"
-sha512sums="adfce546257bdc7cfebe94f53eaa9cc9b19eaa546c6405e31ed6af080e3948732c960a024126202e5853cb98b955daadeeb5a96c602a6d4d83e284d3540214a4  xonotic-data-0.8.1.zip"
+sha512sums="0787fcf326827ae0292e5917c7ff2c7fd79947209d4b62e7f83b8b828bec15b575da304e0631f9f163c9b0bd93bed13616e142398ff08cbdaaea890a939dfca5  xonotic-data-0.8.2.zip"
diff --git a/testing/xonotic/APKBUILD b/testing/xonotic/APKBUILD
index 3687f701ec0..00cf9a9ff97 100644
--- a/testing/xonotic/APKBUILD
+++ b/testing/xonotic/APKBUILD
@@ -2,59 +2,113 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer:
 pkgname=xonotic
-pkgver=0.8.1
+pkgver=0.8.2
 pkgrel=0
-pkgdesc="Game engine for Xonotic (quake1/nexuiz derivative)"
-url="http://www.xonotic.org/"
+pkgdesc="A free, fast-paced crossplatform first-person shooter"
+url="https://www.xonotic.org/"
 arch="x86 x86_64"
 license="GPL-2.0-or-later"
 depends="xonotic-data"
-depends_dev=""
-makedepends="sdl-dev mesa-dev jpeg-dev libvorbis-dev libxpm-dev libxxf86dga-dev
-	libxxf86vm-dev libmodplug-dev libpng-dev alsa-lib-dev"
+makedepends="autoconf
+	automake
+	libtool
+	alsa-lib-dev
+	curl-dev
+	libjpeg-turbo-dev
+	libmodplug-dev
+	libvorbis-dev
+	libxpm-dev
+	libxxf86dga-dev
+	libxxf86vm-dev
+	sdl2-dev
+	libpng-dev
+	mesa-dev
+	gmp-dev"
 install=""
-subpackages="$pkgname-glx $pkgname-sdl"
+subpackages="$pkgname-server $pkgname-sdl $pkgname-glx"
+options="!check"
 source="$pkgname-$pkgver.zip::http://dl.xonotic.org/${pkgname}-${pkgver}-source.zip
-	xonotic-moncontrol.patch"
-
+	xonotic-moncontrol.patch
+	xonotic-sdl.desktop
+	xonotic-glx.desktop"
 builddir="$srcdir"/Xonotic
+
 build() {
-	# msg "building Xonotic-patched QuakeC compiler"
-	# make -C "$builddir"/source/fteqcc CPUOPTIMIZATIONS="${CFLAGS}"
+	cd "$builddir"
 
 	local r
-	for r in sv cl sdl; do
+	for r in sv sdl cl; do
 		make -C "$builddir"/source/darkplaces \
 			CPUOPTIMIZATIONS="$CFLAGS" \
 			DP_FS_BASEDIR="/usr/share/$pkgname" \
 			DP_LINK_TO_LIBJPEG=1 \
-			$r-release || return 1
+			"$r"-release
 	done
+
+	cd "$builddir"/source/d0_blind_id
+	sh autogen.sh
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
 }
 
 package() {
-	mkdir -p "$pkgdir"/usr/bin
+	cd "$builddir"/source/d0_blind_id
+	make DESTDIR="$pkgdir" install
+
+	cd "$pkgdir"/usr
+	rm -r include
+	cd lib
+	rm -r pkgconfig *.a
+
+	local size
+	for size in 16 22 24 32 48 64 128 256 512; do
+		install -Dm644 "$builddir"/misc/logos/icons_png/xonotic_"$size".png \
+			"$pkgdir"/usr/share/icons/hicolor/"$size"x"$size"/apps/xonotic.png
+	done
+}
+
+server() {
+	pkgdesc="$pkgdesc (Server)"
+	depends="xonotic"
+
+	mkdir -p "$subpkgdir"/usr/bin
 	install -Dm755 "$builddir"/source/darkplaces/darkplaces-dedicated \
-		"$pkgdir"/usr/bin/xonotic-dedicated || return 1
+		"$subpkgdir"/usr/bin/xonotic-dedicated
 }
 
 sdl() {
 	pkgdesc="$pkgdesc (SDL client)"
+	depends="xonotic"
+
 	mkdir -p "$subpkgdir"/usr/bin
 	install -Dm755 "$builddir"/source/darkplaces/darkplaces-sdl \
-		"$subpkgdir"/usr/bin/xonotic-sdl || return 1
+		"$subpkgdir"/usr/bin/xonotic-sdl
+
+	mkdir -p "$subpkgdir"/usr/share/applications
+	install -Dm644 "$srcdir"/xonotic-sdl.desktop \
+		"$subpkgdir"/usr/share/applications/xonotic-sdl.desktop
 }
 
 glx() {
 	pkgdesc="$pkgdesc (GLX client)"
+	depends="xonotic"
+
 	mkdir -p "$subpkgdir"/usr/bin
 	install -Dm755 "$builddir"/source/darkplaces/darkplaces-glx \
-		"$subpkgdir"/usr/bin/xonotic-glx || return 1
+		"$subpkgdir"/usr/bin/xonotic-glx
+
+	mkdir -p "$subpkgdir"/usr/share/applications
+	install -Dm644 "$srcdir"/xonotic-glx.desktop \
+		"$subpkgdir"/usr/share/applications/xonotic-glx.desktop
 }
 
-md5sums="8890191a21d2ea7b64447eee58b29f9f  xonotic-0.8.1.zip
-67b56ab2676cbc76c015fc889d7c23e3  xonotic-moncontrol.patch"
-sha256sums="c212e31fc1de2c0b49e439e222520a424daa15e87f92a526d9a0f52d0f6c62be  xonotic-0.8.1.zip
-b745ba7c58f3c18b53464f6142c1c4552bda1c131b796453c633b4a91892040e  xonotic-moncontrol.patch"
-sha512sums="50449e401672bee8cf90072c5d223d6e40548085dddee5101fd8cbe89cc892bdc25acfce755c6128feaccde449f1dd8e598457359e4dcbb3b49d9aed02c28716  xonotic-0.8.1.zip
-d74a1d1421dc68dbf46595510cea463382e69c8421110cd7b187419530dbfe9d262d9b65843b89b49aa91d9e32041e11941e411fe52f2dcb0ede18311ab821ec  xonotic-moncontrol.patch"
+sha512sums="1a803f3ebd2e1c3a2000e6b7a6ec0ab3a64c92a9c7b41c329a5054a51bb624a790a84bd6b3a344a59f3bd7bf18feecec0b39e2ddfc116c52ad85d22731a0fba0  xonotic-0.8.2.zip
+d74a1d1421dc68dbf46595510cea463382e69c8421110cd7b187419530dbfe9d262d9b65843b89b49aa91d9e32041e11941e411fe52f2dcb0ede18311ab821ec  xonotic-moncontrol.patch
+963273811453f713ab70f5d12b918c1513a9a7995cd1d2572f0b9060d945391bf7db4ae04ae586531ecf3a088f837803a66ac267d9285928d8b2e82c98b7158b  xonotic-sdl.desktop
+2e06d588d68d629a9690b4dd3372c7ad77b240afcd86cf0cdf2de15548d3feaa0e446df1a29339be4593d23bfcf389930bdd1d7021f1e2558d70bb15e28646bd  xonotic-glx.desktop"
diff --git a/testing/xonotic/xonotic-glx.desktop b/testing/xonotic/xonotic-glx.desktop
new file mode 100644
index 00000000000..ebce0e19632
--- /dev/null
+++ b/testing/xonotic/xonotic-glx.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=2.5
+Encoding=UTF-8
+Name=Xonotic (GLX)
+Comment=a free open-source first person shooter
+Icon=xonotic
+Exec=/usr/bin/xonotic-glx
+Terminal=false
+StartupNotify=false
+Categories=Game;
diff --git a/testing/xonotic/xonotic-sdl.desktop b/testing/xonotic/xonotic-sdl.desktop
new file mode 100644
index 00000000000..2c631916b24
--- /dev/null
+++ b/testing/xonotic/xonotic-sdl.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=2.5
+Encoding=UTF-8
+Name=Xonotic (SDL)
+Comment=a free open-source first person shooter
+Icon=xonotic
+Exec=/usr/bin/xonotic-sdl
+Terminal=false
+StartupNotify=false
+Categories=Game;