Upstream version 20191121

3 files changed, 26 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7bc415d40e2a..ea8204672a4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,11 @@
-# Generated by mksrcinfo v8
-# Fri Jul 15 21:08:40 UTC 2016
 pkgbase = d2x-rebirth
 	pkgdesc = An enhanced engine to play with Descent2 data.
-	pkgver = 0.58.1
-	pkgrel = 2
+	pkgver = 20191121
+	pkgrel = 1
 	url = http://www.dxx-rebirth.com/
 	install = d2x-rebirth.install
-	arch = i686
 	arch = x86_64
-	license = custom:D1x
+	license = custom:D2x
 	license = LGPL
 	license = custom:as-is
 	makedepends = scons
@@ -18,11 +15,9 @@ pkgbase = d2x-rebirth
 	depends = mesa
 	depends = physfs
 	noextract = d2xr-sc55-music.dxa
-	source = http://www.dxx-rebirth.com/download/dxx/d2x-rebirth_v0.58.1-src.tar.gz
-	source = d2x-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/d2xr-sc55-music.dxa
-	md5sums = 584187fdd922d732e47a64451085eaca
-	md5sums = 3771fe1979a98ed32e7a9c9be8aa80a6
+	md5sums = 049cae350eab9da1c3bb2561cedadf27
 	md5sums = b5bd2bea4cf904d54bddad36222aa92f
 
 pkgname = d2x-rebirth
diff --git a/PKGBUILD b/PKGBUILD
index 2c79fcb33bd1..09fcd41b6d66 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,42 +1,42 @@
 # Contributor : zico <zico@dxx-rebirth.com>
+# Contributor: Dominic Radermacher <dominic.radermacher@gmail.com>
 # Maintainer: SanskritFritz (gmail)
 
 pkgname=d2x-rebirth
-pkgver=0.58.1
-pkgrel=2
+pkgver=20191121
+pkgrel=1
 pkgdesc="An enhanced engine to play with Descent2 data."
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://www.dxx-rebirth.com/"
-license=('custom:D1x' 'LGPL' 'custom:as-is')
+license=('custom:D2x' '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"
+install="$pkgname.install"
+source=("https://www.dxx-rebirth.com/download/dxx/rebirth/dxx-rebirth_$pkgver-src.tar.xz"
         "http://www.dxx-rebirth.com/download/dxx/res/d2xr-sc55-music.dxa")
 noextract=("d2xr-sc55-music.dxa")
-md5sums=('584187fdd922d732e47a64451085eaca'
-         '3771fe1979a98ed32e7a9c9be8aa80a6'
+md5sums=('049cae350eab9da1c3bb2561cedadf27'
          'b5bd2bea4cf904d54bddad36222aa92f')
 
 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" d2x=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/d2x-rebirth/d2x-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/d2xr-sc55-music.dxa" "$pkgdir/usr/share/$pkgname/"
+	install -m644 "dxx-rebirth_$pkgver-src/d2x-rebirth/d2x-rebirth.xpm" "$pkgdir/usr/share/pixmaps/"
+
+	install -m644 "dxx-rebirth_$pkgver-src/d2x-rebirth/d2x-rebirth.desktop" "$pkgdir/usr/share/applications/"
+
+	install -m644 "dxx-rebirth_$pkgver-src/COPYING.txt" "$pkgdir/usr/share/licenses/$pkgname/"
+	install -m644 "d2xr-sc55-music.dxa" "$pkgdir/usr/share/$pkgname/"
 } 
diff --git a/d2x-rebirth.desktop b/d2x-rebirth.desktop
deleted file mode 100755
index 25bc8ab4871e..000000000000
--- a/d2x-rebirth.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Type=Application
-Categories=Game;ActionGame;
-Name=Descent 2 X 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=d2x-rebirth
-Icon=d2x-rebirth