4 files changed, 110 insertions, 0 deletions
diff --git a/multimedia/xbmc/patches/fix-wrapper_c.patch b/multimedia/xbmc/patches/fix-wrapper_c.patch
new file mode 100644
index 0000000000..cb019b98da
--- /dev/null
+++ b/multimedia/xbmc/patches/fix-wrapper_c.patch
@@ -0,0 +1,11 @@
+Index: /trunk/xbmc/cores/DllLoader/exports/wrapper.c
+===================================================================
+--- xbmc/cores/DllLoader/exports/wrapper.c	(revision 23049)
++++ xbmc/cores/DllLoader/exports/wrapper.c	(revision 25862)
+@@ -77,5 +77,5 @@
+ int dll_fseek64(FILE *stream, off64_t offset, int origin);
+ long dll_ftell(FILE *stream);
+-off64_t ftell64(FILE *stream);
++off64_t dll_ftell64(FILE *stream);
+ void dll_rewind(FILE* stream);
+ int dll_fgetpos(FILE* stream, fpos_t* pos);
diff --git a/multimedia/xbmc/patches/jpegint_h.patch b/multimedia/xbmc/patches/jpegint_h.patch
new file mode 100644
index 0000000000..61e8d78c03
--- /dev/null
+++ b/multimedia/xbmc/patches/jpegint_h.patch
@@ -0,0 +1,17 @@
+diff -Naur XBMC.orig/xbmc/lib/cximage-6.0/tiff/tif_ojpeg.c XBMC/xbmc/lib/cximage-6.0/tiff/tif_ojpeg.c
+--- XBMC.orig/xbmc/lib/cximage-6.0/tiff/tif_ojpeg.c	2009-05-26 22:38:28.000000000 +0000
++++ XBMC/xbmc/lib/cximage-6.0/tiff/tif_ojpeg.c	2009-09-08 00:55:37.000000000 +0000
+@@ -31,11 +31,9 @@
+ #endif
+ #define JPEG_INTERNALS /* Include "jpegint.h" for "DSTATE_*" symbols */
+ #undef INLINE
+-#ifdef _LINUX
+-#include <jpeglib.h>
+-#else
++#ifdef _LINUX
+ #include "../jpeg/jpeglib.h"
+-#endif
++#endif
+ #undef JPEG_INTERNALS
+ 
+ /* Hack for Microsoft's Wang Imaging for Windows output files */
diff --git a/multimedia/xbmc/patches/xbmc-9.11-wavpack.patch b/multimedia/xbmc/patches/xbmc-9.11-wavpack.patch
new file mode 100644
index 0000000000..ac2f5211c0
--- /dev/null
+++ b/multimedia/xbmc/patches/xbmc-9.11-wavpack.patch
@@ -0,0 +1,44 @@
+fix from upstream trunk
+
+http://xbmc.org/trac/ticket/8185
+
+Index: trunk/xbmc/cores/paplayer/DllWAVPack.h
+===================================================================
+--- xbmc/cores/paplayer/DllWAVPack.h	(revision 22927)
++++ xbmc/cores/paplayer/DllWAVPack.h	(revision 25321)
+@@ -58,7 +58,7 @@
+     virtual int WavpackGetReducedChannels (WavpackContext *wpc)=0;
+     virtual int WavpackGetFloatNormExp (WavpackContext *wpc)=0;
+-    virtual int WavpackGetMD5Sum (WavpackContext *wpc, uchar data [16])=0;
++    virtual int WavpackGetMD5Sum (WavpackContext *wpc, unsigned char data [16])=0;
+     virtual uint32_t WavpackGetWrapperBytes (WavpackContext *wpc)=0;
+-    virtual uchar *WavpackGetWrapperData (WavpackContext *wpc)=0;
++    virtual unsigned char *WavpackGetWrapperData (WavpackContext *wpc)=0;
+     virtual void WavpackFreeWrapper (WavpackContext *wpc)=0;
+     virtual void WavpackSeekTrailingWrapper (WavpackContext *wpc)=0;
+@@ -77,5 +77,5 @@
+     virtual int WavpackSetConfiguration (WavpackContext *wpc, WavpackConfig *config, uint32_t total_samples)=0;
+     virtual int WavpackAddWrapper (WavpackContext *wpc, void *data, uint32_t bcount)=0;
+-    virtual int WavpackStoreMD5Sum (WavpackContext *wpc, uchar data [16])=0;
++    virtual int WavpackStoreMD5Sum (WavpackContext *wpc, unsigned char data [16])=0;
+     virtual int WavpackPackInit (WavpackContext *wpc)=0;
+     virtual int WavpackPackSamples (WavpackContext *wpc, int32_t *sample_buffer, uint32_t sample_count)=0;
+@@ -133,9 +133,9 @@
+     virtual int WavpackGetFloatNormExp (WavpackContext *wpc)
+         { return ::WavpackGetFloatNormExp (wpc); }
+-    virtual int WavpackGetMD5Sum (WavpackContext *wpc, uchar data [16])
++    virtual int WavpackGetMD5Sum (WavpackContext *wpc, unsigned char data [16])
+         { return ::WavpackGetMD5Sum (wpc, data); }
+     virtual uint32_t WavpackGetWrapperBytes (WavpackContext *wpc)
+         { return ::WavpackGetWrapperBytes (wpc); }
+-    virtual uchar *WavpackGetWrapperData (WavpackContext *wpc)
++    virtual unsigned char *WavpackGetWrapperData (WavpackContext *wpc)
+         { return ::WavpackGetWrapperData (wpc); }
+     virtual void WavpackFreeWrapper (WavpackContext *wpc)
+@@ -171,5 +171,5 @@
+     virtual int WavpackAddWrapper (WavpackContext *wpc, void *data, uint32_t bcount)
+         { return ::WavpackAddWrapper (wpc, data, bcount); }
+-    virtual int WavpackStoreMD5Sum (WavpackContext *wpc, uchar data [16])
++    virtual int WavpackStoreMD5Sum (WavpackContext *wpc, unsigned char data [16])
+         { return ::WavpackStoreMD5Sum (wpc, data); }
+     virtual int WavpackPackInit (WavpackContext *wpc)
diff --git a/multimedia/xbmc/patches/xbmc-lib64.patch b/multimedia/xbmc/patches/xbmc-lib64.patch
new file mode 100644
index 0000000000..2b1856fb54
--- /dev/null
+++ b/multimedia/xbmc/patches/xbmc-lib64.patch
@@ -0,0 +1,38 @@
+diff -Naur xbmc-9.11.orig/xbmc/FileSystem/Makefile xbmc-9.11/xbmc/FileSystem/Makefile
+--- xbmc-9.11.orig/xbmc/FileSystem/Makefile	2009-10-10 13:00:16.000000000 +0000
++++ xbmc-9.11/xbmc/FileSystem/Makefile	2009-12-31 16:37:12.000000000 +0000
+@@ -1,4 +1,4 @@
+-INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
++INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/lib64/dbus-1.0/include -I/usr/lib64/glib-2.0/include
+ INCLUDES+=-I../lib/libcdio/libcdio/include
+ 
+ CXXFLAGS+=-D__STDC_FORMAT_MACROS \
+diff -Naur xbmc-9.11.orig/xbmc/Makefile xbmc-9.11/xbmc/Makefile
+--- xbmc-9.11.orig/xbmc/Makefile	2009-10-26 12:04:25.000000000 +0000
++++ xbmc-9.11/xbmc/Makefile	2009-12-31 16:37:12.000000000 +0000
+@@ -1,4 +1,4 @@
+-INCLUDES+=-I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer -Icores/ffmpeg
++INCLUDES+=-I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer -Icores/ffmpeg -I/usr/lib64/dbus-1.0/include -I/usr/lib64/glib-2.0/include
+ 
+ INCLUDES+=-Ilib/libUPnP/Platinum/Source/Core \
+           -Ilib/libUPnP/Platinum/Source/Platinum \
+diff -Naur xbmc-9.11.orig/xbmc/linux/Makefile.in xbmc-9.11/xbmc/linux/Makefile.in
+--- xbmc-9.11.orig/xbmc/linux/Makefile.in	2009-10-12 10:36:28.000000000 +0000
++++ xbmc-9.11/xbmc/linux/Makefile.in	2009-12-31 16:37:12.000000000 +0000
+@@ -1,6 +1,6 @@
+ ARCH=@ARCH@
+ 
+-INCLUDES=-I. -I.. -I../../guilib -I../utils -I../cores -I../FileSystem
++INCLUDES=-I. -I.. -I../../guilib -I../utils -I../cores -I../FileSystem -I/usr/lib64/dbus-1.0/include -I/usr/lib64/glib-2.0/include
+ ifeq ($(findstring osx,$(ARCH)), osx)
+ 	INCLUDES+=-I../osx
+ endif
+diff -Naur xbmc-9.11.orig/xbmc/utils/Makefile xbmc-9.11/xbmc/utils/Makefile
+--- xbmc-9.11.orig/xbmc/utils/Makefile	2009-10-28 01:59:14.000000000 +0000
++++ xbmc-9.11/xbmc/utils/Makefile	2009-12-31 16:37:12.000000000 +0000
+@@ -1,4 +1,4 @@
+-INCLUDES=-I. -I.. -I../../ -I../linux -I../cores -I../../guilib
++INCLUDES=-I. -I.. -I../../ -I../linux -I../cores -I../../guilib -I/usr/lib64/dbus-1.0/include -I/usr/lib64/glib-2.0/include
+ 
+ SRCS=AlarmClock.cpp \
+      Archive.cpp \