zmusic 1.3.0

system-fluidsynth.patch

@@ -29,7 +29,7 @@ Index: source/CMakeLists.txt
 ===================================================================
 --- source/CMakeLists.txt.orig
 +++ source/CMakeLists.txt
-@@ -152,8 +152,11 @@ use_fast_math(zmusiclite)
+@@ -153,8 +153,11 @@ use_fast_math(zmusiclite)
  target_include_directories(zmusic INTERFACE $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${ZMusic_SOURCE_DIR}/include>)
  target_include_directories(zmusiclite INTERFACE $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:${ZMusic_SOURCE_DIR}/include>)
  

system-gme.patch

@@ -16,7 +16,7 @@ Index: thirdparty/CMakeLists.txt
 ===================================================================
 --- thirdparty/CMakeLists.txt.orig
 +++ thirdparty/CMakeLists.txt
-@@ -25,6 +25,11 @@ endif()
+@@ -7,6 +7,11 @@ add_subdirectory(miniz)
  #option(FORCE_INTERNAL_GME "Use internal gme (it is highly unlikely this should be turned off)" ON)
  #mark_as_advanced(FORCE_INTERNAL_GME GME_INCLUDE_DIR GME_LIBRARY)
  #find_package(GME QUIET)
@@ -28,7 +28,7 @@ Index: thirdparty/CMakeLists.txt
  #if(GME_FOUND AND NOT FORCE_INTERNAL_GME)
  #	message(STATUS "Using system gme library, includes found at ${GME_INCLUDE_DIRS}")
  #	set_property(TARGET gme PROPERTY IMPORTED_GLOBAL TRUE)
-@@ -37,6 +42,7 @@ endif()
+@@ -19,6 +24,7 @@ add_subdirectory(miniz)
  	mark_as_advanced(GME_YM2612_EMU)
  	add_subdirectory(game-music-emu)
  #endif()

system-libxmp.patch

@@ -2,21 +2,25 @@ From: Jan Engelhardt <ej@inai.de>
 Date: 2024-10-12 09:44:49.402360010 +0200
 
 ---
- source/CMakeLists.txt                 |    2 +-
+ source/CMakeLists.txt                 |    6 +++++-
  source/streamsources/music_libxmp.cpp |    3 +--
  thirdparty/CMakeLists.txt             |    1 -
- 3 files changed, 2 insertions(+), 4 deletions(-)
+ 3 files changed, 6 insertions(+), 4 deletions(-)
 
 Index: source/CMakeLists.txt
 ===================================================================
 --- source/CMakeLists.txt.orig
 +++ source/CMakeLists.txt
-@@ -128,7 +128,7 @@ if(WIN32)
+@@ -129,7 +129,11 @@ if(WIN32)
  	)
  endif()
  
 -target_link_libraries(zmusic-obj INTERFACE dumb gme libxmp ZLIB::ZLIB ${CMAKE_DL_LIBS})
-+target_link_libraries(zmusic-obj INTERFACE dumb gme -lxmp ZLIB::ZLIB ${CMAKE_DL_LIBS})
++include(FindPkgConfig)
++pkg_check_modules(XMP libxmp)
++message(STATUS "Using system xmp library, includes found at ${XMP_INCLUDE_DIRS}")
++determine_package_config_dependency(ZMUSIC_PACKAGE_DEPENDENCIES TARGET xmp MODULE XMP)
++target_link_libraries(zmusic-obj INTERFACE dumb gme xmp ZLIB::ZLIB ${CMAKE_DL_LIBS})
  
  target_include_directories(zmusic-obj
  INTERFACE

system-zlib.patch

@@ -13,7 +13,7 @@ Index: source/CMakeLists.txt
 ===================================================================
 --- source/CMakeLists.txt.orig
 +++ source/CMakeLists.txt
-@@ -128,7 +128,7 @@ if(WIN32)
+@@ -129,7 +129,7 @@ if(WIN32)
  	)
  endif()
  

zmusic.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Oct  6 12:14:11 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 1.3.0
+  * Updated bundled libADL to 1.6.1 and libOPN to 1.6.1
+
 -------------------------------------------------------------------
 Sat Oct 12 07:46:25 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 

zmusic.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package zmusic
 #
-# Copyright (c) 2024 SUSE LLC
+# Copyright (c) 2025 SUSE LLC and contributors
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,21 +17,20 @@
 
 
 Name:           zmusic
-Version:        1.1.14
+Version:        1.3.0
 Release:        0
 Summary:        ZDoom component library for music handling
 License:        GPL-3.0-only
 Group:          Development/Libraries/C and C++
 URL:            https://zdoom.org/
-
 #Git-Clone:     https://github.com/ZDoom/ZMusic
 Source:         https://github.com/ZDoom/ZMusic/archive/%version.tar.gz
 Patch1:         system-fluidsynth.patch
 Patch2:         system-gme.patch
 Patch3:         system-zlib.patch
-Patch4:         dumb-dumb.patch
-Patch5:         system-libxmp.patch
-BuildRequires:  cmake
+Patch4:         system-libxmp.patch
+Patch10:        dumb-dumb.patch
+BuildRequires:  cmake >= 3.1.3
 BuildRequires:  gcc-c++
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(alsa)
@@ -48,6 +47,9 @@ Suggests:       timidity-eawpats
 # DUMB is modified to read OggVorbis samples
 # Though everything else has been moved to libxmp, DSIK format still uses foo_DUMB
 Provides:       bundled(dumb) = 0.9.3
+# zmusic is using ADLMIDI internals, so we can't use system adlmidi
+Provides:       bundled(adlmidi) = 1.6.1
+Provides:       bundled(opnmidi) = 1.6.1
 
 %description
 This is the music playback code from gzdoom, which was separated into its own