contrib: update fluidsynth where possible and auto-detect

diff --git a/contrib/src/fluid/SHA512SUMS b/contrib/src/fluid/SHA512SUMS
index 1a81196960a49227d2338695fa32ccb97b9de1cd..cb9e40fd028ebf631b92315d55f6e55b9612142f 100644 (file)
--- a/contrib/src/fluid/SHA512SUMS
+++ b/contrib/src/fluid/SHA512SUMS
@@ -1 +1,2 @@
 9e8ca850d4dbf8404208ef6bb76d9d3775f574f10b2d0045aba23c989b893bcf6386d72dda593e0e4cdcb744f78b03859a2146edf8cce77c027416680ceb0ce1  fluidsynth-1.0.9.tar.gz
+b0f97b9c890d45a59dcb1cc0676a6a157c3f57231f433b38441f8b89a70b5a73f3e9d8ef9e35ecd5209fbbc86c4ec8779439c51cde431295b8a9349b718b118e  fluidsynth-1.1.3.tar.bz2

diff --git a/contrib/src/fluid/rules.mak b/contrib/src/fluid/rules.mak
index 5647b51c0f986ac7b35123b4133368498a0a83a4..a7f45aecec2a5556d2395797558d27e89e8a5c06 100644 (file)
--- a/contrib/src/fluid/rules.mak
+++ b/contrib/src/fluid/rules.mak
@@ -1,16 +1,29 @@
 # 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.3
+FLUID_URL := $(SF)/fluidsynth/fluidsynth-$(FLUID_VERSION)/fluidsynth-$(FLUID_VERSION).tar.bz2
+FLUID_OLDURL := $(SF)/fluidsynth/older%20releases/fluidsynth-1.0.9.tar.gz
 
-$(TARBALLS)/fluidsynth-$(FLUID_VERSION).tar.gz:
+PKGS += fluid
+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
+$(TARBALLS)/fluidsynth-1.0.9.tar.gz:
+       $(call download,$(FLUID_OLDURL))
+
+.sum-fluid: fluidsynth-$(FLUID_VERSION).tar.bz2 fluidsynth-1.0.9.tar.gz
+
+ifeq ($(call need_pkg,"glib-2.0"),)
+FLUID_TARBALL := fluidsynth-$(FLUID_VERSION).tar.bz2
+else
+FLUID_TARBALL := fluidsynth-1.0.9.tar.gz
+endif
 
-fluidsynth: fluidsynth-$(FLUID_VERSION).tar.gz .sum-fluid
+fluidsynth: $(FLUID_TARBALL) .sum-fluid
        $(UNPACK)
        $(APPLY) $(SRC)/fluid/fluid-no-bin.patch
 ifdef HAVE_WIN32
@@ -20,12 +33,15 @@ endif
 
 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 \