contrib: update fluidsynth to 1.1.4

[vlc] / contrib / src / fluid / rules.mak

diff --git a/contrib/src/fluid/rules.mak b/contrib/src/fluid/rules.mak
index 5647b51c0f986ac7b35123b4133368498a0a83a4..227c201b99800f8022a711fce95bf95793e490a9 100644 (file)
--- a/contrib/src/fluid/rules.mak
+++ b/contrib/src/fluid/rules.mak
@@ -1,31 +1,43 @@
 # fluid
 
- # DO NOT update, this will require glib
-FLUID_VERSION := 1.0.9
-#FLUID_URL := http://download.savannah.gnu.org/releases/fluid/fluidsynth-$(FLUID_VERSION).tar.gz
-FLUID_URL := $(SF)/fluidsynth/older%20releases/fluidsynth-$(FLUID_VERSION).tar.gz
+FLUID_VERSION := 1.1.4
+FLUID_URL := $(SF)/fluidsynth/fluidsynth-$(FLUID_VERSION)/fluidsynth-$(FLUID_VERSION).tar.bz2
 
-$(TARBALLS)/fluidsynth-$(FLUID_VERSION).tar.gz:
+ifeq ($(call need_pkg,"glib-2.0 gthread-2.0"),)
+PKGS += fluid
+endif
+ifeq ($(call need_pkg,"fluidsynth"),)
+PKGS_FOUND += fluid
+endif
+
+$(TARBALLS)/fluidsynth-$(FLUID_VERSION).tar.bz2:
        $(call download,$(FLUID_URL))
 
-.sum-fluid: fluidsynth-$(FLUID_VERSION).tar.gz
+.sum-fluid: fluidsynth-$(FLUID_VERSION).tar.bz2
 
-fluidsynth: fluidsynth-$(FLUID_VERSION).tar.gz .sum-fluid
+fluidsynth: fluidsynth-$(FLUID_VERSION).tar.bz2 .sum-fluid
        $(UNPACK)
        $(APPLY) $(SRC)/fluid/fluid-no-bin.patch
 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
+       cd $(UNPACK_DIR)/m4/ && rm -f libtool.m4 lt*m4 # 1.1.3 ships symlinks to /usr/share/aclocal
        $(MOVE)
 
 FLUIDCONF := $(HOSTCONF) \
        --disable-alsa-support \
+       --disable-aufile-support \
        --disable-coreaudio \
        --disable-coremidi \
        --disable-dart \
+       --disable-dbus-support \
        --disable-jack-support \
        --disable-ladcca \
        --disable-lash \
+       --disable-libsndfile-support \
        --disable-midishare \
        --disable-oss-support \
        --disable-portaudio-support \
@@ -34,6 +46,6 @@ FLUIDCONF := $(HOSTCONF) \
 
 .fluid: fluidsynth
        $(RECONF)
-       cd $< && $(HOSTVARS) ./configure $(FLUIDCONF)
+       cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS) -DFLUIDSYNTH_NOT_A_DLL" ./configure $(FLUIDCONF)
        cd $< && $(MAKE) install
        touch $@