guix_mirror_bot pushed a commit to branch master
in repository guix.
commit 06fb0e414fb08fa79030893b3b30c4e96171664e
Author: bdunahu <[email protected]>
AuthorDate: Tue Jun 9 15:24:57 2026 -0400
gnu: warzone2100: Unbundle libplum.
* gnu/packages/patches/warzone2100-unbundle-libs.patch: Adapt to use system
libplum.
* gnu/packages/games.scm (warzone2100)[source]<snippet>: Delete
“3rdparty/libplum”.
[inputs]: Add libplum.
Change-Id: Ibe3948ffd20c3dc96bf49837c13cc0a4d67878d1
Signed-off-by: Liliana Marie Prikler <[email protected]>
---
gnu/packages/games.scm | 2 +
.../patches/warzone2100-unbundle-libs.patch | 43 +++++++++++++++++++---
2 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index 46ceaaa849..0098aac6b0 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -7420,6 +7420,7 @@ fighting over what remains.")
"fmt"
"GameNetworkingSockets"
"inih"
+ "libplum"
"re2"
"readerwriterqueue"
"SQLiteCpp"
@@ -7520,6 +7521,7 @@ fighting over what remains.")
libinih
libjpeg-turbo
libogg
+ libplum
libpng
libsodium
libtheora
diff --git a/gnu/packages/patches/warzone2100-unbundle-libs.patch
b/gnu/packages/patches/warzone2100-unbundle-libs.patch
index ee2160db84..7beeadd2a3 100644
--- a/gnu/packages/patches/warzone2100-unbundle-libs.patch
+++ b/gnu/packages/patches/warzone2100-unbundle-libs.patch
@@ -1,9 +1,9 @@
-Unbundles fmt and re2 dependencies.
+Unbundles fmt, re2, libplum dependencies.
-patch by Lilah Tascheter <[email protected]>
+patch by Lilah Tascheter <[email protected]> and bdunahu
<[email protected]>.
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
-index 46c0c26e1..0afbdf480 100644
+index 46c0c26e1..04aff5355 100644
--- a/3rdparty/CMakeLists.txt
+++ b/3rdparty/CMakeLists.txt
@@ -20,13 +20,13 @@ endif()
@@ -49,6 +49,29 @@ index 46c0c26e1..0afbdf480 100644
add_subdirectory(EmbeddedJSONSignature EXCLUDE_FROM_ALL)
set_property(TARGET EmbeddedJSONSignature PROPERTY FOLDER "3rdparty")
+@@ -268,22 +266,6 @@ if (WZ_PROFILING_NVTX)
+
+ endif ()
+
+-set(PLUM_NO_EXAMPLE ON CACHE BOOL "Disable example build" FORCE)
+-add_subdirectory(libplum EXCLUDE_FROM_ALL)
+-set_target_properties(plum plum-static PROPERTIES FOLDER "3rdparty")
+-if(NOT MSVC)
+- set(_supported_libplum_c_compiler_flags "")
+-
+- # -Wshadow
+- check_compiler_flags_output("-Werror -Wno-shadow -Wno-error=cpp"
COMPILER_TYPE C OUTPUT_FLAGS "-Wno-shadow" OUTPUT_VARIABLE
_supported_libplum_c_compiler_flags APPEND)
+-
+- if (NOT _supported_libplum_c_compiler_flags STREQUAL "")
+- string(REPLACE " " ";" _supported_libplum_c_compiler_flags
"${_supported_libplum_c_compiler_flags}")
+- target_compile_options(plum PRIVATE
${_supported_libplum_c_compiler_flags})
+- target_compile_options(plum-static PRIVATE
${_supported_libplum_c_compiler_flags})
+- endif()
+-endif()
+-
+ set(EXPECTED_BUILD_TESTS OFF)
+ add_subdirectory(expected EXCLUDE_FROM_ALL)
+ # There isn't any release note or established CMake policy about this
behavior,
diff --git a/lib/ivis_opengl/CMakeLists.txt b/lib/ivis_opengl/CMakeLists.txt
index fd2d62a2c..72e9c7544 100644
--- a/lib/ivis_opengl/CMakeLists.txt
@@ -63,15 +86,23 @@ index fd2d62a2c..72e9c7544 100644
# We should be using the Emscripten port linker flags for FreeType &
Harfbuzz
else()
diff --git a/lib/netplay/CMakeLists.txt b/lib/netplay/CMakeLists.txt
-index 511ac7b89..9379143a3 100644
+index 511ac7b89..7b56e1b9d 100644
--- a/lib/netplay/CMakeLists.txt
+++ b/lib/netplay/CMakeLists.txt
-@@ -113,7 +113,7 @@ set_property(TARGET netplay PROPERTY FOLDER "lib")
+@@ -84,6 +84,7 @@ if(MSVC AND CMAKE_VERSION VERSION_GREATER 3.7)
+ source_group(TREE "${CMAKE_CURRENT_LIST_DIR}" PREFIX "Headers" FILES
${HEADERS})
+ endif()
+
++find_package (LibPlum REQUIRED)
+ find_package (Threads REQUIRED)
+ find_package (ZLIB REQUIRED)
+
+@@ -113,7 +114,7 @@ set_property(TARGET netplay PROPERTY FOLDER "lib")
include(WZTargetConfiguration)
WZ_TARGET_CONFIGURATION(netplay)
target_link_libraries(netplay
- PRIVATE framework re2::re2 nlohmann_json plum-static Threads::Threads
ZLIB::ZLIB fmt::fmt
-+ PRIVATE framework re2 nlohmann_json plum-static Threads::Threads
ZLIB::ZLIB fmt
++ PRIVATE framework re2 nlohmann_json plum Threads::Threads ZLIB::ZLIB fmt
PUBLIC tl::expected)
if(WZ_USE_IMPORTED_MINIUPNPC)
