[vlc-commits] contrib/modplug: remove patch merged upstream

[Felix Paul Kühne]

vlc/vlc-2.1 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Mon Oct  7 19:48:21 2013 +0200| [9ec880888750e97e3e51ed73c554a6441b574589] | committer: Felix Paul Kühne

contrib/modplug: remove patch merged upstream

(cherry picked from commit 2cf63b81629d7b69d76d65dc60f3c49a27bd199c)

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

 contrib/src/modplug/long.patch |   11 -----------
 contrib/src/modplug/rules.mak  |    1 -
 2 files changed, 12 deletions(-)

diff --git a/contrib/src/modplug/long.patch b/contrib/src/modplug/long.patch
deleted file mode 100644
index cff7fab..0000000
--- a/contrib/src/modplug/long.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 07cd740..674ca3b 100644
--- a/contrib/src/modplug/rules.mak
+++ b/contrib/src/modplug/rules.mak
@@ -18,7 +18,6 @@ $(TARBALLS)/modplug-xmms-git-$(MODPLUG_GIT_HASH).zip:
 
 libmodplug: modplug-xmms-git-$(MODPLUG_GIT_HASH).zip .sum-modplug
 	$(UNPACK)
-	$(APPLY) $(SRC)/modplug/long.patch
 	$(call pkg_static,"libmodplug/libmodplug.pc.in")
 	$(MOVE)