From f9b573a83aff3f919557e791acfe6ac507a3fd3b Mon Sep 17 00:00:00 2001 From: falkTX Date: Sat, 5 Oct 2024 19:12:35 +0200 Subject: [PATCH] Fix fluidsynth libs Signed-off-by: falkTX --- bootstrap-plugins.sh | 11 ----------- patches/fluidsynth/linux/05_force-libs.patch | 11 +++++++++++ patches/fluidsynth/macos-10.15 | 1 + patches/fluidsynth/macos-universal | 1 + patches/fluidsynth/macos/05_force-libs.patch | 11 +++++++++++ patches/fluidsynth/win32/05_force-libs.patch | 11 +++++++++++ patches/fluidsynth/win64 | 1 + 7 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 patches/fluidsynth/linux/05_force-libs.patch create mode 120000 patches/fluidsynth/macos-10.15 create mode 120000 patches/fluidsynth/macos-universal create mode 100644 patches/fluidsynth/macos/05_force-libs.patch create mode 100644 patches/fluidsynth/win32/05_force-libs.patch create mode 120000 patches/fluidsynth/win64 diff --git a/bootstrap-plugins.sh b/bootstrap-plugins.sh index 77a8044..6ae3252 100755 --- a/bootstrap-plugins.sh +++ b/bootstrap-plugins.sh @@ -585,17 +585,6 @@ FLUIDSYNTH_EXTRAFLAGS+=" -Denable-trap-on-fpe=OFF" git_clone fluidsynth "${FLUIDSYNTH_VERSION}" "${FLUIDSYNTH_URL}" build_cmake fluidsynth "${FLUIDSYNTH_VERSION}" "${FLUIDSYNTH_EXTRAFLAGS}" -if [ ! -e "${PAWPAW_PREFIX}/lib/pkgconfig/fluidsynth.pc-e" ]; then - FLUIDSYNTH_EXTRALIBS="-lglib-2.0 -lgthread-2.0 -lsndfile -lFLAC -lvorbisenc -lvorbis -lopus -logg -lpthread -lm" - if [ "${MACOS}" -eq 1 ]; then - FLUIDSYNTH_EXTRALIBS+=" -liconv" - elif [ "${WIN32}" -eq 1 ]; then - FLUIDSYNTH_EXTRALIBS+=" -lole32 -lws2_32 -lwinmm" - fi - sed -i -e "s/-L\${libdir} -lfluidsynth/-L\${libdir} -lfluidsynth ${FLUIDSYNTH_EXTRALIBS}/" "${PAWPAW_PREFIX}/lib/pkgconfig/fluidsynth.pc" - touch "${PAWPAW_PREFIX}/lib/pkgconfig/fluidsynth.pc-e" -fi - fi # PAWPAW_SKIP_FLUIDSYNTH # --------------------------------------------------------------------------------------------------------------------- diff --git a/patches/fluidsynth/linux/05_force-libs.patch b/patches/fluidsynth/linux/05_force-libs.patch new file mode 100644 index 0000000..5afb5f8 --- /dev/null +++ b/patches/fluidsynth/linux/05_force-libs.patch @@ -0,0 +1,11 @@ +diff --git a/fluidsynth.pc.in b/fluidsynth.pc.in +index 3aca407..834d95b 100644 +--- a/fluidsynth.pc.in ++++ b/fluidsynth.pc.in +@@ -6,5 +6,5 @@ includedir=@includedir@ + Name: FluidSynth + Description: Software SoundFont synth + Version: @VERSION@ +-Libs: -L${libdir} -lfluidsynth ++Libs: -L${libdir} -lfluidsynth -lglib-2.0 -lgthread-2.0 -lsndfile -lFLAC -lvorbisenc -lvorbis -lopus -logg -lpthread -lm + Cflags: -I${includedir} diff --git a/patches/fluidsynth/macos-10.15 b/patches/fluidsynth/macos-10.15 new file mode 120000 index 0000000..a8d0f9c --- /dev/null +++ b/patches/fluidsynth/macos-10.15 @@ -0,0 +1 @@ +macos \ No newline at end of file diff --git a/patches/fluidsynth/macos-universal b/patches/fluidsynth/macos-universal new file mode 120000 index 0000000..a8d0f9c --- /dev/null +++ b/patches/fluidsynth/macos-universal @@ -0,0 +1 @@ +macos \ No newline at end of file diff --git a/patches/fluidsynth/macos/05_force-libs.patch b/patches/fluidsynth/macos/05_force-libs.patch new file mode 100644 index 0000000..75f5fcf --- /dev/null +++ b/patches/fluidsynth/macos/05_force-libs.patch @@ -0,0 +1,11 @@ +diff --git a/fluidsynth.pc.in b/fluidsynth.pc.in +index 3aca407..733420d 100644 +--- a/fluidsynth.pc.in ++++ b/fluidsynth.pc.in +@@ -6,5 +6,5 @@ includedir=@includedir@ + Name: FluidSynth + Description: Software SoundFont synth + Version: @VERSION@ +-Libs: -L${libdir} -lfluidsynth ++Libs: -L${libdir} -lfluidsynth -lglib-2.0 -lgthread-2.0 -lsndfile -lFLAC -lvorbisenc -lvorbis -lopus -logg -lpthread -lm -liconv + Cflags: -I${includedir} diff --git a/patches/fluidsynth/win32/05_force-libs.patch b/patches/fluidsynth/win32/05_force-libs.patch new file mode 100644 index 0000000..4de7f94 --- /dev/null +++ b/patches/fluidsynth/win32/05_force-libs.patch @@ -0,0 +1,11 @@ +diff --git a/fluidsynth.pc.in b/fluidsynth.pc.in +index 3aca407..593e39c 100644 +--- a/fluidsynth.pc.in ++++ b/fluidsynth.pc.in +@@ -6,5 +6,5 @@ includedir=@includedir@ + Name: FluidSynth + Description: Software SoundFont synth + Version: @VERSION@ +-Libs: -L${libdir} -lfluidsynth ++Libs: -L${libdir} -lfluidsynth -lglib-2.0 -lgthread-2.0 -lsndfile -lFLAC -lvorbisenc -lvorbis -lopus -logg -lpthread -lm -lole32 -lws2_32 -lwinmm + Cflags: -I${includedir} diff --git a/patches/fluidsynth/win64 b/patches/fluidsynth/win64 new file mode 120000 index 0000000..43d8fc3 --- /dev/null +++ b/patches/fluidsynth/win64 @@ -0,0 +1 @@ +win32 \ No newline at end of file