diff options
| author | B. Watson <yalhcru@gmail.com> | 2020-11-08 14:59:47 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2020-11-14 17:16:44 +0700 |
| commit | 3b23d039fa5fd66b0a1497237f0db8210f5947a3 (patch) | |
| tree | 8800013cfdc153a73638306ea3a81b3bbe377c80 /games/gzdoom | |
| parent | f47144dfbf9c65a917069d25d0a46bafd17f7e25 (diff) | |
games/gzdoom: Updated for version 4.5.0.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'games/gzdoom')
| -rw-r--r-- | games/gzdoom/compilefix.4.5.0.diff | 12 | ||||
| -rw-r--r-- | games/gzdoom/gzdoom.SlackBuild | 12 | ||||
| -rw-r--r-- | games/gzdoom/gzdoom.info | 6 |
3 files changed, 24 insertions, 6 deletions
diff --git a/games/gzdoom/compilefix.4.5.0.diff b/games/gzdoom/compilefix.4.5.0.diff new file mode 100644 index 0000000000000..5c195189018ea --- /dev/null +++ b/games/gzdoom/compilefix.4.5.0.diff @@ -0,0 +1,12 @@ +diff -Naur gzdoom-g4.5.0/src/common/scripting/core/dynarrays.cpp gzdoom-g4.5.0.patched/src/common/scripting/core/dynarrays.cpp +--- gzdoom-g4.5.0/src/common/scripting/core/dynarrays.cpp 2020-10-31 05:07:33.000000000 -0400 ++++ gzdoom-g4.5.0.patched/src/common/scripting/core/dynarrays.cpp 2020-11-08 14:45:48.654222783 -0500 +@@ -89,7 +89,7 @@ + { + int oldSize = self->Size(); + self->Insert(index, static_cast<typename T::value_type>(val)); +- if constexpr (fill) ++ if (fill) + { + for (unsigned i = oldSize; i < self->Size() - 1; i++) (*self)[i] = 0; + } diff --git a/games/gzdoom/gzdoom.SlackBuild b/games/gzdoom/gzdoom.SlackBuild index 33b640cdf4e10..c4e6691acabbf 100644 --- a/games/gzdoom/gzdoom.SlackBuild +++ b/games/gzdoom/gzdoom.SlackBuild @@ -6,6 +6,7 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20201107 bkw: Updated for 4.5.0. # 20201027 bkw: # - Updated for 4.4.2. # - Add new zmusic dep. @@ -32,7 +33,7 @@ # supported as "gzdoom-legacy" for those that need them. PRGNAM=gzdoom -VERSION=${VERSION:-4.4.2} +VERSION=${VERSION:-4.5.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -83,10 +84,15 @@ sed -i '/COMMAND.*UpdateRevision/s,^,# ,' src/CMakeLists.txt echo "#define GIT_HASH \"release\"" echo "#define GIT_TIME __DATE__" ) > src/gitinfo.h -# This isn't currently used, but was in the past, and will be again I'm sure. +# 4.5.0 uses "if constexpr", which is a c++17 feature not supported by +# our compiler from 2016. [ -e $CWD/compilefix.$VERSION.diff ] && \ patch -p1 < $CWD/compilefix.$VERSION.diff +# 20201107 bkw: 4.5.0 needs this, patch comes from upstream git. Thanks +# to Steven Voges on the mailing list for pointing it out to me. +patch -p1 < $CWD/fix_zipdir.diff + # 3.1.0 started needing -DNDEBUG. Using ld.gold speeds up the final link # enough to be worth using (saves 17+ sec on my test box). SLKCFLAGS="$SLKCFLAGS -DNDEBUG -fuse-ld=gold" @@ -98,7 +104,7 @@ sed -i '1i#include <cmath>' \ mkdir -p build cd build - cmake \ + /opt/cmake-202x/bin/cmake \ -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS -DSHARE_DIR=\\\"/usr/share/games/doom\\\"" \ -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS -DSHARE_DIR=\\\"/usr/share/games/doom\\\"" \ -DINSTALL_DOCS_PATH=doc/$PRGNAM-$VERSION \ diff --git a/games/gzdoom/gzdoom.info b/games/gzdoom/gzdoom.info index 9466f385859cf..fd272cf53217a 100644 --- a/games/gzdoom/gzdoom.info +++ b/games/gzdoom/gzdoom.info @@ -1,8 +1,8 @@ PRGNAM="gzdoom" -VERSION="4.4.2" +VERSION="4.5.0" HOMEPAGE="http://gzdoom.drdteam.org/" -DOWNLOAD="https://github.com/coelckers/gzdoom/archive/g4.4.2/gzdoom-g4.4.2.tar.gz" -MD5SUM="0c649af6aef89ce60df724bfb64aeec7" +DOWNLOAD="https://github.com/coelckers/gzdoom/archive/g4.5.0/gzdoom-g4.5.0.tar.gz" +MD5SUM="64b0b98c6538a75626de3319653d6539" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="SDL2 OpenAL zmusic" |