diff --git a/0001-made-sndfile-imported-library-global.patch b/0001-made-sndfile-imported-library-global.patch deleted file mode 100644 index 9462426..0000000 --- a/0001-made-sndfile-imported-library-global.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f24498950d44235e307e6734ca627723e34986a9 Mon Sep 17 00:00:00 2001 -From: "alexey.lysiuk" -Date: Sun, 14 Mar 2021 19:36:16 +0200 -Subject: [PATCH] - made sndfile imported library global - -CMake earlier than 3.18 does not support library aliases to non-global imported targets. -This fixes #22. ---- - cmake/FindSndFile.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git cmake/FindSndFile.cmake cmake/FindSndFile.cmake -index 0266980..7ba3225 100644 ---- cmake/FindSndFile.cmake -+++ cmake/FindSndFile.cmake -@@ -27,7 +27,7 @@ include(FindPackageHandleStandardArgs) - find_package_handle_standard_args(SndFile DEFAULT_MSG SNDFILE_LIBRARY SNDFILE_INCLUDE_DIR) - - if(SNDFILE_FOUND) -- add_library(sndfile UNKNOWN IMPORTED) -+ add_library(sndfile UNKNOWN IMPORTED GLOBAL) - set_target_properties(sndfile - PROPERTIES - IMPORTED_LOCATION "${SNDFILE_LIBRARY}" --- -2.31.1 - diff --git a/1.1.6.tar.gz b/1.1.6.tar.gz deleted file mode 100644 index 8badae9..0000000 --- a/1.1.6.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2cc4a08c4d213df80743828538631f452e1858c2ea5bb47a616e221492de05c0 -size 1810769 diff --git a/ZMusic-1.1.8.tar.gz b/ZMusic-1.1.8.tar.gz new file mode 100644 index 0000000..7b86faa --- /dev/null +++ b/ZMusic-1.1.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:73082f661b7b0bb33348d1d186c132deec9132a1613480348a00172b49c9fd68 +size 1811039 diff --git a/zmusic.changes b/zmusic.changes index f88aa92..a10dbf4 100644 --- a/zmusic.changes +++ b/zmusic.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat May 29 10:28:30 UTC 2021 - Ferdinand Thiessen + +- Update to release 1.1.8 + * support dynamic loading of FluidSynth 2.2 + * fixed file header in MIDI wave writer +- Drop 0001-made-sndfile-imported-library-global.patch, was merged + ------------------------------------------------------------------- Sat Apr 10 21:07:37 UTC 2021 - Jan Engelhardt diff --git a/zmusic.spec b/zmusic.spec index 9f64825..41532b4 100644 --- a/zmusic.spec +++ b/zmusic.spec @@ -17,7 +17,7 @@ Name: zmusic -Version: 1.1.6 +Version: 1.1.8 Release: 0 Summary: ZDoom component library for music handling License: GPL-3.0-only @@ -25,10 +25,9 @@ Group: Development/Libraries/C and C++ URL: https://zdoom.org/ #Git-Clone: https://github.com/coelckers/ZMusic -Source: https://github.com/coelckers/ZMusic/archive/%version.tar.gz +Source: https://github.com/coelckers/ZMusic/archive/%version.tar.gz#/ZMusic-%version.tar.gz Patch1: system-gme.patch Patch2: dumb-dumb.patch -Patch3: 0001-made-sndfile-imported-library-global.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: pkg-config