games/devilutionx: Updated for version 1.4.1.

Signed-off-by: Dave Woodfall <dave@slackbuilds.org>

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

2 files changed, 9 insertions, 29 deletions

diff --git a/games/devilutionx/devilutionx.SlackBuild b/games/devilutionx/devilutionx.SlackBuild
index 862b46a14ec2..2ff203617097 100644
--- a/games/devilutionx/devilutionx.SlackBuild
+++ b/games/devilutionx/devilutionx.SlackBuild
@@ -26,13 +26,10 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=devilutionx
 SRCNAM=devilutionX
-VERSION=${VERSION:-1.4.0}
-ASIO=${ASIO:-ebeff99f539da23d27c2e8d4bdbc1ee011968644}
+VERSION=${VERSION:-1.4.1}
 LIBMPQ=${LIBMPQ:-0f10bd1600f406b13932bf5351ba713361262184}
 LIBSMACKERDEC=${LIBSMACKERDEC:-2997ee0e41e91bb723003bc09234be553b190e38}
-SIMPLEINI=${SIMPLEINI:-9b3ed7ec815997bc8c5b9edf140d6bde653e1458}
-SDLAUDIOLIB=${SDLAUDIOLIB:-1a69135313c79817b38a3a99826d4ac28d627fdf}
-LIBZT=${LIBZT:-a34ba7f1cc2e41b05badd25d1b01fdc5fd2f4e02}
+LIBZT=${LIBZT:-37a2efb0b925df632299ef07dc78c0af5f6b4756}
 ZEROTIERONE=${ZEROTIERONE:-7f026edea747525189da8d5a58b3a6ff59190246}
 LWIP=${LWIP:-32708c0a8b140efb545cc35101ee5fdeca6d6489}
 LWIPCONTRIB=${LWIPCONTRIB:-a57a8a213067912168baf978864a6f1adaacc042}
@@ -80,25 +77,16 @@ cd $TMP
 rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 
-mkdir -p $DEPS/asio-subbuild/asio-populate-prefix/src
 mkdir -p $DEPS/libmpq-subbuild/libmpq-populate-prefix/src
 mkdir -p $DEPS/libsmackerdec-subbuild/libsmackerdec-populate-prefix/src
-mkdir -p $DEPS/simpleini-subbuild/simpleini-populate-prefix/src
-mkdir -p $DEPS/sdl_audiolib-subbuild/sdl_audiolib-populate-prefix/src
 mkdir -p $DEPS/libzt-src/ext/ZeroTierOne
 mkdir -p $DEPS/libzt-src/ext/lwip
 mkdir -p $DEPS/libzt-src/ext/lwip-contrib
 
-tar xvf $CWD/asio-$ASIO.tar.gz -C \
-  $DEPS/asio-subbuild/asio-populate-prefix/src --strip-components 1
 tar xvf $CWD/libmpq-$LIBMPQ.tar.gz -C \
   $DEPS/libmpq-subbuild/libmpq-populate-prefix/src --strip-components 1
 tar xvf $CWD/libsmackerdec-$LIBSMACKERDEC.tar.gz -C \
   $DEPS/libsmackerdec-subbuild/libsmackerdec-populate-prefix/src --strip-components 1
-tar xvf $CWD/simpleini-$SIMPLEINI.tar.gz -C \
-  $DEPS/simpleini-subbuild/simpleini-populate-prefix/src --strip-components 1
-tar xvf $CWD/SDL_audiolib-$SDLAUDIOLIB.tar.gz -C \
-  $DEPS/sdl_audiolib-subbuild/sdl_audiolib-populate-prefix/src --strip-components 1
 tar xvf $CWD/libzt-$LIBZT.tar.gz -C \
   $DEPS/libzt-src --strip-components 1
 tar xvf $CWD/ZeroTierOne-$ZEROTIERONE.tar.gz -C \
@@ -121,15 +109,13 @@ cd build
     -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DBUILD_ASSETS_MPQ=ON \
     -DBUILD_TESTING=OFF \
     -DFETCHCONTENT_FULLY_DISCONNECTED=ON \
     -DFETCHCONTENT_QUIET=OFF \
-    -DFETCHCONTENT_SOURCE_DIR_ASIO=$DEPS/asio-subbuild/asio-populate-prefix/src \
     -DFETCHCONTENT_SOURCE_DIR_LIBMPQ=$DEPS/libmpq-subbuild/libmpq-populate-prefix/src \
     -DFETCHCONTENT_SOURCE_DIR_LIBSMACKERDEC=$DEPS/libsmackerdec-subbuild/libsmackerdec-populate-prefix/src \
     -DFETCHCONTENT_SOURCE_DIR_LIBZT=$DEPS/libzt-src \
-    -DFETCHCONTENT_SOURCE_DIR_SDL_AUDIOLIB=$DEPS/sdl_audiolib-subbuild/sdl_audiolib-populate-prefix/src \
-    -DFETCHCONTENT_SOURCE_DIR_SIMPLEINI=$DEPS/simpleini-subbuild/simpleini-populate-prefix/src \
     -DVERSION_NUM=${VERSION} \
     -DCMAKE_BUILD_TYPE=Release ..
   make
diff --git a/games/devilutionx/devilutionx.info b/games/devilutionx/devilutionx.info
index 6e9b780a1724..26c5fae9082d 100644
--- a/games/devilutionx/devilutionx.info
+++ b/games/devilutionx/devilutionx.info
@@ -1,28 +1,22 @@
 PRGNAM="devilutionx"
-VERSION="1.4.0"
+VERSION="1.4.1"
 HOMEPAGE="https://github.com/diasurgical/devilutionX"
-DOWNLOAD="https://github.com/diasurgical/devilutionX/archive/1.4.0/devilutionX-1.4.0.tar.gz \
-          https://github.com/diasurgical/asio/archive/ebeff99f539da23d27c2e8d4bdbc1ee011968644/asio-ebeff99f539da23d27c2e8d4bdbc1ee011968644.tar.gz \
+DOWNLOAD="https://github.com/diasurgical/devilutionX/archive/1.4.1/devilutionX-1.4.1.tar.gz \
           https://github.com/diasurgical/libmpq/archive/0f10bd1600f406b13932bf5351ba713361262184/libmpq-0f10bd1600f406b13932bf5351ba713361262184.tar.gz \
           https://github.com/diasurgical/libsmackerdec/archive/2997ee0e41e91bb723003bc09234be553b190e38/libsmackerdec-2997ee0e41e91bb723003bc09234be553b190e38.tar.gz \
-          https://github.com/brofield/simpleini/archive/9b3ed7ec815997bc8c5b9edf140d6bde653e1458/simpleini-9b3ed7ec815997bc8c5b9edf140d6bde653e1458.tar.gz \
-          https://github.com/realnc/SDL_audiolib/archive/1a69135313c79817b38a3a99826d4ac28d627fdf/SDL_audiolib-1a69135313c79817b38a3a99826d4ac28d627fdf.tar.gz \
-          https://github.com/diasurgical/libzt/archive/a34ba7f1cc2e41b05badd25d1b01fdc5fd2f4e02/libzt-a34ba7f1cc2e41b05badd25d1b01fdc5fd2f4e02.tar.gz \
+          https://github.com/diasurgical/libzt/archive/37a2efb0b925df632299ef07dc78c0af5f6b4756/libzt-37a2efb0b925df632299ef07dc78c0af5f6b4756.tar.gz \
           https://github.com/diasurgical/ZeroTierOne/archive/7f026edea747525189da8d5a58b3a6ff59190246/ZeroTierOne-7f026edea747525189da8d5a58b3a6ff59190246.tar.gz \
           https://github.com/joseph-henry/lwip/archive/32708c0a8b140efb545cc35101ee5fdeca6d6489/lwip-32708c0a8b140efb545cc35101ee5fdeca6d6489.tar.gz \
           https://github.com/diasurgical/lwip-contrib/archive/a57a8a213067912168baf978864a6f1adaacc042/lwip-contrib-a57a8a213067912168baf978864a6f1adaacc042.tar.gz"
-MD5SUM="7dcf76e68b5107400e29ef05b8c115c0 \
-        4195600342abf307b8a9a571b87d687f \
+MD5SUM="bcf84b314e136acddfcb21fab52b64bf \
         c165f1a0c0ce13470e22d9cb5de62590 \
         04d8ccd5bed0c78ee23e777c323d87ee \
-        96d91f2a7f65c8a22a770e7498be1d3d \
-        0bb189ccf8d26e01d10a97a24d298d2a \
-        e3aff0abb26be6635fed0a69e18073fe \
+        cc95891f1e8fb96d60ff98b8f3c1579b \
         1ad82e4a1e909e632306971b91524ebf \
         688cda39d46a1b2fdf23c1cdafbf6cfb \
         ee5e810b1d00123bc6fc5c66ca84f967"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="fmt smpq"
+REQUIRES="SDL_audiolib asio fmt simpleini smpq"
 MAINTAINER="Steven Voges"
 EMAIL="svoges.sbo@gmail.com"