updated to latest git version (commit a02ad8b16...)

3 files changed, 31 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0f49f0b7151b..1c5e00a5f618 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = dxx-rebirth
 	pkgdesc = An enhanced engine to play Descent 1 / Descent 2
-	pkgver = 0.59.100
+	pkgver = 0.59.100.r1109.ga02ad8b16
 	pkgrel = 1
 	url = http://www.dxx-rebirth.com/
 	install = dxx-rebirth.install
@@ -19,11 +19,8 @@ pkgbase = dxx-rebirth
 	conflicts = d2x-rebirth
 	replaces = d1x-rebirth
 	replaces = d2x-rebirth
-	noextract = d2xr-sc55-music.dxa
-	source = http://www.dxx-rebirth.com/download/dxx/dxx-rebirth_v0.59.100-src.tar.gz
-	source = http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa
-	sha256sums = 6a1e1e589a007389df56efb9f7355efc36e7ea01e4c6af53b46ba1ec3f193355
-	sha256sums = ace152182c70b9a7ae6f911bddbc239566220a287ab5419cab260d5af739bf16
+	source = git+https://github.com/dxx-rebirth/dxx-rebirth.git
+	sha256sums = SKIP
 
 pkgname = dxx-rebirth
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..66f18a68185c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+# package and signature
+*pkg.tar.xz
+*pkg.tar.xz.sig
+# src and pkg dir
+src/
+pkg/
+# the cloned git repo as source
+dxx-rebirth/
diff --git a/PKGBUILD b/PKGBUILD
index 4a421614c434..51494ad7d1ca 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Dominic Radermacher <dominic.radermacher@gmail.com>
 
 pkgname=dxx-rebirth
-pkgver=0.59.100
+pkgver=0.59.100.r1109.ga02ad8b16
 pkgrel=1
 pkgdesc="An enhanced engine to play Descent 1 / Descent 2"
 arch=('i686' 'x86_64')
@@ -12,14 +12,19 @@ makedepends=('scons' 'unzip')
 conflicts=('d1x-rebirth' 'd2x-rebirth')
 replaces=('d1x-rebirth' 'd2x-rebirth')
 install=${pkgname}.install
-source=("http://www.dxx-rebirth.com/download/dxx/${pkgname}_v${pkgver}-src.tar.gz"
-        "http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa")
-noextract=("d2xr-sc55-music.dxa")
-sha256sums=('6a1e1e589a007389df56efb9f7355efc36e7ea01e4c6af53b46ba1ec3f193355'
-            'ace152182c70b9a7ae6f911bddbc239566220a287ab5419cab260d5af739bf16')
+source=(git+https://github.com/dxx-rebirth/dxx-rebirth.git)
+sha256sums=(SKIP)
+
+pkgver() {
+	cd "${srcdir}/${pkgname}"
+	( set -o pipefail
+	  git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//g' ||
+	  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	)
+}
 
 build() {
-	cd "${srcdir}/${pkgname}_v${pkgver}-src"
+	cd "${srcdir}/${pkgname}"
 	sed -ie "/^PREFIX =/s|/usr/local/|/usr/|" SConstruct
 	scons sharepath="/usr/share/${pkgname}"
 }
@@ -31,15 +36,15 @@ package() {
 	mkdir -p "${pkgdir}/usr/share/applications"
 	mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
 
-	install -m755 "${srcdir}/${pkgname}_v${pkgver}-src/d1x-rebirth/d1x-rebirth" "${pkgdir}/usr/bin/"
-	install -m755 "${srcdir}/${pkgname}_v${pkgver}-src/d2x-rebirth/d2x-rebirth" "${pkgdir}/usr/bin/"
+	install -m755 "${srcdir}/${pkgname}/d1x-rebirth/d1x-rebirth" "${pkgdir}/usr/bin/"
+	install -m755 "${srcdir}/${pkgname}/d2x-rebirth/d2x-rebirth" "${pkgdir}/usr/bin/"
 
-	install -m644 "${srcdir}/${pkgname}_v${pkgver}-src/d1x-rebirth/d1x-rebirth.xpm" "${pkgdir}/usr/share/pixmaps/"
-	install -m644 "${srcdir}/${pkgname}_v${pkgver}-src/d2x-rebirth/d2x-rebirth.xpm" "${pkgdir}/usr/share/pixmaps/"
+	install -m644 "${srcdir}/${pkgname}/d1x-rebirth/d1x-rebirth.xpm" "${pkgdir}/usr/share/pixmaps/"
+	install -m644 "${srcdir}/${pkgname}/d2x-rebirth/d2x-rebirth.xpm" "${pkgdir}/usr/share/pixmaps/"
 
-	install -m644 "${srcdir}/${pkgname}_v${pkgver}-src/d1x-rebirth/d1x-rebirth.desktop" "${pkgdir}/usr/share/applications/"
-	install -m644 "${srcdir}/${pkgname}_v${pkgver}-src/d2x-rebirth/d2x-rebirth.desktop" "${pkgdir}/usr/share/applications/"
+	install -m644 "${srcdir}/${pkgname}/d1x-rebirth/d1x-rebirth.desktop" "${pkgdir}/usr/share/applications/"
+	install -m644 "${srcdir}/${pkgname}/d2x-rebirth/d2x-rebirth.desktop" "${pkgdir}/usr/share/applications/"
 
-	install -m644 "${srcdir}/${pkgname}_v${pkgver}-src/COPYING.txt" "${pkgdir}/usr/share/licenses/$pkgname/"
-	install -m644 "${srcdir}/d2xr-sc55-music.dxa" "${pkgdir}/usr/share/${pkgname}/"
+	install -m644 "${srcdir}/${pkgname}/COPYING.txt" "${pkgdir}/usr/share/licenses/$pkgname/"
+#	install -m644 "${srcdir}/d2xr-sc55-music.dxa" "${pkgdir}/usr/share/${pkgname}/"
 }