system-zlib.patch

@@ -1,51 +0,0 @@
-From fb399bbf345f41e385f9d864875cb0f4967ff213 Mon Sep 17 00:00:00 2001
-From: Jan Engelhardt <jengelh@inai.de>
-Date: Wed, 28 Aug 2024 02:48:15 +0200
-Subject: [PATCH] Revert to zlib
-
----
- source/CMakeLists.txt     |    2 +-
- source/zmusic/zmusic.cpp  |    2 +-
- thirdparty/CMakeLists.txt |    6 +++++-
- 3 files changed, 7 insertions(+), 3 deletions(-)
-
-Index: source/CMakeLists.txt
-===================================================================
---- source/CMakeLists.txt.orig
-+++ source/CMakeLists.txt
-@@ -127,7 +127,7 @@ if(WIN32)
- 	)
- endif()
- 
--target_link_libraries(zmusic-obj INTERFACE dumb gme miniz ${CMAKE_DL_LIBS})
-+target_link_libraries(zmusic-obj INTERFACE dumb gme ZLIB::ZLIB ${CMAKE_DL_LIBS})
- 
- target_include_directories(zmusic-obj
- INTERFACE
-Index: source/zmusic/zmusic.cpp
-===================================================================
---- source/zmusic/zmusic.cpp.orig
-+++ source/zmusic/zmusic.cpp
-@@ -36,7 +36,7 @@
- #include <stdint.h>
- #include <vector>
- #include <string>
--#include <miniz.h>
-+#include <zlib.h>
- #include "m_swap.h"
- #include "zmusic_internal.h"
- #include "midiconfig.h"
-Index: thirdparty/CMakeLists.txt
-===================================================================
---- thirdparty/CMakeLists.txt.orig
-+++ thirdparty/CMakeLists.txt
-@@ -1,4 +1,8 @@
--add_subdirectory(miniz)
-+find_package(ZLIB QUIET)
-+message(STATUS "Using system zlib, includes found at ${ZLIB_INCLUDE_DIRS}")
-+set_property(TARGET ZLIB::ZLIB PROPERTY IMPORTED_GLOBAL TRUE)
-+determine_package_config_dependency(ZMUSIC_PACKAGE_DEPENDENCIES TARGET ZLIB::ZLIB MODULE ZLIB)
-+
- # GME is not currently released in a way that's conducive to using as a system
- # library. Nevertheless at least one person tried, and so the ability to use a
- # system copy exists soley to placate people following distro guidelines to the

zmusic.changes

@@ -1,12 +1,17 @@
--------------------------------------------------------------------
-Wed Aug 28 00:51:23 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
-
-- Add system-zlib.patch
-
 -------------------------------------------------------------------
 Tue Aug 27 08:16:10 UTC 2024 - ming li <mli@suse.com>
 
 - update to 1.1.13:
+  * Add vcpkg.json
+  * Allow building with static configurations
+  * vcpkg improvements
+  * Statically link to libsndfile when pulled from vcpkg
+  * Pull in zlib from vcpkg
+  * Switch to miniz from zlib
+  * Make miniz an object library
+  * Don't directly link to libmpg123 on vcpkg
+  * Fix compressed format support on GME when using miniz
+  * Fix second VectorReader constructor
   * Fixed incorrect number of bytes being reported to FluidSynth
     when relaying a SysEx message
   * Added a GS DT1 MODE SET SysEx message after GM System Enable

zmusic.spec

@@ -28,8 +28,7 @@ URL:            https://zdoom.org/
 Source:         https://github.com/ZDoom/ZMusic/archive/%version.tar.gz
 Patch1:         system-fluidsynth.patch
 Patch2:         system-gme.patch
-Patch3:         system-zlib.patch
+Patch3:         dumb-dumb.patch
-Patch4:         dumb-dumb.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  pkg-config