Fix compilation and approach non-git PKGBUILD.

2 files changed, 69 insertions, 73 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 80efc00216c7..8a7110aa1e6c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,13 @@
-# Generated by mksrcinfo v8
-# Wed Oct 11 19:19:43 UTC 2017
 pkgbase = unvanquished-git
-	pkgdesc = A team-based, fast-paced, fps/rts hybrid game which pits aliens against humans. Bleeding edge version.
-	pkgver = v0.50.0.219.gac31a80c1
+	pkgdesc = A team-based, fast-paced, fps/rts hybrid game which pits aliens against humans. Git version.
+	pkgver = v0.51.1.108.g33ba53888
 	pkgrel = 1
-	url = http://www.unvanquished.net
+	url = https://www.unvanquished.net
 	install = unvanquished.install
 	arch = x86_64
-	arch = i686
 	license = GPL3
-	makedepends = git
 	makedepends = cmake
+	makedepends = git
 	makedepends = python2
 	makedepends = python2-yaml
 	makedepends = python2-jinja
@@ -44,12 +41,12 @@ pkgbase = unvanquished-git
 	backup = etc/conf.d/unvanquished.conf
 	backup = etc/unvanquished/server.cfg
 	backup = etc/unvanquished/maprotation.cfg
-	source = unvanquished-git::git+https://github.com/Unvanquished/Unvanquished.git#branch=master
 	source = unvanquished.install
-	source = https://dl.unvanquished.net/deps/linux32-4.tar.bz2
-	md5sums = SKIP
+	source = unvanquished-git::git+https://github.com/Unvanquished/Unvanquished.git#branch=master
+	source = naclsdk_linux64-4.tar.bz2::https://dl.unvanquished.net/deps/linux64-4.tar.bz2
 	md5sums = 6d9430b5b06b93a43a1cb79e14637f0b
-	md5sums = dd2cb5419bac9a1b81a8a996312e33ff
+	md5sums = SKIP
+	md5sums = 2ba12c71625919ddc282172b74fa4887
 
 pkgname = unvanquished-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 70f672f2b4ed..cd0248372299 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,16 @@
-# Contributor: Viech <viech unvanquished net>
+# Maintainer: Viech <viech unvanquished net>
+# Contributor: Baptiste Jonglez
 # Contributor: Gereon Schomber
 # Contributor: Martin F. Schumann
 
-# type of target to check out, 'branch' or 'tag'
-_type='branch'
-
-# either a branch or tag name, depending on _type
-_checkout='master'
-
 pkgname=unvanquished-git
-pkgver=v0.50.0.219.gac31a80c1
+pkgver=v0.51.1.108.g33ba53888
 pkgrel=1
-
-# set this to share more text with the non-git version
-_gitdir="${pkgname}"
-
-_depver="4"
-if test "$CARCH" == "x86_64"; then
-	_depbasename=linux64-${_depver}
-else
-	_depbasename=linux32-${_depver}
-fi
-_depname="${_depbasename}.tar.bz2"
-
-pkgdesc='A team-based, fast-paced, fps/rts hybrid game which pits aliens against humans. Bleeding edge version.'
-arch=('x86_64' 'i686')
-url='http://www.unvanquished.net'
+pkgdesc='A team-based, fast-paced, fps/rts hybrid game which pits aliens against humans. Git version.'
+arch=('x86_64')
+url='https://www.unvanquished.net'
 license=('GPL3')
-
-makedepends=('git' 'cmake' 'python2' 'python2-yaml' 'python2-jinja')
+makedepends=('cmake' 'git' 'python2' 'python2-yaml' 'python2-jinja')
 depends=('unvanquished-data'
          'zlib' 'gmp' 'nettle' 'geoip' 'curl' 'sdl2' 'glew' 'libpng'
          'libjpeg-turbo' 'libwebp>=0.2.0' 'freetype2' 'openal' 'libogg'
@@ -37,36 +19,56 @@ depends=('unvanquished-data'
 provides=('unvanquished')
 conflicts=('unvanquished')
 options=('emptydirs' '!strip')
-backup=('etc/conf.d/unvanquished.conf' 'etc/unvanquished/server.cfg' 'etc/unvanquished/maprotation.cfg')
-install='unvanquished.install'
-source=("${_gitdir}::git+https://github.com/Unvanquished/Unvanquished.git#${_type}=${_checkout}"
-        'unvanquished.install' "https://dl.unvanquished.net/deps/${_depname}")
+backup=('etc/conf.d/unvanquished.conf'
+        'etc/unvanquished/server.cfg'
+        'etc/unvanquished/maprotation.cfg')
+install=unvanquished.install
 
-pkgver() {
-	cd "${srcdir}/${_gitdir}"
+# Type of target to check out, 'branch' or 'tag'.
+_type='branch'
+
+# Either a branch or tag name, depending on _type.
+_checkout='master'
 
+# set this to share more text with the non-git version
+_unvdir="${pkgname}"
+
+# NaCL SDK is a buildtime dependency of Dæmon.
+# Note that due to enormous compile times, we use a binary distribution.
+_naclsdkbasever="4"
+_naclsdkver="linux64-${_naclsdkbasever}"
+
+source=('unvanquished.install'
+        "${_unvdir}::git+https://github.com/Unvanquished/Unvanquished.git#${_type}=${_checkout}"
+        "naclsdk_${_naclsdkver}.tar.bz2::https://dl.unvanquished.net/deps/${_naclsdkver}.tar.bz2")
+
+md5sums=('6d9430b5b06b93a43a1cb79e14637f0b'
+         'SKIP'
+         '2ba12c71625919ddc282172b74fa4887')
+
+pkgver() {
+	cd "${srcdir}/${_unvdir}"
 	local ver="$(git describe --long --match "v*")"
 	printf "%s" "${ver//-/.}"
 }
 
 prepare() {
+	cd "${srcdir}/${_unvdir}"
+
+	git submodule update --init --recursive
+
 	cd "${srcdir}"
 
-	cd "${_gitdir}"
-	git submodule init
-	git submodule update
-	cd ..
-	ln -sfr "${_depbasename}" -t "${_gitdir}/daemon/external_deps"
+	ln -sfr "${_naclsdkver}" "${_unvdir}/daemon/external_deps/${_naclsdkver}"
 }
 
 build() {
-	cd "${srcdir}/${_gitdir}"
+	cd "${srcdir}/${_unvdir}"
 
-	#cp -r "${srcdir}/${_depbasename}" external_deps/
 	mkdir -p build
 	cd build
 
-	cmake -D BUILD_GAME_NACL=OFF -D BUILD_GAME_NATIVE_DLL=OFF -D BUILD_GAME_NATIVE_EXE=OFF ..
+	cmake -D BUILD_CGAME=OFF -D BUILD_SGAME=OFF ..
 	make
 }
 
@@ -74,25 +76,30 @@ package() {
 	# create installation directories
 	cd "${pkgdir}"
 
-	install -dm755 etc/conf.d \
-	               etc/unvanquished \
-	               usr/bin \
-	               usr/lib/systemd/system \
-	               usr/lib/unvanquished \
-	               usr/share/applications \
-	               usr/share/icons/hicolor/128x128/apps \
-	               usr/share/licenses/unvanquished \
-	               usr/share/unvanquished/pkg \
-	               var/lib/unvanquished-server/config \
-	               var/lib/unvanquished-server/game
+	install -dm755 \
+		etc/conf.d \
+		etc/unvanquished \
+		usr/bin \
+		usr/lib/systemd/system \
+		usr/lib/unvanquished \
+		usr/share/applications \
+		usr/share/icons/hicolor/{32x32,64x64,128x128,256x256,512x512}/apps \
+		usr/share/licenses/unvanquished \
+		usr/share/unvanquished/pkg \
+		var/lib/unvanquished-server/config \
+		var/lib/unvanquished-server/game
 
 	# install content
-	cd "${srcdir}/${_gitdir}"
+	cd "${srcdir}/${_unvdir}"
+
+	for size in 32x32 64x64 128x128 256x256 512x512; do
+		install -m 644 "dist/icons/${size}/unvanquished.png" \
+			"${pkgdir}/usr/share/icons/hicolor/${size}/apps/"
+	done
 
-	install -m 644 debian/unvanquished.png "${pkgdir}/usr/share/icons/hicolor/128x128/apps/"
 	install -m 644 COPYING.txt             "${pkgdir}/usr/share/licenses/unvanquished/"
 
-	cd "${srcdir}/${_gitdir}/build"
+	cd "${srcdir}/${_unvdir}/build"
 
 	install -m 755 daemon                  "${pkgdir}/usr/lib/unvanquished/"
 	install -m 755 daemonded               "${pkgdir}/usr/lib/unvanquished/"
@@ -102,7 +109,7 @@ package() {
 	install -m 755 nacl_loader             "${pkgdir}/usr/lib/unvanquished/"
 
 	# install starters and dedicated server config
-	cd "${srcdir}/${_gitdir}/archlinux"
+	cd "${srcdir}/${_unvdir}/archlinux"
 
 	install -m 755 unvanquished.sh         "${pkgdir}/usr/bin/unvanquished"
 	install -m 755 unvanquished-tty.sh     "${pkgdir}/usr/bin/unvanquished-tty"
@@ -121,11 +128,3 @@ package() {
 
 	ln -s ../../../../etc/unvanquished/maprotation.cfg .
 }
-
-md5sums=('SKIP'
-         '6d9430b5b06b93a43a1cb79e14637f0b')
-if test "$CARCH" == "x86_64"; then
-	md5sums+=('2ba12c71625919ddc282172b74fa4887')
-else
-	md5sums+=('dd2cb5419bac9a1b81a8a996312e33ff')
-fi