[vlc-commits] contrib: fluidsynth simplification

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Oct  6 16:39:46 2012 +0300| [d6f2ec0d9d2fed74bcd32c0654fb3cdad3d566ad] | committer: Rémi Denis-Courmont

contrib: fluidsynth simplification

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=d6f2ec0d9d2fed74bcd32c0654fb3cdad3d566ad
---

 contrib/src/fluid/rules.mak |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/contrib/src/fluid/rules.mak b/contrib/src/fluid/rules.mak
index 227c201..f1226fb 100644
--- a/contrib/src/fluid/rules.mak
+++ b/contrib/src/fluid/rules.mak
@@ -6,7 +6,7 @@ FLUID_URL := $(SF)/fluidsynth/fluidsynth-$(FLUID_VERSION)/fluidsynth-$(FLUID_VER
 ifeq ($(call need_pkg,"glib-2.0 gthread-2.0"),)
 PKGS += fluid
 endif
-ifeq ($(call need_pkg,"fluidsynth"),)
+ifeq ($(call need_pkg,"fluidsynth >= 1.1.2"),)
 PKGS_FOUND += fluid
 endif
 
@@ -21,10 +21,9 @@ fluidsynth: fluidsynth-$(FLUID_VERSION).tar.bz2 .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
-	cd $(UNPACK_DIR)/m4/ && rm -f libtool.m4 lt*m4 # 1.1.3 ships symlinks to /usr/share/aclocal
+	# Remove symbolic links to /usr/share/aclocal
+	cd $(UNPACK_DIR)/m4/ && rm -f libtool.m4 lt*m4
 	$(MOVE)
 
 FLUIDCONF := $(HOSTCONF) \