pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

ZMusic: add a patch to support libfluidsynth.so.3



Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Thu Apr 27 16:15:09 2023 +0200
Changeset:	6d33aa50161023dcae618836e8e26380839d47d6

Modified Files:
	ZMusic/distinfo
Added Files:
	ZMusic/patches/patch-source_mididevices_music__fluidsynth__mididevice.cpp

Log Message:
ZMusic: add a patch to support libfluidsynth.so.3

Fluidsynth in pkgsrc is now at libfluidsynth.so.3, but ZMusic only
searches for libfluidsynth.so.{1,2}.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=6d33aa50161023dcae618836e8e26380839d47d6

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 ZMusic/distinfo                                    |  1 +
 ...e_mididevices_music__fluidsynth__mididevice.cpp | 23 ++++++++++++++++++++++
 2 files changed, 24 insertions(+)

diffs:
diff --git a/ZMusic/distinfo b/ZMusic/distinfo
index 94c862a7f8..0225feda3f 100644
--- a/ZMusic/distinfo
+++ b/ZMusic/distinfo
@@ -3,3 +3,4 @@ $NetBSD$
 RMD160 (ZMusic/1.1.4.tar.gz) = ada552bd6698f4bb4ff4a45e4752660a5697cbf7
 SHA512 (ZMusic/1.1.4.tar.gz) = 5188fb095897769514c4a4698fabb5640e7ca86fe0665d4bfe6649a940b00ac02d87decda626be8a848ba6db0a468cc985d74d0fda2d3da8657fee079e0bde73
 Size (ZMusic/1.1.4.tar.gz) = 1809045 bytes
+SHA1 (patch-source_mididevices_music__fluidsynth__mididevice.cpp) = b4f36a9b397d8b5b3aa1da657b262b0450f66c48
diff --git a/ZMusic/patches/patch-source_mididevices_music__fluidsynth__mididevice.cpp b/ZMusic/patches/patch-source_mididevices_music__fluidsynth__mididevice.cpp
new file mode 100644
index 0000000000..5bbdd968ab
--- /dev/null
+++ b/ZMusic/patches/patch-source_mididevices_music__fluidsynth__mididevice.cpp
@@ -0,0 +1,23 @@
+$NetBSD$
+
+Also search for libfluidsynth.so.3, which is the current version installed by pkgsrc.
+
+--- source/mididevices/music_fluidsynth_mididevice.cpp.orig	2020-10-16 08:54:25.000000000 +0000
++++ source/mididevices/music_fluidsynth_mididevice.cpp
+@@ -142,6 +142,7 @@ protected:
+ #else // !__APPLE__
+ #define FLUIDSYNTHLIB1	"libfluidsynth.so.1"
+ #define FLUIDSYNTHLIB2	"libfluidsynth.so.2"
++#define FLUIDSYNTHLIB3	"libfluidsynth.so.3"
+ #endif // __APPLE__
+ #endif
+ 
+@@ -547,7 +548,7 @@ bool FluidSynthMIDIDevice::LoadFluidSynt
+ 			return true;
+ 	}
+ 
+-	if(!FluidSynthModule.Load({FLUIDSYNTHLIB1, FLUIDSYNTHLIB2}))
++	if(!FluidSynthModule.Load({FLUIDSYNTHLIB1, FLUIDSYNTHLIB2, FLUIDSYNTHLIB3}))
+ 	{
+ 		ZMusic_Printf(ZMUSIC_MSG_ERROR, "Could not load " FLUIDSYNTHLIB1 " or " FLUIDSYNTHLIB2 "\n");
+ 		return false;


Home | Main Index | Thread Index | Old Index