[vlc-devel] commit: contribs: compilation fix fo libmodplug when compiling with GCC-LLVM-4.2 ( Felix Paul Kühne )

[git version control]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat Dec 27 00:30:56 2008 +0100| [ff87fdb915d104a79f868f57ed0cc7524a741aa3] | committer: Felix Paul Kühne 

contribs: compilation fix fo libmodplug when compiling with GCC-LLVM-4.2

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

 extras/contrib/src/Makefile                        |    1 +
 .../contrib/src/Patches/libmodplug-gccllvm42.patch |   42 ++++++++++++++++++++
 2 files changed, 43 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index bf1fe95..eab3661 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1435,6 +1435,7 @@ libmodplug-$(MODPLUG_VERSION).tar.gz:
 
 libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz
 	$(EXTRACT_GZ)
+	patch -p0 < Patches/libmodplug-gccllvm42.patch
 ifdef HAVE_WIN32
 	patch -p0 < Patches/libmodplug-win32.patch
 	(cd $@; autoreconf)
diff --git a/extras/contrib/src/Patches/libmodplug-gccllvm42.patch b/extras/contrib/src/Patches/libmodplug-gccllvm42.patch
new file mode 100644
index 0000000..8a686be
--- /dev/null
+++ b/extras/contrib/src/Patches/libmodplug-gccllvm42.patch
@@ -0,0 +1,42 @@
+diff -ru libmodplug-orig/src/load_abc.cpp libmodplug/src/load_abc.cpp
+--- libmodplug-orig/src/load_abc.cpp	2006-11-02 03:18:26.000000000 +0100
++++ libmodplug/src/load_abc.cpp	2008-12-27 00:20:46.000000000 +0100
+@@ -43,6 +43,10 @@
+ 
+ #include "load_pat.h"
+ 
++#ifndef uint
++#typedef uint unsigned int
++#endif
++
+ #define MAXABCINCLUDES	8
+ #define MAXCHORDNAMES 80
+ #define ABC_ENV_DUMPTRACKS		"MMABC_DUMPTRACKS"
+diff -ru libmodplug-orig/src/load_mid.cpp libmodplug/src/load_mid.cpp
+--- libmodplug-orig/src/load_mid.cpp	2006-11-02 02:50:47.000000000 +0100
++++ libmodplug/src/load_mid.cpp	2008-12-27 00:15:30.000000000 +0100
+@@ -52,6 +52,10 @@
+ 
+ #include "load_pat.h"
+ 
++#ifndef uint
++#typedef uint unsigned int
++#endif
++
+ #define ROWSPERNOTE 16
+ #define ENV_MMMID_SPEED	"MMMID_SPEED"
+ #define ENV_MMMID_DEBUG "MMMID_DEBUG"
+diff -ru libmodplug-orig/src/load_pat.cpp libmodplug/src/load_pat.cpp
+--- libmodplug-orig/src/load_pat.cpp	2006-09-12 01:57:25.000000000 +0200
++++ libmodplug/src/load_pat.cpp	2008-12-27 00:20:43.000000000 +0100
+@@ -47,6 +47,10 @@
+ 
+ #include "load_pat.h"
+ 
++#ifndef uint
++#typedef uint unsigned int
++#endif
++
+ #ifdef MSC_VER
+ #define DIRDELIM		'\\'
+ #define TIMIDITYCFG	"C:\\TIMIDITY\\TIMIDITY.CFG"