Upstream version 20191121

3 files changed, 24 insertions, 39 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3c58f0124cf..36e174e208a1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,9 @@
-# Generated by mksrcinfo v8
-# Fri Jul 15 21:01:32 UTC 2016
 pkgbase = d1x-rebirth
 	pkgdesc = An enhanced engine to play with Descent1 data.
-	pkgver = 0.58.1
-	pkgrel = 2
+	pkgver = 20191121
+	pkgrel = 1
 	url = http://www.dxx-rebirth.com/
 	install = d1x-rebirth.install
-	arch = i686
 	arch = x86_64
 	license = custom:D1x
 	license = LGPL
@@ -19,12 +16,10 @@ pkgbase = d1x-rebirth
 	depends = physfs
 	noextract = d1xr-hires.dxa
 	noextract = d1xr-sc55-music.dxa
-	source = http://www.dxx-rebirth.com/download/dxx/d1x-rebirth_v0.58.1-src.tar.gz
-	source = d1x-rebirth.desktop
+	source = https://www.dxx-rebirth.com/download/dxx/rebirth/dxx-rebirth_20191121-src.tar.xz
 	source = http://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa
 	source = http://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa
-	md5sums = 8f43e66191fdedd0c7ff9278719accf1
-	md5sums = ded1f8c2deb3825134e1a984985684cb
+	md5sums = 049cae350eab9da1c3bb2561cedadf27
 	md5sums = 7d978ce3875995e54cbf426167e88b94
 	md5sums = bf54b45a648052b2531bbb95c001403b
 
diff --git a/PKGBUILD b/PKGBUILD
index b6cd7c0e1186..c8a56985f68f 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,45 @@
 # Contributor: zico <zico@dxx-rebirth.com>
+# Contributor: Dominic Radermacher <dominic.radermacher@gmail.com>
 # Maintainer: SanskritFritz (gmail)
 
 pkgname=d1x-rebirth
-pkgver=0.58.1
-pkgrel=2
+pkgver=20191121
+pkgrel=1
 pkgdesc="An enhanced engine to play with Descent1 data."
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.dxx-rebirth.com/"
 license=('custom:D1x' 'LGPL' 'custom:as-is')
 depends=('sdl' 'sdl_mixer' 'mesa' 'physfs')
 makedepends=('scons' 'unzip')
 install="$pkgname.install"
-source=("http://www.dxx-rebirth.com/download/dxx/${pkgname}_v${pkgver}-src.tar.gz"
-        "$pkgname.desktop"
+source=("https://www.dxx-rebirth.com/download/dxx/rebirth/dxx-rebirth_$pkgver-src.tar.xz"
         "http://www.dxx-rebirth.com/download/dxx/res/d1xr-hires.dxa"
         "http://www.dxx-rebirth.com/download/dxx/res/d1xr-sc55-music.dxa")
 noextract=("d1xr-hires.dxa" "d1xr-sc55-music.dxa")
-md5sums=('8f43e66191fdedd0c7ff9278719accf1'
-         'ded1f8c2deb3825134e1a984985684cb'
+md5sums=('049cae350eab9da1c3bb2561cedadf27'
          '7d978ce3875995e54cbf426167e88b94'
          'bf54b45a648052b2531bbb95c001403b')
 
 build() {
-	cd "$srcdir/${pkgname}_v${pkgver}-src"
+	cd "dxx-rebirth_$pkgver-src"
 	sed -ie "/^PREFIX =/s|/usr/local/|/usr/|" SConstruct
-	scons sharepath="/usr/share/$pkgname"
+	scons sharepath="/usr/share/$pkgname" d1x=1
 }
 
 package() {
 	mkdir -p "$pkgdir/usr/bin/"
-	mkdir -p "$pkgdir/usr/share/$pkgname/"
-	mkdir -p "$pkgdir/usr/share/pixmaps/"
-	mkdir -p "$pkgdir/usr/share/applications/"
-	mkdir -p "$pkgdir/usr/share/licenses/$pkgname/"
+	mkdir -p "$pkgdir/usr/share/$pkgname"
+	mkdir -p "$pkgdir/usr/share/pixmaps"
+	mkdir -p "$pkgdir/usr/share/applications"
+	mkdir -p "$pkgdir/usr/share/licenses/$pkgname"
 
-	cd $srcdir/${pkgname}_v${pkgver}-src
-	install -m755 "$pkgname" "$pkgdir/usr/bin/"
+	install -m755 "dxx-rebirth_$pkgver-src/d1x-rebirth/d1x-rebirth" "$pkgdir/usr/bin/"
 
-	install -m644 "$srcdir/${pkgname}_v${pkgver}-src/$pkgname.xpm" "$pkgdir/usr/share/pixmaps/"
-	install -m644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/"
-	install -m644 "$srcdir/${pkgname}_v${pkgver}-src/COPYING.txt" "$pkgdir/usr/share/licenses/$pkgname/"
-	install -m644 "$srcdir/d1xr-hires.dxa" "$pkgdir/usr/share/$pkgname/"
-	install -m644 "$srcdir/d1xr-sc55-music.dxa" "$pkgdir/usr/share/$pkgname/"
+	install -m644 "dxx-rebirth_$pkgver-src/d1x-rebirth/d1x-rebirth.xpm" "$pkgdir/usr/share/pixmaps/"
+
+	install -m644 "dxx-rebirth_$pkgver-src/d1x-rebirth/d1x-rebirth.desktop" "$pkgdir/usr/share/applications/"
+
+	install -m644 "dxx-rebirth_$pkgver-src/COPYING.txt" "$pkgdir/usr/share/licenses/$pkgname/"
+	install -m644 "d1xr-sc55-music.dxa" "$pkgdir/usr/share/$pkgname/"
+	install -m644 "d1xr-hires.dxa" "$pkgdir/usr/share/$pkgname/"
 } 
diff --git a/d1x-rebirth.desktop b/d1x-rebirth.desktop
deleted file mode 100755
index cc347e4a1479..000000000000
--- a/d1x-rebirth.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Categories=Game;ActionGame;
-Name=Descent 1 Rebirth 
-GenericName=FP Action Game
-Comment=First person action game controlling a ship with 6 degrees of freedom
-Comment[fr]=Jeu à la première personne où l'on contrôle un vaisseau qui permet de se déplacer avec 6 degrés de liberté
-Exec=d1x-rebirth
-Icon=d1x-rebirth