forked from pool/zmusic
Compare commits
27 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
|
c9f8e74e4d | ||
|
4862fdd0d6 | ||
|
|
ca31d46414 | ||
|
|
bab94d1424 | ||
|
|
695c62e513 | ||
|
|
c458247b54 | ||
|
d418056638 | ||
| 6d81519e7e | |||
|
|
b264fb12a1 | ||
| 6315bae9fb | |||
|
|
74b40c4d22 | ||
| 4b7aaa7e92 | |||
|
|
6ebcac0ccc | ||
| 79dee6f784 | |||
|
|
bf3733e16e | ||
| c1c576c2d8 | |||
|
|
8bff82641a | ||
| c87073b6e2 | |||
|
|
00a276b857 | ||
| 9b102df3f7 | |||
| 5e7233046e | |||
|
|
6d4ebf17ec | ||
| 0e227853a2 | |||
|
|
3591b1227f | ||
| a7e8507625 | |||
|
|
ce4a331140 | ||
|
5e634c6449 |
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:da818594b395aa9174561a36362332b0ab8e7906d2e556ec47669326e67613d4
|
||||
size 2275316
|
||||
BIN
1.1.13.tar.gz
(Stored with Git LFS)
BIN
1.1.13.tar.gz
(Stored with Git LFS)
Binary file not shown.
BIN
1.1.14.tar.gz
(Stored with Git LFS)
Normal file
BIN
1.1.14.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,4 +1,4 @@
|
||||
mtime: 1724806297
|
||||
commit: be4fc0882a76d1a58bde1bf718e29cd9f87a0ec015502d2aed5e4c2dfe490d1c
|
||||
mtime: 1728722001
|
||||
commit: 7648612419ea37f0be06a9ef89cf0a9ad923da886859813a7c09ff9ece4b9ef5
|
||||
url: https://src.opensuse.org/jengelh/zmusic
|
||||
revision: master
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c21849576aadc06d90b47d6101be258a2156c8c85226b25fc9a52257e9164042
|
||||
oid sha256:149e4db47aca28e7f417077cca328a6214c989d5254a7ab08041ff375be00d77
|
||||
size 256
|
||||
|
||||
@ -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)
|
||||
|
||||
45
system-libxmp.patch
Normal file
45
system-libxmp.patch
Normal file
@ -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)
|
||||
@ -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
|
||||
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user