From 7648612419ea37f0be06a9ef89cf0a9ad923da886859813a7c09ff9ece4b9ef5 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 12 Oct 2024 09:46:59 +0200 Subject: [PATCH] zmusic 1.1.14 --- 1.1.13.tar.gz | 3 --- 1.1.14.tar.gz | 3 +++ system-fluidsynth.patch | 8 ++++---- system-libxmp.patch | 45 +++++++++++++++++++++++++++++++++++++++++ system-zlib.patch | 6 +++--- zmusic.changes | 8 ++++++++ zmusic.spec | 5 ++++- 7 files changed, 67 insertions(+), 11 deletions(-) delete mode 100644 1.1.13.tar.gz create mode 100644 1.1.14.tar.gz create mode 100644 system-libxmp.patch diff --git a/1.1.13.tar.gz b/1.1.13.tar.gz deleted file mode 100644 index 006f517..0000000 --- a/1.1.13.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:564e210837b653013e01d67f04d0d906a9f0a923521e0c305463ec4f4a139ed4 -size 2164852 diff --git a/1.1.14.tar.gz b/1.1.14.tar.gz new file mode 100644 index 0000000..6bc0074 --- /dev/null +++ b/1.1.14.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f04410fe4ea08136f37703e7715c27df4c8532ace1e721cf40c6f303a93acc54 +size 2525238 diff --git a/system-fluidsynth.patch b/system-fluidsynth.patch index 306d43b..12028d6 100644 --- a/system-fluidsynth.patch +++ b/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 $ $) target_include_directories(zmusiclite INTERFACE $ $) @@ -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) diff --git a/system-libxmp.patch b/system-libxmp.patch new file mode 100644 index 0000000..377f0e4 --- /dev/null +++ b/system-libxmp.patch @@ -0,0 +1,45 @@ +From: Jan Engelhardt +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 + #include "streamsource.h" + +-#define LIBXMP_STATIC 1 +-#include "../libxmp/include/xmp.h" ++#include + #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) diff --git a/system-zlib.patch b/system-zlib.patch index f7a0092..0d6b02f 100644 --- a/system-zlib.patch +++ b/system-zlib.patch @@ -13,12 +13,12 @@ Index: source/CMakeLists.txt =================================================================== --- source/CMakeLists.txt.orig +++ source/CMakeLists.txt -@@ -127,7 +127,7 @@ if(WIN32) +@@ -128,7 +128,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_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 diff --git a/zmusic.changes b/zmusic.changes index 2cae2ea..b6eb7c7 100644 --- a/zmusic.changes +++ b/zmusic.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Oct 12 07:46:25 UTC 2024 - Jan Engelhardt + +- 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 diff --git a/zmusic.spec b/zmusic.spec index 8d61d27..1e5fe5c 100644 --- a/zmusic.spec +++ b/zmusic.spec @@ -17,7 +17,7 @@ Name: zmusic -Version: 1.1.13 +Version: 1.1.14 Release: 0 Summary: ZDoom component library for music handling License: GPL-3.0-only @@ -30,6 +30,7 @@ Patch1: system-fluidsynth.patch Patch2: system-gme.patch Patch3: system-zlib.patch Patch4: dumb-dumb.patch +Patch5: system-libxmp.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkg-config @@ -37,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 @@ -44,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