3 files changed, 50 insertions, 9 deletions
diff --git a/multimedia/xbmc/patches/non-sse2-cpu.patch b/multimedia/xbmc/patches/non-sse2-cpu.patch
index 0af727f2f7..ebf927c1ac 100644
--- a/multimedia/xbmc/patches/non-sse2-cpu.patch
+++ b/multimedia/xbmc/patches/non-sse2-cpu.patch
@@ -1,12 +1,21 @@
-diff -Naur xbmc-10.00.orig/xbmc/lib/libsquish/Makefile.in xbmc-10.00/xbmc/lib/libsquish/Makefile.in
---- xbmc-10.00.orig/xbmc/lib/libsquish/Makefile.in	2010-05-18 07:29:17.000000000 +0000
-+++ xbmc-10.00/xbmc/lib/libsquish/Makefile.in	2010-10-29 03:17:26.000000000 +0000
-@@ -8,7 +8,7 @@
- ifeq ($(ARCH),arm)
- CXXFLAGS+=-I.
+diff -Naur xbmc-11.0-Eden_beta1.orig/lib/libsquish/Makefile.in xbmc-11.0-Eden_beta1/lib/libsquish/Makefile.in
+--- xbmc-11.0-Eden_beta1.orig/lib/libsquish/Makefile.in	2011-12-23 03:12:21.000000000 +0000
++++ xbmc-11.0-Eden_beta1/lib/libsquish/Makefile.in	2012-01-02 20:14:20.792407216 +0000
+@@ -15,7 +15,7 @@
+ ifeq ($(findstring powerpc,$(ARCH)),powerpc)
+   CXXFLAGS+=-DSQUISH_USE_ALTIVEC=1 -maltivec
+ else ifeq ($(findstring x86,$(ARCH)), x86)
+-  CXXFLAGS+=-DSQUISH_USE_SSE=2 -msse2
++  CXXFLAGS+=-DSQUISH_USE_SSE=1 -msse
+ endif
+ 
+ LIB=libsquish.a
+@@ -30,7 +30,7 @@
+ ifeq ($(findstring osx,$(ARCH)),osx)
+ 	g++ -m32 -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
  else
--CXXFLAGS+=-I. -DSQUISH_USE_SSE=2 -msse2
-+CXXFLAGS+=-I. -DSQUISH_USE_SSE=1 -msse
+-	g++ -DSQUISH_USE_SSE=2 -msse2 -I. $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
++	g++ -DSQUISH_USE_SSE=1 -msse -I. $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
  endif
  endif
- LIB=libsquish-@ARCH@.a
+ 
diff --git a/multimedia/xbmc/patches/system-includes.patch b/multimedia/xbmc/patches/system-includes.patch
new file mode 100644
index 0000000000..8c076b36d4
--- /dev/null
+++ b/multimedia/xbmc/patches/system-includes.patch
@@ -0,0 +1,19 @@
+diff -Naur xbmc-11.0-Eden_beta1.orig/Makefile.include.in xbmc-11.0-Eden_beta1/Makefile.include.in
+--- xbmc-11.0-Eden_beta1.orig/Makefile.include.in	2011-12-23 03:12:21.000000000 +0000
++++ xbmc-11.0-Eden_beta1/Makefile.include.in	2012-01-02 22:07:34.114048145 +0000
+@@ -32,7 +32,6 @@
+ CXXFLAGS+=@CXXFLAGS@
+ CFLAGS+=@CFLAGS@
+ LDFLAGS+=@LDFLAGS@
+-INCLUDES+=$(sort @INCLUDES@)
+ INCLUDES+=-I@abs_top_srcdir@/lib
+ INCLUDES+=-I@abs_top_srcdir@/xbmc
+ ifneq (@USE_EXTERNAL_FFMPEG@,1)
+@@ -40,6 +39,7 @@
+ endif
+ INCLUDES+=-I@abs_top_srcdir@/xbmc/linux
+ INCLUDES+=-I@abs_top_srcdir@/xbmc/cores/dvdplayer
++INCLUDES+=$(sort @INCLUDES@)
+ DEFINES+= \
+ 	@ARCH_DEFINES@ \
+ 	-D_FILE_DEFINED \
diff --git a/multimedia/xbmc/patches/xbmc-rtmpdump-build.patch b/multimedia/xbmc/patches/xbmc-rtmpdump-build.patch
new file mode 100644
index 0000000000..e77d7d0e8a
--- /dev/null
+++ b/multimedia/xbmc/patches/xbmc-rtmpdump-build.patch
@@ -0,0 +1,13 @@
+diff -Naur xbmc-11.0.orig/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp xbmc-11.0/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp
+--- xbmc-11.0.orig/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp	2012-03-21 22:07:50.000000000 +0000
++++ xbmc-11.0/xbmc/cores/dvdplayer/DVDInputStreams/DVDInputStreamRTMP.cpp	2012-03-31 21:44:15.320639375 +0000
+@@ -22,9 +22,7 @@
+ #if (defined HAVE_CONFIG_H) && (!defined WIN32)
+   #include "config.h"
+ #endif
+-#ifdef _WIN32
+ #include "system.h" // just for HAS_LIBRTMP
+-#endif
+ 
+ #ifdef HAS_LIBRTMP
+ #include "settings/AdvancedSettings.h"