diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 142599c..84c56aa 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1724759529 -commit: ce0ee70405d17eb44fa2f5edb60fee8c6c0e18910e2a62b17429126dc65ee12d +mtime: 1724806297 +commit: be4fc0882a76d1a58bde1bf718e29cd9f87a0ec015502d2aed5e4c2dfe490d1c url: https://src.opensuse.org/jengelh/zmusic revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 947a26f..7a7b097 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca176e45527599f97daa36024a450114c029045dd7ce9ef265c99595db3b8f9f +oid sha256:c21849576aadc06d90b47d6101be258a2156c8c85226b25fc9a52257e9164042 size 256 diff --git a/system-zlib.patch b/system-zlib.patch new file mode 100644 index 0000000..f7a0092 --- /dev/null +++ b/system-zlib.patch @@ -0,0 +1,51 @@ +From fb399bbf345f41e385f9d864875cb0f4967ff213 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +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 + #include + #include +-#include ++#include + #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 diff --git a/zmusic.changes b/zmusic.changes index c726f35..2cae2ea 100644 --- a/zmusic.changes +++ b/zmusic.changes @@ -1,17 +1,12 @@ +------------------------------------------------------------------- +Wed Aug 28 00:51:23 UTC 2024 - Jan Engelhardt + +- Add system-zlib.patch + ------------------------------------------------------------------- Tue Aug 27 08:16:10 UTC 2024 - ming li - 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 diff --git a/zmusic.spec b/zmusic.spec index ddc8ed2..8d61d27 100644 --- a/zmusic.spec +++ b/zmusic.spec @@ -28,7 +28,8 @@ URL: https://zdoom.org/ Source: https://github.com/ZDoom/ZMusic/archive/%version.tar.gz Patch1: system-fluidsynth.patch Patch2: system-gme.patch -Patch3: dumb-dumb.patch +Patch3: system-zlib.patch +Patch4: dumb-dumb.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkg-config