3 files changed, 15 insertions(+), 36 deletions(-)

M gnu/local.mk
M gnu/packages/games.scm
D gnu/packages/patches/woof-doom-unbundle-spng-miniz.patch

@@ 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			\

@@ 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

@@ 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)