From 129ece5aef4f86c2e80569ef539595a1758ffd5c Mon Sep 17 00:00:00 2001 From: Tim Dickson Date: Thu, 13 Oct 2022 22:12:03 +0100 Subject: [PATCH] games/0ad: Updated for version 0.0.26. Signed-off-by: Willy Sudiarto Raharjo --- games/0ad/0ad.SlackBuild | 40 ++++++++++++++++++++++------------------ games/0ad/0ad.info | 8 ++++---- games/0ad/README | 7 ++----- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/games/0ad/0ad.SlackBuild b/games/0ad/0ad.SlackBuild index 33fabfaaa3..2350f00e5b 100644 --- a/games/0ad/0ad.SlackBuild +++ b/games/0ad/0ad.SlackBuild @@ -27,20 +27,11 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=0ad -VERSION=${VERSION:-0.0.25b} +VERSION=${VERSION:-0.0.26} RELEASE=${RELEASE:-alpha} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} - -# If the variable PRINT_PACKAGE_NAME is set, then this script will report what -# the name of the created package would be, and then exit. This information -# could be useful to other scripts. -if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then - echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" - exit 0 -fi - TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -53,6 +44,14 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -88,16 +87,21 @@ export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS -DU_USING_ICU_NAMESPACE=1" export LDFLAGS="-L/usr/lib${LIBDIRSUFFIX}" export SDL2_CONFIG="/usr/bin/sdl2-config" +#prevent out of tree files getting written. +mkdir -p cargoh +export CARGO_HOME="$TMP/$PRGNAM-$VERSION-$RELEASE/cargoh" -# Fix boost names, include paths and remove isystem +# Fix boost names, include paths and remove isystem. commented stuff is fixed upstream already sed -i 's|-mt||g' build/premake/extern_libs5.lua || exit 1 -sed -i 's|/usr/local/include|/usr/include|' build/premake/{extern_libs5.lua,premake5.lua} || exit 1 +#sed -i 's|/usr/local/include|/usr/include|' build/premake/{extern_libs5.lua,premake5.lua} || exit 1 +sed -i 's|/usr/local/include|/usr/include|' build/premake/extern_libs5.lua || exit 1 sed -i 's|-isystem |-I|' build/premake/premake5/{src/tools/gcc.lua,tests/tools/test_gcc.lua} || exit 1 -sed -i '/third_party/a #include ' source/ps/CLogger.h || exit 1 -sed -i '/ps\/Profiler2/a #include ' source/ps/Profiler2GPU.cpp || exit 1 +#sed -i '/third_party/a #include ' source/ps/CLogger.h || exit 1 +#sed -i '/ps\/Profiler2/a #include ' source/ps/Profiler2GPU.cpp || exit 1 -#allow for ATLAS to be yes. +#allow for ATLAS to be yes or no. if not specified we defaul to enable +[ "x$ATLAS" = "xno" ]&& ATLAS="disable" [ "x$ATLAS" = "xyes" ]&& ATLAS="enable" # build/workspaces/update-workspaces.sh # have a root check, let's disable it. @@ -108,7 +112,7 @@ build/workspaces/update-workspaces.sh \ --bindir=/usr/games \ --datadir=/usr/share/games/0ad \ --libdir=/usr/lib${LIBDIRSUFFIX}/0ad \ - --${ATLAS:-disable}-atlas + --${ATLAS:-enable}-atlas sed -i 's|-isystem |-I|g' build/workspaces/gcc/*.make || exit 1 @@ -132,8 +136,8 @@ install -Dm 0644 build/resources/0ad.desktop $PKG/usr/share/applications/0ad.des install -Dm 0644 build/resources/0ad.png $PKG/usr/share/pixmaps/0ad.png install -Dm 0755 build/resources/0ad.sh $PKG/usr/games/0ad -sed -i "s,/usr/bin/,/usr/games/," $PKG/usr/games/0ad -sed -i "s,/usr/bin/,/usr/games/," $PKG/usr/share/applications/0ad.desktop +#sed -i "s,/usr/bin/,/usr/games/," $PKG/usr/games/0ad +#sed -i "s,/usr/bin/,/usr/games/," $PKG/usr/share/applications/0ad.desktop find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null diff --git a/games/0ad/0ad.info b/games/0ad/0ad.info index 090ce39177..59eb4a4fdf 100644 --- a/games/0ad/0ad.info +++ b/games/0ad/0ad.info @@ -1,10 +1,10 @@ PRGNAM="0ad" -VERSION="0.0.25b" +VERSION="0.0.26" HOMEPAGE="https://play0ad.com/" -DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.25b-alpha-unix-build.tar.xz" -MD5SUM="71c5eec3afab6871115fc14783fa0a7b" +DOWNLOAD="http://releases.wildfiregames.com/0ad-0.0.26-alpha-unix-build.tar.xz" +MD5SUM="d0d3ed10769dee2254aa196a9619bd57" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="0ad-data enet fmt gloox miniupnpc" +REQUIRES="0ad-data enet fmt gloox miniupnpc wxGTK3" MAINTAINER="Tim Dickson" EMAIL="dickson.tim@googlemail.com" diff --git a/games/0ad/README b/games/0ad/README index 61510a9b0a..6af05415e6 100644 --- a/games/0ad/README +++ b/games/0ad/README @@ -1,8 +1,5 @@ 0 A.D. (pronounced "zero ey-dee") is a free, open-source, cross-platform real-time strategy (RTS) game of ancient warfare. -To include the Atlas editor, which requires wxGTK3 - ATLAS=enable ./0ad.SlackBuild - -v0.0.23b is the last version to run on stock slackware 14.2 as newer -versions require at least gcc 7 or newer to compile. +To omit the Atlas editor + ATLAS=disable ./0ad.SlackBuild