Accepting request 1196367 from games
- update to 1.1.13: OBS-URL: https://build.opensuse.org/request/show/1196367 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/zmusic?expand=0&rev=11
This commit is contained in:
commit
c458247b54
@ -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)
Normal file
BIN
1.1.13.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
4
_scmsync.obsinfo
Normal file
4
_scmsync.obsinfo
Normal file
@ -0,0 +1,4 @@
|
||||
mtime: 1724806297
|
||||
commit: be4fc0882a76d1a58bde1bf718e29cd9f87a0ec015502d2aed5e4c2dfe490d1c
|
||||
url: https://src.opensuse.org/jengelh/zmusic
|
||||
revision: master
|
3
build.specials.obscpio
Normal file
3
build.specials.obscpio
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c21849576aadc06d90b47d6101be258a2156c8c85226b25fc9a52257e9164042
|
||||
size 256
|
51
system-zlib.patch
Normal file
51
system-zlib.patch
Normal file
@ -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
|
||||
@@ -127,7 +127,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_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
|
@ -1,3 +1,19 @@
|
||||
-------------------------------------------------------------------
|
||||
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>
|
||||
|
||||
|
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: zmusic
|
||||
Version: 1.1.12
|
||||
Version: 1.1.13
|
||||
Release: 0
|
||||
Summary: ZDoom component library for music handling
|
||||
License: GPL-3.0-only
|
||||
@ -28,7 +28,8 @@ 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
|
||||
BuildRequires: cmake
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: pkg-config
|
||||
|
Loading…
Reference in New Issue
Block a user