games/d2x-rebirth: Updated for version 20220130_7258b7f.

Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 14 insertions, 64 deletions

diff --git a/games/d2x-rebirth/d2x-rebirth.SlackBuild b/games/d2x-rebirth/d2x-rebirth.SlackBuild
index d0d89ee7e3..cc460c2ab6 100644
--- a/games/d2x-rebirth/d2x-rebirth.SlackBuild
+++ b/games/d2x-rebirth/d2x-rebirth.SlackBuild
@@ -26,7 +26,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=d2x-rebirth
-VERSION=${VERSION:-0.58.1}
+SRCNAM=dxx-rebirth
+VERSION=${VERSION:-20220130_7258b7f}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -70,9 +71,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf ${PRGNAM}_v${VERSION}-src
-tar xvf $CWD/${PRGNAM}_v${VERSION}-src.tar.gz
-cd ${PRGNAM}_v${VERSION}-src
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.xz
+cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -80,25 +81,17 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-# Patch for the newer physfs
-patch -p1 < $CWD/libphysfs-3.0.1.patch
-
 # 'sharepath' is for the game-content data files, they can
 #  also perhaps more conveniently go in ~/.d2x-rebirth...
 scons CXXFLAGS="$SLKCFLAGS" \
-      CFLAGS="$SLKCFLAGS" \
       prefix=/usr \
-      sharepath=/usr/share/games/d2x-rebirth
+      sharepath=/usr/share/$PRGNAM \
+      d2x=1
 
 # DESTDIR does not work so we do it manually:
-mkdir -p $PKG/usr/bin
-mv $PRGNAM $PKG/usr/bin
-
-# It is a commandline program but perhaps somebody will use these:
-mkdir -p $PKG/usr/share/pixmaps
-mv d2x-rebirth.xpm $PKG/usr/share/pixmaps
-mkdir -p $PKG/usr/share/applications/
-mv d2x-rebirth.desktop $PKG/usr/share/applications/
+install -D -m 0755 build/$PRGNAM/$PRGNAM $PKG/usr/bin/$PRGNAM
+install -D -m 0644 $PRGNAM/$PRGNAM.xpm $PKG/usr/share/pixmaps/$PRGNAM.xpm
+install -D -m 0644 $PRGNAM/$PRGNAM.desktop $PKG/usr/share/applications/$PRGNAM.desktop
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -106,7 +99,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 # d2x.ini is a handy list of commandline options...
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  CHANGELOG.txt COPYING.txt INSTALL.txt README.txt RELEASE-NOTES.txt d2x.ini \
+  d2x-rebirth/{CHANGELOG.txt,RELEASE-NOTES.txt,d2x.ini} README.md COPYING* GPL* \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
diff --git a/games/d2x-rebirth/d2x-rebirth.info b/games/d2x-rebirth/d2x-rebirth.info
index da4a2ed0a2..4c1f7a9b2e 100644
--- a/games/d2x-rebirth/d2x-rebirth.info
+++ b/games/d2x-rebirth/d2x-rebirth.info
@@ -1,8 +1,8 @@
 PRGNAM="d2x-rebirth"
-VERSION="0.58.1"
+VERSION="20220130_7258b7f"
 HOMEPAGE="https://www.dxx-rebirth.com/"
-DOWNLOAD="https://www.dxx-rebirth.com/download/dxx/rebirth/d2x-rebirth_v0.58.1-src.tar.gz"
-MD5SUM="584187fdd922d732e47a64451085eaca"
+DOWNLOAD="https://ponce.cc/slackware/sources/repo/dxx-rebirth-20220130_7258b7f.tar.xz"
+MD5SUM="0aacba8e78a9a5cb5e52a5802604b13f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="physfs"
diff --git a/games/d2x-rebirth/libphysfs-3.0.1.patch b/games/d2x-rebirth/libphysfs-3.0.1.patch
deleted file mode 100644
index 082b8e9546..0000000000
--- a/games/d2x-rebirth/libphysfs-3.0.1.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: Markus Koschany <apo@debian.org>
-Bug-Debian: https://bugs.debian.org/881589
-
-Index: d2x-rebirth-0.58.1/include/physfsrwops.h
-===================================================================
---- d2x-rebirth-0.58.1.orig/include/physfsrwops.h
-+++ d2x-rebirth-0.58.1/include/physfsrwops.h
-@@ -44,7 +44,7 @@ extern "C" {
-  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
-  *           of the error can be gleaned from PHYSFS_getLastError().
-  */
--__EXPORT__ SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
-+PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openRead(const char *fname);
- 
- /**
-  * Open a platform-independent filename for writing, and make it accessible
-@@ -56,7 +56,7 @@ __EXPORT__ SDL_RWops *PHYSFSRWOPS_openRe
-  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
-  *           of the error can be gleaned from PHYSFS_getLastError().
-  */
--__EXPORT__ SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
-+PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openWrite(const char *fname);
- 
- /**
-  * Open a platform-independent filename for appending, and make it accessible
-@@ -68,7 +68,7 @@ __EXPORT__ SDL_RWops *PHYSFSRWOPS_openWr
-  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
-  *           of the error can be gleaned from PHYSFS_getLastError().
-  */
--__EXPORT__ SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
-+PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_openAppend(const char *fname);
- 
- /**
-  * Make a SDL_RWops from an existing PhysicsFS file handle. You should
-@@ -80,7 +80,7 @@ __EXPORT__ SDL_RWops *PHYSFSRWOPS_openAp
-  *  @return A valid SDL_RWops structure on success, NULL on error. Specifics
-  *           of the error can be gleaned from PHYSFS_getLastError().
-  */
--__EXPORT__ SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
-+PHYSFS_DECL SDL_RWops *PHYSFSRWOPS_makeRWops(PHYSFS_file *handle);
- 
- #ifdef __cplusplus
- }