[vlc-commits] contrib: remove old buggy fluidsynth

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Feb  1 20:47:08 2012 +0200| [7ea3bec87710af8aa0067d33aafa8fcfadac95f5] | committer: Rémi Denis-Courmont

contrib: remove old buggy fluidsynth

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

 contrib/src/fluid/SHA512SUMS |    1 -
 contrib/src/fluid/rules.mak  |   15 ++-------------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/contrib/src/fluid/SHA512SUMS b/contrib/src/fluid/SHA512SUMS
index cb9e40f..22fe2a7 100644
--- a/contrib/src/fluid/SHA512SUMS
+++ b/contrib/src/fluid/SHA512SUMS
@@ -1,2 +1 @@
-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 7313e8a..3b6dc26 100644
--- a/contrib/src/fluid/rules.mak
+++ b/contrib/src/fluid/rules.mak
@@ -2,7 +2,6 @@
 
 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
 
 PKGS += fluid
 ifeq ($(call need_pkg,"fluidsynth"),)
@@ -12,19 +11,9 @@ endif
 $(TARBALLS)/fluidsynth-$(FLUID_VERSION).tar.bz2:
 	$(call download,$(FLUID_URL))
 
-$(TARBALLS)/fluidsynth-1.0.9.tar.gz:
-	$(call download,$(FLUID_OLDURL))
+.sum-fluid: fluidsynth-$(FLUID_VERSION).tar.bz2
 
-.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
-FLUID_VERSION := 1.0.9
-endif
-
-fluidsynth: $(FLUID_TARBALL) .sum-fluid
+fluidsynth: fluidsynth-$(FLUID_VERSION).tar.bz2 .sum-fluid
 	$(UNPACK)
 	$(APPLY) $(SRC)/fluid/fluid-no-bin.patch
 ifdef HAVE_WIN32