games/warzone2100: updated for version 3.4.0

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

2 files changed, 23 insertions, 28 deletions

diff --git a/games/warzone2100/warzone2100.SlackBuild b/games/warzone2100/warzone2100.SlackBuild
index c9f033a4884a..ed16befad905 100644
--- a/games/warzone2100/warzone2100.SlackBuild
+++ b/games/warzone2100/warzone2100.SlackBuild
@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=warzone2100
-VERSION=${VERSION:-3.3.0}
+VERSION=${VERSION:-3.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,16 +42,16 @@ PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
-  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686 -Wno-error=maybe-uninitialized"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686 -Wno-error=maybe-uninitialized"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
+  SLKCFLAGS="-O2 -fPIC -Wno-error=maybe-uninitialized"
   LIBDIRSUFFIX="64"
 else
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -Wno-error=maybe-uninitialized"
   LIBDIRSUFFIX=""
 fi
 
@@ -60,7 +60,7 @@ set -e
 rm -rf $PKG $TMP/$PRGNAM-$VERSION
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$PRGNAM-${VERSION}_src.tar.?z
+tar xvf $CWD/${PRGNAM}_src.tar.?z
 cd $PRGNAM
 chown -R root:root .
 find -L . \
@@ -69,24 +69,19 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-./autogen.sh
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS -fpermissive" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --sysconfdir=/etc \
-  --localstatedir=/var \
-  --docdir=/usr/doc/$PRGNAM-$VERSION \
-  --with-distributor=Slackware \
-  --build=$ARCH-slackware-linux
+mkdir -p build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release \
+	-GNinja ..
+  DESTDIR=$PKG cmake --build . --target install
+cd ..
 
-make
-make install-strip DESTDIR=$PKG
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+# find $PKG/usr/share/man -type f -exec gzip -9 {} \;
+# for i in $( find $PKG/usr/share/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
 find $PKG -name perllocal.pod \
   -o -name ".packlist" \
@@ -97,7 +92,7 @@ find $PKG -name perllocal.pod \
 mv $PKG/usr/share/icons $PKG/usr/share/pixmaps
 
 # --docdir= above works :)
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/share/doc/$PRGNAM/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/games/warzone2100/warzone2100.info b/games/warzone2100/warzone2100.info
index 098af855c749..06d259c33418 100644
--- a/games/warzone2100/warzone2100.info
+++ b/games/warzone2100/warzone2100.info
@@ -1,10 +1,10 @@
 PRGNAM="warzone2100"
-VERSION="3.3.0"
+VERSION="3.4.0"
 HOMEPAGE="http://wz2100.net"
-DOWNLOAD="https://downloads.sourceforge.net/project/warzone2100/releases/3.3.0/warzone2100-3.3.0_src.tar.xz"
-MD5SUM="665f03234b4a5e1be69eb71d1da2a1bc"
+DOWNLOAD="https://github.com/Warzone2100/warzone2100/releases/download/3.4.0/warzone2100_src.tar.xz"
+MD5SUM="0d0548862689f00e271613b91657a0f0"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="OpenAL physfs SDL2 qt5"
+REQUIRES="OpenAL physfs SDL2 qt5 libsodium"
 MAINTAINER="Yth - Arnaud"
 EMAIL="yth@ythogtha.org"