vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Tue Apr 14 15:05:55 2015 +0200| [d521bd3eb09b6c061629636cbd262713f3461458] | committer: Jean-Baptiste Kempf
Contrib: fix fluidsynth compilation for all OS This mostly reverts commit f0380ff04aa9f58f6d453cdfa429b90408badcff and fixes it for Win32, but also Linux > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d521bd3eb09b6c061629636cbd262713f3461458 --- contrib/src/fluid/fluid-pkg-static.patch | 9 +++++---- contrib/src/fluid/fluid-static-win32.patch | 8 ++++---- contrib/src/fluid/rules.mak | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/contrib/src/fluid/fluid-pkg-static.patch b/contrib/src/fluid/fluid-pkg-static.patch index f989cce..4a8cdb9 100644 --- a/contrib/src/fluid/fluid-pkg-static.patch +++ b/contrib/src/fluid/fluid-pkg-static.patch @@ -1,9 +1,10 @@ ---- fluidsynth-1.1.6/fluidsynth.pc.in.orig 2015-04-14 14:38:13.724365611 +0200 -+++ fluidsynth-1.1.6/fluidsynth.pc.in 2015-04-14 14:38:12.737681738 +0200 +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 -ldsound -lwinmm -+Libs: -L${libdir} -lfluidsynth -ldsound -lwinmm -lgthread-2.0 -lglib-2.0 -lm +-Libs: -L${libdir} -lfluidsynth ++Libs: -L${libdir} -lfluidsynth -lgthread-2.0 -lglib-2.0 -lm Cflags: -I${includedir} diff --git a/contrib/src/fluid/fluid-static-win32.patch b/contrib/src/fluid/fluid-static-win32.patch index 5ebbd5c..46507a2 100644 --- a/contrib/src/fluid/fluid-static-win32.patch +++ b/contrib/src/fluid/fluid-static-win32.patch @@ -1,9 +1,9 @@ ---- fluidsynth/fluidsynth.pc.in 2007-08-18 23:55:32.000000000 +0200 -+++ fluidsynth.new/fluidsynth.pc.in 2009-07-28 23:41:05.000000000 +0200 +--- fluidsynth-1.1.6/fluidsynth.pc.in.orig 2015-04-14 15:06:24.867271101 +0200 ++++ fluidsynth-1.1.6/fluidsynth.pc.in 2015-04-14 15:07:23.088291727 +0200 @@ -6,5 +6,5 @@ Name: FluidSynth Description: Software SoundFont synth Version: @VERSION@ --Libs: -L${libdir} -lfluidsynth -+Libs: -L${libdir} -lfluidsynth -ldsound -lwinmm +-Libs: -L${libdir} -lfluidsynth -lgthread-2.0 -lglib-2.0 -lm ++Libs: -L${libdir} -lfluidsynth -lgthread-2.0 -lglib-2.0 -ldsound -lwinmm -lm Cflags: -I${includedir} diff --git a/contrib/src/fluid/rules.mak b/contrib/src/fluid/rules.mak index 8fc125a..f2a9bbf 100644 --- a/contrib/src/fluid/rules.mak +++ b/contrib/src/fluid/rules.mak @@ -20,10 +20,10 @@ $(TARBALLS)/fluidsynth-$(FLUID_VERSION).tar.bz2: fluidsynth: fluidsynth-$(FLUID_VERSION).tar.bz2 .sum-fluid $(UNPACK) $(APPLY) $(SRC)/fluid/fluid-no-bin.patch + $(APPLY) $(SRC)/fluid/fluid-pkg-static.patch ifdef HAVE_WIN32 $(APPLY) $(SRC)/fluid/fluid-static-win32.patch endif - $(APPLY) $(SRC)/fluid/fluid-pkg-static.patch # Remove symbolic links to /usr/share/aclocal cd $(UNPACK_DIR)/m4/ && rm -f libtool.m4 lt*m4 $(MOVE) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
