From 9f831176221cc0cfa033401bb91e6c94e35de7c4 Mon Sep 17 00:00:00 2001 From: Steven Voges Date: Fri, 29 Apr 2022 09:30:11 +0100 Subject: games/devilutionx: Updated for version 1.4.0. Signed-off-by: Dave Woodfall Signed-off-by: Willy Sudiarto Raharjo --- games/devilutionx/README | 13 ++++++-- games/devilutionx/devilutionx.SlackBuild | 57 ++++++++++++++++++++++++++++---- games/devilutionx/devilutionx.info | 24 ++++++++++++-- games/devilutionx/slack-desc | 4 +-- 4 files changed, 84 insertions(+), 14 deletions(-) (limited to 'games/devilutionx') diff --git a/games/devilutionx/README b/games/devilutionx/README index f15485d490..0403a95fab 100644 --- a/games/devilutionx/README +++ b/games/devilutionx/README @@ -2,7 +2,14 @@ DevilutionX is a source port of Diablo and Hellfire that strives to make it simple to run the game while providing engine improvements, bugfixes, and some optional quality of life features. -You will need the retail or shareware mpq to run devilutionx. -You may place mpqs in: $HOME/.local/share/diasurgical/devilution/ or -/usr/share/diasurgical/devilutionx/ +Check out the manual (https://github.com/diasurgical/devilutionX/wiki) +for what features are available and how best to take advantage of +them. + +You'll need access to the data from the original game. If you don't +have an original CD then you can buy Diablo from GoG.com. Alternately +you can use spawn.mpq from the shareware version, in place of +DIABDAT.MPQ, to play the shareware portion of the game. +Place mpqs in: $HOME/.local/share/diasurgical/devilution/ or +/usr/share/diasurgical/devilutionx/ diff --git a/games/devilutionx/devilutionx.SlackBuild b/games/devilutionx/devilutionx.SlackBuild index 482e80dc26..862b46a14e 100644 --- a/games/devilutionx/devilutionx.SlackBuild +++ b/games/devilutionx/devilutionx.SlackBuild @@ -26,7 +26,16 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=devilutionx SRCNAM=devilutionX -VERSION=${VERSION:-1.3.0} +VERSION=${VERSION:-1.4.0} +ASIO=${ASIO:-ebeff99f539da23d27c2e8d4bdbc1ee011968644} +LIBMPQ=${LIBMPQ:-0f10bd1600f406b13932bf5351ba713361262184} +LIBSMACKERDEC=${LIBSMACKERDEC:-2997ee0e41e91bb723003bc09234be553b190e38} +SIMPLEINI=${SIMPLEINI:-9b3ed7ec815997bc8c5b9edf140d6bde653e1458} +SDLAUDIOLIB=${SDLAUDIOLIB:-1a69135313c79817b38a3a99826d4ac28d627fdf} +LIBZT=${LIBZT:-a34ba7f1cc2e41b05badd25d1b01fdc5fd2f4e02} +ZEROTIERONE=${ZEROTIERONE:-7f026edea747525189da8d5a58b3a6ff59190246} +LWIP=${LWIP:-32708c0a8b140efb545cc35101ee5fdeca6d6489} +LWIPCONTRIB=${LWIPCONTRIB:-a57a8a213067912168baf978864a6f1adaacc042} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -47,6 +56,7 @@ fi TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} +DEPS=$TMP/$SRCNAM-$VERSION/build/_deps if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" @@ -69,6 +79,35 @@ mkdir -p $TMP $PKG $OUTPUT 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 \ + $DEPS/libzt-src/ext/ZeroTierOne --strip-components 1 +tar xvf $CWD/lwip-$LWIP.tar.gz -C \ + $DEPS/libzt-src/ext/lwip --strip-components 1 +tar xvf $CWD/lwip-contrib-$LWIPCONTRIB.tar.gz -C \ + $DEPS/libzt-src/ext/lwip-contrib --strip-components 1 + cd $SRCNAM-$VERSION chown -R root:root . find -L . \ @@ -77,22 +116,28 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -mkdir -p build cd build cmake \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DVERSION_NUM=${VERSION} .. - + -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 make install/strip DESTDIR=$PKG cd .. rm -f $PKG/usr/share/diasurgical/$PRGNAM/README.txt -rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la - 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 diff --git a/games/devilutionx/devilutionx.info b/games/devilutionx/devilutionx.info index f145dad7c4..6e9b780a17 100644 --- a/games/devilutionx/devilutionx.info +++ b/games/devilutionx/devilutionx.info @@ -1,8 +1,26 @@ PRGNAM="devilutionx" -VERSION="1.3.0" +VERSION="1.4.0" HOMEPAGE="https://github.com/diasurgical/devilutionX" -DOWNLOAD="https://github.com/diasurgical/devilutionX/archive/1.3.0/devilutionX-1.3.0.tar.gz" -MD5SUM="23791a40dfc5b6fbe6a935a3b76d5bc3" +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 \ + 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/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 \ + c165f1a0c0ce13470e22d9cb5de62590 \ + 04d8ccd5bed0c78ee23e777c323d87ee \ + 96d91f2a7f65c8a22a770e7498be1d3d \ + 0bb189ccf8d26e01d10a97a24d298d2a \ + e3aff0abb26be6635fed0a69e18073fe \ + 1ad82e4a1e909e632306971b91524ebf \ + 688cda39d46a1b2fdf23c1cdafbf6cfb \ + ee5e810b1d00123bc6fc5c66ca84f967" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="fmt smpq" diff --git a/games/devilutionx/slack-desc b/games/devilutionx/slack-desc index 7812e5bff2..f9d43cda09 100644 --- a/games/devilutionx/slack-desc +++ b/games/devilutionx/slack-desc @@ -6,13 +6,13 @@ # customary to leave one space after the ':' except on otherwise blank lines. |-----handy-ruler------------------------------------------------------| -devilutionx: devilutionx (Port of Diablo) +devilutionx: devilutionx (Diablo build for modern operating systems) devilutionx: devilutionx: DevilutionX is a source port of Diablo and Hellfire that strives to devilutionx: make it simple to run the game while providing engine improvements, devilutionx: bugfixes, and some optional quality of life features. devilutionx: -devilutionx: +devilutionx: Homepage: https://github.com/diasurgical/devilutionX devilutionx: devilutionx: devilutionx: -- cgit v1.2.3