vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Wed Aug 3 10:48:46 2011 +0300| [ba69ed31ca5f8ebc7130e86f913333ca02400cc1] | committer: Rémi Denis-Courmont
contrib: add missing fluidsynth libs for static linking Putting these in pkg-config is a bit of ugly, but it makes sense since we only build a static library. As a reference, upstream libav does the exact same thing already. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ba69ed31ca5f8ebc7130e86f913333ca02400cc1 --- contrib/src/fluid/fluid-pkg-static.patch | 10 ++++++++++ contrib/src/fluid/rules.mak | 4 ++++ 2 files changed, 14 insertions(+), 0 deletions(-) diff --git a/contrib/src/fluid/fluid-pkg-static.patch b/contrib/src/fluid/fluid-pkg-static.patch new file mode 100644 index 0000000..4a8cdb9 --- /dev/null +++ b/contrib/src/fluid/fluid-pkg-static.patch @@ -0,0 +1,10 @@ +diff -ru fluidsynth.orig/fluidsynth.pc.in fluidsynth/fluidsynth.pc.in +--- fluidsynth.orig/fluidsynth.pc.in 2011-08-03 10:45:08.000000000 +0300 ++++ fluidsynth/fluidsynth.pc.in 2011-08-03 10:45:51.000000000 +0300 +@@ -6,5 +6,5 @@ + Name: FluidSynth + Description: Software SoundFont synth + Version: @VERSION@ +-Libs: -L${libdir} -lfluidsynth ++Libs: -L${libdir} -lfluidsynth -lgthread-2.0 -lglib-2.0 -lm + Cflags: -I${includedir} diff --git a/contrib/src/fluid/rules.mak b/contrib/src/fluid/rules.mak index a7f45ae..73dce75 100644 --- a/contrib/src/fluid/rules.mak +++ b/contrib/src/fluid/rules.mak @@ -21,6 +21,7 @@ ifeq ($(call need_pkg,"glib-2.0"),) FLUID_TARBALL := fluidsynth-$(FLUID_VERSION).tar.bz2 else FLUID_TARBALL := fluidsynth-1.0.9.tar.gz +FLUID_VERSION := 1.0.9 endif fluidsynth: $(FLUID_TARBALL) .sum-fluid @@ -29,6 +30,9 @@ fluidsynth: $(FLUID_TARBALL) .sum-fluid ifdef HAVE_WIN32 $(APPLY) $(SRC)/fluid/fluid-static-win32.patch endif +ifneq ($(FLUID_VERSION),1.0.9) + $(APPLY) $(SRC)/fluid/fluid-pkg-static.patch +endif $(MOVE) FLUIDCONF := $(HOSTCONF) \ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
