From 0270c2624a08d08d3029b2c94e8b14679711c6ee Mon Sep 17 00:00:00 2001 From: Andrew Wong Date: Wed, 24 Dec 2025 12:48:40 -0500 Subject: [PATCH] gnu: woof-doom: Update to 15.3.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/games.scm (woof-doom): Update to 15.3.0. [source]: Adjust snippet to new version. : Delete. [native-inputs]: Add pkg-config. [home-page]: Update. [synopsis]: Revise. [license]: Remove bsd-2 license due to de-vendored spng. * gnu/packages/patches/woof-doom-unbundle-spng-miniz.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Unregister patch. Closes: guix/guix#5099 Change-Id: Ief520f430ec1731976da2b8883d17a982af01b14 Signed-off-by: 宋文武 --- gnu/local.mk | 1 - gnu/packages/games.scm | 24 ++++++++++------- .../woof-doom-unbundle-spng-miniz.patch | 26 ------------------- 3 files changed, 15 insertions(+), 36 deletions(-) delete mode 100644 gnu/packages/patches/woof-doom-unbundle-spng-miniz.patch diff --git a/gnu/local.mk b/gnu/local.mk index 048932f28ca639c3c086e69c135a4d26a9942462..53bcc840cf96e4a24d6edeeb6b323fb083861103 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2483,7 +2483,6 @@ dist_patch_DATA = \ %D%/packages/patches/wmctrl-64-fix.patch \ %D%/packages/patches/wmfire-dont-inline-draw-fire.patch \ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \ - %D%/packages/patches/woof-doom-unbundle-spng-miniz.patch \ %D%/packages/patches/wordnet-CVE-2008-2149.patch \ %D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 7fbc9b811aff71258a6ecea9034514f4d2b27a31..911a41f721cc7261e3c00e656aa9ca87f63d4c83 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -9235,7 +9235,7 @@ original.") (define-public woof-doom (package (name "woof-doom") - (version "15.2.0") + (version "15.3.0") (source (origin (method git-fetch) @@ -9244,22 +9244,29 @@ original.") (commit (string-append "woof_" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "04c7hm4jnr9aiz6w4520zww6b7j86qv9xaf87hdv48cjc9sp2ljk")) + (base32 "0ki7wqjhqhjxci04aksh9m8m35gi2db89475v79rjzdgk00b3mqv")) (modules '((guix build utils))) (snippet '(begin (with-directory-excursion "third-party" (delete-file-recursively "miniz") (delete-file-recursively "yyjson") - (delete-file-recursively "spng")) + (delete-file-recursively "spng") + (substitute* "CMakeLists.txt" + (("add_library\\(miniz.+") + "find_package(miniz REQUIRED)") + (("target_.+\\(miniz.+$") "") + (("add_library\\(spng.+") + "find_package(PkgConfig) +pkg_search_module(spng REQUIRED spng)") + (("target_.+\\(spng.+$") ""))) (delete-file-recursively "win32") (substitute* (find-files "src" ".") - (("miniz.h") "miniz/miniz.h")))) - (patches (search-patches "woof-doom-unbundle-spng-miniz.patch")))) + (("miniz.h") "miniz/miniz.h")))))) (build-system cmake-build-system) (arguments (list #:tests? #f)) ;'demotest' requires internet access. - (native-inputs (list python)) + (native-inputs (list pkg-config python)) (inputs (list libebur128 libsndfile libxmp @@ -9270,8 +9277,8 @@ original.") spng yyjson fluidsynth)) - (home-page "https://github.com/fabiangreffrath/woof") - (synopsis "MBF-style Doom source port targeted at modern systems") + (home-page "https://fabiangreffrath.github.io/woof/") + (synopsis "MBF-lineage Doom source port") (description "Woof! is a continuation of the MBF lineage of Doom source ports, with modern features such as dynamic resolution scaling, uncapped framerates, @@ -9284,7 +9291,6 @@ UMAPINFO, DEHEXTRA, and DSDHacked specifictions.") (list (license:non-copyleft "https://bitbucket.org/jpommier/pffft/src/master/pffft.h" "FFTPACK license") - license:bsd-2 license:bsd-3 license:cc-by3.0 license:cc0 diff --git a/gnu/packages/patches/woof-doom-unbundle-spng-miniz.patch b/gnu/packages/patches/woof-doom-unbundle-spng-miniz.patch deleted file mode 100644 index 43c3b391933113884ea11be54277976fb3e5d7d5..0000000000000000000000000000000000000000 --- a/gnu/packages/patches/woof-doom-unbundle-spng-miniz.patch +++ /dev/null @@ -1,26 +0,0 @@ -Unbundle spng, miniz -*** a/third-party/CMakeLists.txt ---- b/third-party/CMakeLists.txt -@@ -4,20 +4,13 @@ - target_woof_settings(md5) - target_include_directories(md5 INTERFACE md5) - --add_library(miniz STATIC miniz/miniz.c) --target_woof_settings(miniz) --target_compile_definitions(miniz PRIVATE MINIZ_NO_TIME) --target_include_directories(miniz INTERFACE miniz) -+find_package(miniz) - - add_library(pffft STATIC pffft/pffft.c) - target_woof_settings(pffft) - target_include_directories(pffft INTERFACE pffft) - --add_library(spng STATIC spng/spng.c) --target_woof_settings(spng) --target_compile_definitions(spng PRIVATE SPNG_USE_MINIZ INTERFACE SPNG_STATIC) --target_include_directories(spng INTERFACE spng) --target_link_libraries(spng miniz) -+find_package(spng) - - if(NOT yyjson_FOUND) - add_library(yyjson STATIC yyjson/yyjson.c)