diff options
Diffstat (limited to 'games/odamex/odamex.SlackBuild')
| -rw-r--r-- | games/odamex/odamex.SlackBuild | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/games/odamex/odamex.SlackBuild b/games/odamex/odamex.SlackBuild index 551a7cddfe..a8814cff11 100644 --- a/games/odamex/odamex.SlackBuild +++ b/games/odamex/odamex.SlackBuild @@ -6,6 +6,7 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20250519 bkw: updare for v11.0.0. # 20240814 bkw: update for v10.5.0. # 20231120 bkw: update for v10.4.0. # 20230707 bkw: FTBFS, when agar is installed. our agar is 1.7.0, @@ -41,7 +42,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=odamex -VERSION=${VERSION:-10.5.0} +VERSION=${VERSION:-11.0.0} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -106,7 +107,9 @@ SDL12ARG=ON # 20220101 bkw: do not use systemwide install of portmidi, if it exists. # This is to avoid a hidden portmidi dependency breaking the odamex # binary when portmidi gets removed or upgraded. -patch -p1 < $CWD/use_bundled_portmidi.diff +# 20250519 bkw: use sed instead of a diff, it should survive version +# updates better. +sed -i '/find_package(PortMidi)/d' client/CMakeLists.txt # Make the launcher look in /usr/games for the odamex binary rather # than the current directory. User can override with the settings @@ -119,10 +122,19 @@ sed -i 's,OdaGetInstallDir(),"/usr/games",g' \ sed -i '/-march=pentium-m/d' client/CMakeLists.txt SLKCFLAGS+=" -msse -msse2" +# 20250519 bkw: 0.11.0 ships .desktop files with \r\n line endings, +# desktop-file-validate hates them. +sed -i 's,\r,,g' installer/arch/*.desktop + +# 20250519 bkw: makepkg gave us "WARNING: */tmp* rpath found in +# ./usr/games/odamex", which really is a potential security problem, +# so enable CMAKE_SKIP_BUILD_RPATH. + rm -rf build mkdir -p build cd build cmake \ + -DCMAKE_SKIP_BUILD_RPATH=ON \ -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ -DCMAKE_INSTALL_PREFIX=/usr \ |