Change to LixD

2 files changed, 46 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1775623bfa11..0039fe17a4c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,32 @@
 # Generated by mksrcinfo v8
-# Fri Jun  3 17:50:02 UTC 2016
+# Thu Apr  6 12:42:05 UTC 2017
 pkgbase = lix-git
-	pkgdesc = An action-puzzle game in the IRS (Interactive Rodent Simulation) genre inspired by Lemmings
-	pkgver = 2016.06.02.r0.g64c9b94
+	pkgdesc = An action-puzzle game inspired by Lemmings
+	pkgver = r856.524b41b
 	pkgrel = 1
-	url = http://asdfasdf.ethz.ch/~simon/index.php
+	url = http://www.lixgame.com/
 	install = lix-git.install
 	changelog = .CHANGELOG
 	arch = i686
 	arch = x86_64
 	license = custom:CC0
 	makedepends = gendesk
-	depends = allegro4
+	makedepends = dmd
+	makedepends = dub
+	depends = allegro
 	depends = enet
 	depends = libpng
+	depends = zlib
+	depends = libvorbis
+	depends = freetype2
 	provides = lix
 	conflicts = lix
-	source = lix-git::git://github.com/SimonN/Lix.git
-	source = lix-logo.png::http://asdfasdf.ethz.ch/~simon/bitmap/lix_with_lem.png
+	source = lix-git::git://github.com/SimonN/LixD.git
+	source = lix-logo.png::https://www.holarse-linuxgaming.de/sites/default/files/imagecache/screenshots/2012-01-22-932/lix_with_lem.png
 	source = lix.sh
-	source = lix-server.sh
 	sha512sums = SKIP
-	sha512sums = f116accf767391710ccc44d8fc41b3bdf67b1af2e81c9f08175973f4fa3aa59ef8af460bc1ebf9e9f0b50a44f67628085994348708c6c9db96da8c97551ee33f
+	sha512sums = 15cfddcdc3b97e61a32763c2410601d5579aeee0900d8175053cc098dce12dd4c3508d2f6c690f77048ebb8d5b617f86374d8e97ba0a6a166b782c177293025c
 	sha512sums = 82fdaa227c9a86a55a02e6f0409f39c9f72e26e956d55b593df3d7fd4c5368ce904868b1603acb1a17ea502c0d5a26586ccbae7c67bb377b204b5b0d3f5455be
-	sha512sums = 081d6bddf6256f3d641ead7cf934ad5e88f220b8f9f7f6aa8ee85d4cce42858c6f60ba14111823834d7925e93d46b5838ca98d3b985a501a8ad757632b8e6e88
 
 pkgname = lix-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 2f6e2a247b79..46310b237882 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,31 +3,33 @@
 
 pkgname=lix-git
 _pkgname=lix
-pkgver=2016.06.02.r0.g64c9b94
+pkgver=r856.524b41b
 pkgrel=1
-pkgdesc="An action-puzzle game in the IRS (Interactive Rodent Simulation) genre inspired by Lemmings"
+pkgdesc="An action-puzzle game inspired by Lemmings"
 arch=('i686' 'x86_64')
-url="http://asdfasdf.ethz.ch/~simon/index.php"
+url="http://www.lixgame.com/"
 license=('custom:CC0')
 changelog=.CHANGELOG
 install=${pkgname}.install
-depends=('allegro4' 'enet' 'libpng')
-makedepends=('gendesk')
+depends=('allegro' 'enet' 'libpng' 'zlib' 'libvorbis' 'freetype2')
+makedepends=('gendesk' 'dmd' 'dub')
 provides=('lix')
 conflicts=('lix')
-source=(${pkgname}::git://github.com/SimonN/Lix.git
-	${_pkgname}-logo.png::http://asdfasdf.ethz.ch/~simon/bitmap/lix_with_lem.png
-	${_pkgname}.sh
-	${_pkgname}-server.sh)
+source=(${pkgname}::git://github.com/SimonN/LixD.git
+	${_pkgname}-logo.png::https://www.holarse-linuxgaming.de/sites/default/files/imagecache/screenshots/2012-01-22-932/lix_with_lem.png
+	${_pkgname}.sh)
 sha512sums=('SKIP'
-            'f116accf767391710ccc44d8fc41b3bdf67b1af2e81c9f08175973f4fa3aa59ef8af460bc1ebf9e9f0b50a44f67628085994348708c6c9db96da8c97551ee33f'
-            '82fdaa227c9a86a55a02e6f0409f39c9f72e26e956d55b593df3d7fd4c5368ce904868b1603acb1a17ea502c0d5a26586ccbae7c67bb377b204b5b0d3f5455be'
-            '081d6bddf6256f3d641ead7cf934ad5e88f220b8f9f7f6aa8ee85d4cce42858c6f60ba14111823834d7925e93d46b5838ca98d3b985a501a8ad757632b8e6e88')
+            '15cfddcdc3b97e61a32763c2410601d5579aeee0900d8175053cc098dce12dd4c3508d2f6c690f77048ebb8d5b617f86374d8e97ba0a6a166b782c177293025c'
+            '82fdaa227c9a86a55a02e6f0409f39c9f72e26e956d55b593df3d7fd4c5368ce904868b1603acb1a17ea502c0d5a26586ccbae7c67bb377b204b5b0d3f5455be')
 
 pkgver()
 {
+	# https://wiki.archlinux.org/index.php/VCS_package_guidelines#Git
 	cd "${srcdir}/${pkgname}"
-	git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+	( set -o pipefail
+		git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+		printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	)
 }
 
 prepare()
@@ -37,26 +39,35 @@ prepare()
 
 	# update .CHANGELOG
 	git -C "${srcdir}/${pkgname}" log --graph -10 > "${startdir}/.CHANGELOG"
+	
+	# Force an upgrade of the dependencies
+	cd "${srcdir}/${pkgname}"
+	dub upgrade --cache=local
+	dub add-local allegro-*/allegro
+	dub add-local derelict-enet-*/derelict-enet
+	dub add-local derelict-util-*/derelict-util
+	dub add-local enumap-*/enumap
 }
 
 build()
 {
 	cd "${srcdir}/${pkgname}"
-	make
+	dub build -b release-nobounds --cache=local
+	dub remove-local allegro-*/allegro
+	dub remove-local derelict-enet-*/derelict-enet
+	dub remove-local derelict-util-*/derelict-util
+	dub remove-local enumap-*/enumap
 }
 
 package()
 {
 	install -Dm644 "${srcdir}/${pkgname}/doc/copying.txt" "${pkgdir}/usr/share/licenses/${_pkgname}/COPYING"
 	install -Dm755 "${srcdir}/${_pkgname}.sh" "${pkgdir}/usr/bin/${_pkgname}"
-	install -Dm755 "${srcdir}/${_pkgname}-server.sh" "${pkgdir}/usr/bin/${_pkgname}-server"
-	install -Dm755 "${srcdir}/${pkgname}/bin/${_pkgname}" "${pkgdir}/opt/${_pkgname}/bin/${_pkgname}"
-	install -Dm755 "${srcdir}/${pkgname}/bin/lixd" "${pkgdir}/opt/${_pkgname}/bin/lixd"
 	install -Dm644 "${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
 	install -Dm644 "${srcdir}/${_pkgname}-logo.png" "${pkgdir}/usr/share/pixmaps/${_pkgname}.png"
-
-	cp -R "${srcdir}/${pkgname}/data/" "${srcdir}/${pkgname}/doc/" "${srcdir}/${pkgname}/levels/" "${srcdir}/${pkgname}/images/" "${pkgdir}/opt/${_pkgname}/"
-	mkdir "${pkgdir}/opt/${_pkgname}/replays"
-	chown :games "${pkgdir}/opt/${_pkgname}/data" "${pkgdir}/opt/${_pkgname}/replays" "${pkgdir}/opt/${_pkgname}/levels" "${pkgdir}/opt/${_pkgname}/images" "${pkgdir}/opt/${_pkgname}/data/user"
-	chmod 775 "${pkgdir}/opt/${_pkgname}/data" "${pkgdir}/opt/${_pkgname}/replays" "${pkgdir}/opt/${_pkgname}/levels" "${pkgdir}/opt/${_pkgname}/images" "${pkgdir}/opt/${_pkgname}/data/user"
+	
+	mkdir -p "${pkgdir}/opt/${_pkgname}" "${pkgdir}/opt/${_pkgname}/replays" #"${pkgdir}/opt/${_pkgname}/data/user"
+	cp -R "${srcdir}/${pkgname}/bin/" "${srcdir}/${pkgname}/data/" "${srcdir}/${pkgname}/doc/" "${srcdir}/${pkgname}/levels/" "${srcdir}/${pkgname}/images/" "${pkgdir}/opt/${_pkgname}/"
+	chown :games "${pkgdir}/opt/${_pkgname}/data" "${pkgdir}/opt/${_pkgname}/levels" "${pkgdir}/opt/${_pkgname}/images" "${pkgdir}/opt/${_pkgname}/replays" #"${pkgdir}/opt/${_pkgname}/data/user"
+	chmod 775 "${pkgdir}/opt/${_pkgname}/data" "${pkgdir}/opt/${_pkgname}/levels" "${pkgdir}/opt/${_pkgname}/images" "${pkgdir}/opt/${_pkgname}/replays" #"${pkgdir}/opt/${_pkgname}/data/user"
 }