Fix fluidsynth libs

Signed-off-by: falkTX <[email protected]>
DISTRHO · Oct 5, 2024 · f9b573a · f9b573a
1 parent f9099e8
commit f9b573a
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 11 deletions.
diff --git 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
@@ -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
@@ -0,0 +1 @@
+macos
diff --git a/patches/fluidsynth/macos-universal b/patches/fluidsynth/macos-universal
@@ -0,0 +1 @@
+macos
diff --git a/patches/fluidsynth/macos/05_force-libs.patch 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
@@ -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
@@ -0,0 +1 @@
+win32