[vlc-commits] Contribs: update modplug to 0.8.8.5

[Jean-Baptiste Kempf]

vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat May 24 18:04:16 2014 +0200| [6fc9ba50ffe301a610c912790b18f3953e5f84cb] | committer: Jean-Baptiste Kempf

Contribs: update modplug to 0.8.8.5

Finally, a release!

(cherry picked from commit 9b11ab7ad01758a25742600c411bc61db05c4ae8)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/modplug/SHA512SUMS |    2 +-
 contrib/src/modplug/rules.mak  |   24 ++++++++++--------------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/contrib/src/modplug/SHA512SUMS b/contrib/src/modplug/SHA512SUMS
index 6676347..a2ed6ba 100644
--- a/contrib/src/modplug/SHA512SUMS
+++ b/contrib/src/modplug/SHA512SUMS
@@ -1 +1 @@
-49869a9e6d8a487ae860dae9901dcdaff7f8d88054e0797bddf50af218e4287e26025f9758711dba29ecedc41b4915a9b660b16fad53eff1b93bada23e6aa1d8  modplug-xmms-git-bc8cb8248788c05b77da7d653f4c677354339a21.zip
+aa943b8df5e3fd41b497e55f5d2c493c28a4c90d444d041f74a58ab5f4702eab9bb36f337e4c795561e0006846a5fda0b42bcf96b33e1267b190f6005862b332  libmodplug-0.8.8.5.tar.gz
diff --git a/contrib/src/modplug/rules.mak b/contrib/src/modplug/rules.mak
index 4ae064c..8ac2484 100644
--- a/contrib/src/modplug/rules.mak
+++ b/contrib/src/modplug/rules.mak
@@ -1,29 +1,25 @@
 # modplug
 
-#MODPLUG_VERSION := 0.8.8.4
-#MODPLUG_URL := $(SF)/modplug-xmms/libmodplug-$(MODPLUG_VERSION).tar.gz
-
-MODPLUG_GIT_HASH := bc8cb8248788c05b77da7d653f4c677354339a21
-#MODPLUG_URL := http://sourceforge.net/code-snapshots/git/m/mo/modplug-xmms/git.git/modplug-xmms-git-$(MODPLUG_GIT_HASH).zip
-MODPLUG_URL := http://download.videolan.org/pub/contrib/modplug-xmms-git-$(MODPLUG_GIT_HASH).zip
+MODPLUG_VERSION := 0.8.8.5
+MODPLUG_URL := $(SF)/modplug-xmms/libmodplug-$(MODPLUG_VERSION).tar.gz
 
 PKGS += modplug
-ifeq ($(call need_pkg,"libmodplug >= 0.8.4 libmodplug != 0.8.8"),)
+ifeq ($(call need_pkg,"libmodplug >= 0.8.8.5"),)
 PKGS_FOUND += modplug
 endif
 
-$(TARBALLS)/modplug-xmms-git-$(MODPLUG_GIT_HASH).zip:
+$(TARBALLS)/libmodplug-$(MODPLUG_VERSION).tar.gz:
 	$(call download,$(MODPLUG_URL))
 
-.sum-modplug: modplug-xmms-git-$(MODPLUG_GIT_HASH).zip
+.sum-modplug: libmodplug-$(MODPLUG_VERSION).tar.gz
 
-libmodplug: modplug-xmms-git-$(MODPLUG_GIT_HASH).zip .sum-modplug
+libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz .sum-modplug
 	$(UNPACK)
-	$(call pkg_static,"libmodplug/libmodplug.pc.in")
+	$(call pkg_static,"libmodplug.pc.in")
 	$(MOVE)
 
 .modplug: libmodplug
-	cd $< && $(RECONF)
-	cd $</libmodplug && $(HOSTVARS) ./configure $(HOSTCONF)
-	cd $</libmodplug && $(MAKE) install
+	$(RECONF)
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
+	cd $< && $(MAKE) install
 	touch $@