diff options
| -rw-r--r-- | games/odamex/odamex.SlackBuild | 16 | ||||
| -rw-r--r-- | games/odamex/odamex.info | 10 | ||||
| -rw-r--r-- | games/odamex/use_bundled_portmidi.diff | 20 |
3 files changed, 19 insertions, 27 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 \ diff --git a/games/odamex/odamex.info b/games/odamex/odamex.info index 61e876cf72..31edb8e9f8 100644 --- a/games/odamex/odamex.info +++ b/games/odamex/odamex.info @@ -1,10 +1,10 @@ PRGNAM="odamex" -VERSION="10.5.0" +VERSION="11.0.0" HOMEPAGE="https://odamex.net/" -DOWNLOAD="https://downloads.sourceforge.net/project/odamex/Odamex/10.5.0/odamex-src-10.5.0.tar.xz \ - https://downloads.sourceforge.net/project/odamex/Odamex/10.5.0/odamex-win32-10.5.0.zip" -MD5SUM="d289e752d8410326fd870054e01c978c \ - 20bad4e9a6cd0cbfdbed17e22faab31b" +DOWNLOAD="https://downloads.sourceforge.net/project/odamex/Odamex/11.0.0/odamex-src-11.0.0.tar.xz \ + https://downloads.sourceforge.net/project/odamex/Odamex/11.0.0/odamex-win32-11.0.0.zip" +MD5SUM="3f7fcd822995445f7286c1ca2c877778 \ + 46ada86df69cf62c36c5060f1a22c882" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="wxGTK3" diff --git a/games/odamex/use_bundled_portmidi.diff b/games/odamex/use_bundled_portmidi.diff deleted file mode 100644 index 2fffcc2737..0000000000 --- a/games/odamex/use_bundled_portmidi.diff +++ /dev/null @@ -1,20 +0,0 @@ -diff -Naur odamex-src-0.9.5/client/CMakeLists.txt odamex-src-0.9.5.patched/client/CMakeLists.txt ---- odamex-src-0.9.5/client/CMakeLists.txt 2021-09-08 23:18:23.000000000 -0400 -+++ odamex-src-0.9.5.patched/client/CMakeLists.txt 2022-01-01 14:36:43.305448361 -0500 -@@ -65,8 +65,6 @@ - - # PortMidi - if(ENABLE_PORTMIDI) -- find_package(PortMidi) -- if(NOT PORTMIDI_FOUND) - # build the PortMidi library - set(PORTMIDI_LIBRARY "portmidi") - set(PORTMIDI_LIBRARIES ${PORTMIDI_LIBRARY}) -@@ -107,7 +105,6 @@ - add_library(${PORTMIDI_LIBRARY} STATIC ${PORTMIDI_SOURCES} ${PORTMIDI_HEADERS}) - target_link_libraries(${PORTMIDI_LIBRARY} ${PM_NEEDED_LIBS}) - message(STATUS "portmidi will be built and staticaly linked when compiling the client application.") -- endif() - - add_definitions(-DPORTMIDI) - include_directories(${PORTMIDI_INCLUDE_DIR}) |