Accepting request 1219490 from games

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1219490
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zmusic?expand=0&rev=12

1.1.12.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:da818594b395aa9174561a36362332b0ab8e7906d2e556ec47669326e67613d4
-size 2275316

_scmsync.obsinfo

@@ -0,0 +1,4 @@
+mtime: 1728722001
+commit: 7648612419ea37f0be06a9ef89cf0a9ad923da886859813a7c09ff9ece4b9ef5
+url: https://src.opensuse.org/jengelh/zmusic
+revision: master

build.specials.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:149e4db47aca28e7f417077cca328a6214c989d5254a7ab08041ff375be00d77
+size 256

system-fluidsynth.patch

@@ -29,7 +29,7 @@ Index: source/CMakeLists.txt
 ===================================================================
 --- source/CMakeLists.txt.orig
 +++ source/CMakeLists.txt
-@@ -142,8 +142,11 @@ use_fast_math(zmusiclite)
+@@ -152,8 +152,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>)
  
@@ -47,7 +47,7 @@ Index: source/mididevices/music_fluidsynth_mididevice.cpp
 ===================================================================
 --- source/mididevices/music_fluidsynth_mididevice.cpp.orig
 +++ source/mididevices/music_fluidsynth_mididevice.cpp
-@@ -46,7 +46,7 @@
+@@ -47,7 +47,7 @@
  
  FluidConfig fluidConfig;
  
@@ -60,8 +60,8 @@ Index: thirdparty/CMakeLists.txt
 ===================================================================
 --- thirdparty/CMakeLists.txt.orig
 +++ thirdparty/CMakeLists.txt
-@@ -45,4 +45,3 @@ add_subdirectory(timidity)
- add_subdirectory(timidityplus)
+@@ -28,4 +28,3 @@ add_subdirectory(timidityplus)
  add_subdirectory(wildmidi)
  add_subdirectory(oplsynth)
+ add_subdirectory(libxmp)
 -add_subdirectory(fluidsynth/src)

system-libxmp.patch

@@ -0,0 +1,45 @@
+From: Jan Engelhardt <ej@inai.de>
+Date: 2024-10-12 09:44:49.402360010 +0200
+
+---
+ source/CMakeLists.txt                 |    2 +-
+ source/streamsources/music_libxmp.cpp |    3 +--
+ thirdparty/CMakeLists.txt             |    1 -
+ 3 files changed, 2 insertions(+), 4 deletions(-)
+
+Index: source/CMakeLists.txt
+===================================================================
+--- source/CMakeLists.txt.orig
++++ source/CMakeLists.txt
+@@ -128,7 +128,7 @@ 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})
+ 
+ target_include_directories(zmusic-obj
+ INTERFACE
+Index: source/streamsources/music_libxmp.cpp
+===================================================================
+--- source/streamsources/music_libxmp.cpp.orig
++++ source/streamsources/music_libxmp.cpp
+@@ -39,8 +39,7 @@
+ #include <limits.h>
+ #include "streamsource.h"
+ 
+-#define LIBXMP_STATIC 1
+-#include "../libxmp/include/xmp.h"
++#include <xmp.h>
+ #include "zmusic/m_swap.h"
+ #include "zmusic/mididefs.h"
+ #include "zmusic/midiconfig.h"
+Index: thirdparty/CMakeLists.txt
+===================================================================
+--- thirdparty/CMakeLists.txt.orig
++++ thirdparty/CMakeLists.txt
+@@ -37,4 +37,3 @@ add_subdirectory(timidity)
+ add_subdirectory(timidityplus)
+ add_subdirectory(wildmidi)
+ add_subdirectory(oplsynth)
+-add_subdirectory(libxmp)

system-zlib.patch

@@ -0,0 +1,51 @@
+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
+@@ -128,7 +128,7 @@ if(WIN32)
+ 	)
+ endif()
+ 
+-target_link_libraries(zmusic-obj INTERFACE dumb gme libxmp miniz ${CMAKE_DL_LIBS})
++target_link_libraries(zmusic-obj INTERFACE dumb gme libxmp 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,3 +1,27 @@
+-------------------------------------------------------------------
+Sat Oct 12 07:46:25 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 1.1.14
+  * Switch to libxmp for most tracker formats
+  * Switch to float output
+- Add system-libxmp.patch
+
+-------------------------------------------------------------------
+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:
+  * 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
+    SysEx message to instruct the synth to switch to GS mode,
+    if one is supported.
+  * Updated fluidsynth chorus and reverb setting limits.
+
 -------------------------------------------------------------------
 Mon Jan 15 10:54:40 UTC 2024 - Dirk Müller <dmueller@suse.com>
 

zmusic.spec

@@ -17,7 +17,7 @@
 
 
 Name:           zmusic
-Version:        1.1.12
+Version:        1.1.14
 Release:        0
 Summary:        ZDoom component library for music handling
 License:        GPL-3.0-only
@@ -28,7 +28,9 @@ 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
+Patch5:         system-libxmp.patch
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  pkg-config
@@ -36,6 +38,7 @@ BuildRequires:  pkgconfig(alsa)
 BuildRequires:  pkgconfig(fluidsynth)
 BuildRequires:  pkgconfig(libgme)
 BuildRequires:  pkgconfig(libmpg123)
+BuildRequires:  pkgconfig(libxmp)
 BuildRequires:  pkgconfig(sndfile)
 BuildRequires:  pkgconfig(zlib)
 Suggests:       fluid-soundfont-gm
@@ -43,6 +46,7 @@ Suggests:       fluid-soundfont-gs
 Suggests:       timidity
 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
 
 %description