[info=7648612419ea37f0be06a9ef89cf0a9ad923da886859813a7c09ff9ece4b9ef5]
OBS-URL: https://build.opensuse.org/package/show/games/zmusic?expand=0&rev=28
This commit is contained in:
committed by
Git OBS Bridge
parent
ca31d46414
commit
4862fdd0d6
@@ -1,4 +1,4 @@
|
||||
mtime: 1728719446
|
||||
commit: 33260869e1a90c9245b62ef8cb93011cc0d3a509a18ebd077b4a3aa9901c1efe
|
||||
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:73265c0e1bb1346340d54d458dba1da8f62caf2dcd56256e8cd67df276dad239
|
||||
oid sha256:149e4db47aca28e7f417077cca328a6214c989d5254a7ab08041ff375be00d77
|
||||
size 256
|
||||
|
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)
|
Reference in New Issue
Block a user