[vlc-commits] contrib: modplug: use git version

[Rafaël Carré]

vlc/vlc-2.1 | branch: master | Rafaël Carré <funman at videolan.org> | Sun Aug 18 21:15:40 2013 +0200| [7a3423d0eb3d8d76a0c60c7006b99746df77417b] | committer: Jean-Baptiste Kempf

contrib: modplug: use git version

Close #9209

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

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

 contrib/src/modplug/SHA512SUMS |    2 +-
 contrib/src/modplug/long.patch |   11 +++++++++++
 contrib/src/modplug/rules.mak  |   22 +++++++++++++---------
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/contrib/src/modplug/SHA512SUMS b/contrib/src/modplug/SHA512SUMS
index f16b816..fb2631d 100644
--- a/contrib/src/modplug/SHA512SUMS
+++ b/contrib/src/modplug/SHA512SUMS
@@ -1 +1 @@
-60ef0d1cdcb7a7ba085155487026c128cb7720fcfad16decdf4513a4e4f26a33854044d7da8e25443543d547d599fd7348e72ce241bbacc7994c2560bcf750e3  libmodplug-0.8.8.4.tar.gz
+1bc4cfbb0eb26134d32efb00828a58cb69f06c867d0591de805ba973db3e1d6a8c0f9c2d7c74754150a3ed4c779e83171457eee51fe69b72608e5a27050e394c  modplug-xmms-git-9b08cc646c3dc94dd446ab0671e3427dae8a83fc.zip
diff --git a/contrib/src/modplug/long.patch b/contrib/src/modplug/long.patch
new file mode 100644
index 0000000..cff7fab
--- /dev/null
+++ b/contrib/src/modplug/long.patch
@@ -0,0 +1,11 @@
+--- libmodplug/libmodplug/src/load_pat.cpp.orig	2013-08-18 21:12:50.404538525 +0200
++++ libmodplug/libmodplug/src/load_pat.cpp	2013-08-18 21:13:15.496538108 +0200
+@@ -626,7 +626,7 @@
+ static int pat_readpat_attr(int pat, WaveHeader *hw, int layer)
+ {
+ 	char fname[128];
+-	uint fsize;
++	long fsize;
+ 	MMSTREAM *mmpat;
+ 	pat_build_path(fname, pat);
+ 	mmpat = _mm_fopen(fname, "r");
diff --git a/contrib/src/modplug/rules.mak b/contrib/src/modplug/rules.mak
index 674ae7f..1daa6c4 100644
--- a/contrib/src/modplug/rules.mak
+++ b/contrib/src/modplug/rules.mak
@@ -1,25 +1,29 @@
 # modplug
 
-MODPLUG_VERSION := 0.8.8.4
-MODPLUG_URL := $(SF)/modplug-xmms/libmodplug-$(MODPLUG_VERSION).tar.gz
+#MODPLUG_VERSION := 0.8.8.4
+#MODPLUG_URL := $(SF)/modplug-xmms/libmodplug-$(MODPLUG_VERSION).tar.gz
+
+MODPLUG_GIT_HASH := 9b08cc646c3dc94dd446ab0671e3427dae8a83fc
+MODPLUG_URL := http://sourceforge.net/code-snapshots/git/m/mo/modplug-xmms/git.git/modplug-xmms-git-$(MODPLUG_GIT_HASH).zip
 
 PKGS += modplug
 ifeq ($(call need_pkg,"libmodplug >= 0.8.4 libmodplug != 0.8.8"),)
 PKGS_FOUND += modplug
 endif
 
-$(TARBALLS)/libmodplug-$(MODPLUG_VERSION).tar.gz:
+$(TARBALLS)/modplug-xmms-git-$(MODPLUG_GIT_HASH).zip:
 	$(call download,$(MODPLUG_URL))
 
-.sum-modplug: libmodplug-$(MODPLUG_VERSION).tar.gz
+.sum-modplug: modplug-xmms-git-$(MODPLUG_GIT_HASH).zip
 
-libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz .sum-modplug
+libmodplug: modplug-xmms-git-$(MODPLUG_GIT_HASH).zip .sum-modplug
 	$(UNPACK)
-	$(UPDATE_AUTOCONFIG)
-	$(call pkg_static,"libmodplug.pc.in")
+	$(APPLY) $(SRC)/modplug/long.patch
+	$(call pkg_static,"libmodplug/libmodplug.pc.in")
 	$(MOVE)
 
 .modplug: libmodplug
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
-	cd $< && $(MAKE) install
+	cd $< && $(RECONF)
+	cd $</libmodplug && $(HOSTVARS) ./configure $(HOSTCONF)
+	cd $</libmodplug && $(MAKE) install
 	touch $@