diff --git a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta
index b9779d7f8b..03bbb17de6 100644
--- a/packages/mediacenter/xbmc-pvr-theme-Confluence/meta
+++ b/packages/mediacenter/xbmc-pvr-theme-Confluence/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-pvr-theme-Confluence"
-PKG_VERSION="10.0-Dharma-pvr-7647593"
+PKG_VERSION="master-2a1a563"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc-pvr/build b/packages/mediacenter/xbmc-pvr/build
index a204715ec7..237dc994f9 100755
--- a/packages/mediacenter/xbmc-pvr/build
+++ b/packages/mediacenter/xbmc-pvr/build
@@ -106,10 +106,10 @@ cd $PKG_BUILD
 do_autoreconf
 do_autoreconf lib/cpluff
 [ -d lib/libass ] && do_autoreconf lib/libass
-[ -d xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss ] && do_autoreconf xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss
-do_autoreconf xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread
-do_autoreconf xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav
-do_autoreconf xbmc/lib/libid3tag/libid3tag
+[ -d lib/libdvd/libdvdcss ] && do_autoreconf lib/libdvd/libdvdcss
+do_autoreconf lib/libdvd/libdvdread
+do_autoreconf lib/libdvd/libdvdnav
+do_autoreconf lib/libid3tag/libid3tag
 
 ./configure --host=$TARGET_NAME \
             --build=$HOST_NAME \
@@ -153,7 +153,7 @@ do_autoreconf xbmc/lib/libid3tag/libid3tag
             --enable-external-python \
 
 # setup default skin inside the sources
-  sed -i -e "s|skin.confluence|$SKIN_DIR|g" xbmc/Settings.h
+  sed -i -e "s|skin.confluence|$SKIN_DIR|g" xbmc/settings/Settings.h
 
 make externals
 make xbmc.bin
diff --git a/packages/mediacenter/xbmc-pvr/meta b/packages/mediacenter/xbmc-pvr/meta
index 660cf36fc1..417d40ad55 100644
--- a/packages/mediacenter/xbmc-pvr/meta
+++ b/packages/mediacenter/xbmc-pvr/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-pvr"
-PKG_VERSION="10.0-Dharma-pvr-7647593"
+PKG_VERSION="master-2a1a563"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-451-full_splash-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/451-full_splash-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-451-full_splash-0.1.patch
rename to packages/mediacenter/xbmc-pvr/patches/451-full_splash-0.1.patch
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-002-arm_remove_forced_python2.5-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-002-arm_remove_forced_python2.5-0.1.patch
deleted file mode 100644
index f90ee1faa0..0000000000
--- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-002-arm_remove_forced_python2.5-0.1.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -Naur xbmc-dharma-35100/Makefile.in xbmc-dharma-35100.patch/Makefile.in
---- xbmc-dharma-35100/Makefile.in	2010-10-30 05:36:41.000000000 +0200
-+++ xbmc-dharma-35100.patch/Makefile.in	2010-11-01 04:53:48.542705631 +0100
-@@ -471,11 +471,6 @@
- 	xbmc/cores/DllLoader/exports/util/exports_utils.a \
- 	xbmc/cores/DllLoader/exports/exports.a
- 
--ifeq (arm, $(ARCH))
--# Force external python2.5 for now!
--LIBS +=-lpython2.5
--endif
--
- xbmc.bin: $(OBJSXBMC) $(DYNOBJSXBMC)
- ifeq ($(findstring osx,$(ARCH)), osx)
- 	$(CXX) $(LDFLAGS) -o xbmc.bin -Wl,-all_load,-ObjC $(DYNOBJSXBMC) $(OBJSXBMC) $(LIBS) -rdynamic
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-301-correct_lzo_include-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-301-correct_lzo_include-0.1.patch
deleted file mode 100644
index d9b5732f81..0000000000
--- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-301-correct_lzo_include-0.1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
---- xbmc-31903/configure.in	2010-07-17 16:50:02.838501479 +0200
-+++ xbmc-31903.patch/configure.in	2010-07-17 16:50:20.633376618 +0200
-@@ -1205,12 +1205,6 @@
-   final_message="$final_message\n  MID Support:\tNo"
- fi
- 
--if test -d "/usr/include/lzo"; then
--  INCLUDES="$INCLUDES -I/usr/include/lzo"
--else
--  INCLUDES="$INCLUDES"
--fi
--
- if test "x$use_ccache" != "xno"; then
-   AC_PATH_PROG(CCACHE,ccache,none)
-   if test "$ac_cv_path_CCACHE" = "none"; then
-diff -Naur xbmc-31903/tools/TexturePacker/XBMCTex.cpp xbmc-31903.patch/tools/TexturePacker/XBMCTex.cpp
---- xbmc-31903/tools/TexturePacker/XBMCTex.cpp	2010-07-17 16:28:40.000000000 +0200
-+++ xbmc-31903.patch/tools/TexturePacker/XBMCTex.cpp	2010-07-17 16:50:20.634375824 +0200
-@@ -37,7 +37,7 @@
- #endif
- 
- #ifdef _LINUX
--#include <lzo1x.h>
-+#include <lzo/lzo1x.h>
- #else
- #include "../../xbmc/lib/liblzo/LZO1X.H"
- #endif
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-302-dont_hardcode_usr_include-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-302-dont_hardcode_usr_include-0.1.patch
deleted file mode 100644
index 33af095f6e..0000000000
--- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-302-dont_hardcode_usr_include-0.1.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -Naur xbmc-28910/guilib/Makefile.in xbmc-28910.patch/guilib/Makefile.in
---- xbmc-28910/guilib/Makefile.in	2010-03-28 17:12:32.000000000 +0200
-+++ xbmc-28910.patch/guilib/Makefile.in	2010-03-28 19:13:23.816629379 +0200
-@@ -1,4 +1,4 @@
--INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/linux -I../xbmc/utils -I/usr/include/freetype2 -I/usr/include/SDL -I../xbmc/lib/libsquish
-+INCLUDES=-I. -I../ -Icommon -I../xbmc -I../xbmc/linux -I../xbmc/utils -I../xbmc/lib/libsquish
- ifneq (@USE_EXTERNAL_FFMPEG@,1)
-   INCLUDES+=-I../xbmc/cores/dvdplayer/Codecs/ffmpeg
- endif
-diff -Naur xbmc-28910/xbmc/FileSystem/Makefile.in xbmc-28910.patch/xbmc/FileSystem/Makefile.in
---- xbmc-28910/xbmc/FileSystem/Makefile.in	2010-03-28 17:14:55.000000000 +0200
-+++ xbmc-28910.patch/xbmc/FileSystem/Makefile.in	2010-03-28 19:13:23.834753245 +0200
-@@ -1,6 +1,6 @@
- ARCH=@ARCH@
- 
--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../lib
-+INCLUDES=-I. -I../ -I../cores -I../linux -I../../guilib -I../lib/UnrarXLib -I../utils -I../lib
- INCLUDES+=-I../lib/libcdio/libcdio/include
- ifeq ($(findstring osx,$(ARCH)), osx)
- INCLUDES+=-I../../lib/libcurl-OSX/include
-diff -Naur xbmc-28910/xbmc/Makefile.in xbmc-28910.patch/xbmc/Makefile.in
---- xbmc-28910/xbmc/Makefile.in	2010-03-28 17:13:35.000000000 +0200
-+++ xbmc-28910.patch/xbmc/Makefile.in	2010-03-28 19:13:23.837752973 +0200
-@@ -1,4 +1,4 @@
--INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -I/usr/include/freetype2 -Icores/dvdplayer
-+INCLUDES+=-I../ -I. -Ilinux -Icores -I../guilib -Iutils -IFileSystem -Icores/dvdplayer
- 
- ifneq (@USE_EXTERNAL_FFMPEG@,1)
-   INCLUDES+=-Icores/dvdplayer/Codecs/ffmpeg
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-WiiRemote_crosscompiling-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-WiiRemote_crosscompiling-0.1.patch
deleted file mode 100644
index e63840a6da..0000000000
--- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-WiiRemote_crosscompiling-0.1.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/Makefile
---- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/Makefile	2010-09-19 14:54:08.000000000 +0200
-+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/Makefile	2010-09-21 20:31:58.649299449 +0200
-@@ -1,3 +1,4 @@
-+CXX ?= g++
- CFLAGS = -Wall -pipe -fPIC -funroll-loops
- OBJ_DIR = release-$(shell $(CC) -v 2>&1|grep ^Target:|cut -d' ' -f2)
- OBJS = wiiuse_v0.12/src/$(OBJ_DIR)/libwiiuse.so
-@@ -6,7 +7,7 @@
- 
- all:
- 	@$(MAKE) -C wiiuse_$(VERSION)/src $@
--	g++ $(CFLAGS) WiiUse_WiiRemote.cpp $(OBJS) -o $(BIN)
-+	$(CXX) $(CFLAGS) -I./wiiuse_$(VERSION)/src WiiUse_WiiRemote.cpp $(OBJS) -o $(BIN)
- wiiuse:
- 	@$(MAKE) -C wiiuse_$(VERSION)/src
- clean:
-diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile
---- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile	2010-09-19 14:54:08.000000000 +0200
-+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example/Makefile	2010-09-21 20:28:15.388265664 +0200
-@@ -5,7 +5,7 @@
- #
- # Change this to your GCC version.
- #
--CC = gcc
-+CC ?= gcc
- 
- ####################################################
- #
-diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile
---- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile	2010-09-19 14:54:08.000000000 +0200
-+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/example-sdl/Makefile	2010-09-21 20:28:22.476390252 +0200
-@@ -5,7 +5,7 @@
- #
- # Change this to your GCC version.
- #
--CC = gcc
-+CC ?= gcc
- 
- ####################################################
- #
-diff -Naur xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile
---- xbmc-dharma-33971/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile	2010-09-19 14:54:08.000000000 +0200
-+++ xbmc-dharma-33971.patch/tools/EventClients/Clients/WiiRemote/wiiuse_v0.12/src/Makefile	2010-09-21 20:28:32.447265813 +0200
-@@ -5,7 +5,7 @@
- #
- # Change this to your GCC version.
- #
--CC = gcc
-+CC ?= gcc
- 
- ####################################################
- #
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-fix_libdvd_xFLAGS-0.1.patch
deleted file mode 100644
index d3155b02bc..0000000000
--- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-303-fix_libdvd_xFLAGS-0.1.patch
+++ /dev/null
@@ -1,119 +0,0 @@
-diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in
---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in	2010-09-04 04:22:52.000000000 +0200
-+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in	2010-09-06 00:34:45.247116875 +0200
-@@ -6,5 +6,5 @@
- Name: libdvdcss
- Description: DVD access and decryption library.
- Version: @VERSION@
--Libs: -L${libdir} -ldvdcss
--Cflags: -I{includedir} -I${includedir}/@PACKAGE@
-+Libs: -ldvdcss
-+Cflags: -I.
-diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh
---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh	2010-09-04 04:22:50.000000000 +0200
-+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh	2010-09-06 00:30:38.943396556 +0200
-@@ -56,17 +56,17 @@
- fi
- 
- if test "$echo_cflags" = "yes"; then
--      echo -I$prefix/include $dvdread_cflags $extracflags $threadcflags
-+      echo $dvdread_cflags $extracflags $threadcflags
- fi
- 
- if test "$echo_minicflags" = "yes"; then
--      echo -I$prefix/include -I$prefix/include/dvdnav $extracflags $threadcflags
-+      echo $extracflags $threadcflags
- fi
- 
- if test "$echo_libs" = "yes"; then
--      echo -L$libdir -ldvdnav $dvdread_libs $threadlib
-+      echo -ldvdnav $dvdread_libs $threadlib
- fi      
- 
- if test "$echo_minilibs" = "yes"; then
--      echo -L$libdir -ldvdnavmini $threadlib
-+      echo -ldvdnavmini $threadlib
- fi
-diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in
---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in	2010-09-04 04:22:50.000000000 +0200
-+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in	2010-09-06 00:31:04.643116783 +0200
-@@ -76,13 +76,13 @@
- fi
- 
- if test "$echo_cflags" = "yes"; then
--      echo -I@includedir@ -I@includedir@/libdvdread @THREAD_CFLAGS@
-+      echo @THREAD_CFLAGS@
- fi
- 
- if test "$echo_libs" = "yes"; then
--      echo -L@libdir@ -ldvdnav -ldvdread @THREAD_LIBS@
-+      echo -ldvdnav -ldvdread @THREAD_LIBS@
- fi
- 
- if test "$echo_minilibs" = "yes"; then
--      echo -L@libdir@ -ldvdnavmini @THREAD_LIBS@
-+      echo -ldvdnavmini @THREAD_LIBS@
- fi      
-diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in
---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in	2010-09-04 04:22:50.000000000 +0200
-+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in	2010-09-06 00:31:31.665116765 +0200
-@@ -7,5 +7,5 @@
- Description: DVD Navigation mini library
- Version: @VERSION@
- 
--Cflags: -I${includedir} @DVDREAD_CFLAGS@ @THREAD_CFLAGS@
--Libs: -L${libdir} -ldvdnav @THREAD_LIBS@
-+Cflags: @DVDREAD_CFLAGS@ @THREAD_CFLAGS@
-+Libs: -ldvdnav @THREAD_LIBS@
-diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in
---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in	2010-09-04 04:22:50.000000000 +0200
-+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in	2010-09-06 00:31:18.193116906 +0200
-@@ -8,5 +8,5 @@
- Version: @VERSION@
- 
- Requires.private: dvdread >= 4.1.2
--Cflags: -I${includedir} @THREAD_CFLAGS@
--Libs: -L${libdir} -ldvdnav @THREAD_LIBS@
-+Cflags: @THREAD_CFLAGS@
-+Libs: -ldvdnav @THREAD_LIBS@
-diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in
---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in	2010-09-04 04:22:51.000000000 +0200
-+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in	2010-09-06 00:32:18.255991830 +0200
-@@ -72,9 +72,9 @@
- fi
- 
- if test "$echo_cflags" = "yes"; then
--      echo -I@includedir@
-+      echo ""
- fi
- 
- if test "$echo_libs" = "yes"; then
--      echo -L@libdir@ -ldvdread
-+      echo -ldvdread
- fi
-diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh
---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh	2010-09-04 04:22:51.000000000 +0200
-+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh	2010-09-06 00:32:35.283991243 +0200
-@@ -48,9 +48,9 @@
- fi
- 
- if test "$echo_cflags" = "yes"; then
--      echo -I$prefix/include $extracflags
-+      echo $extracflags
- fi
- 
- if test "$echo_libs" = "yes"; then
--      echo -L$libdir $dvdreadlib
-+      echo $dvdreadlib
- fi      
-diff -Naur xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in
---- xbmc-dharma-33517/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in	2010-09-04 04:22:51.000000000 +0200
-+++ xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in	2010-09-06 00:32:57.831991741 +0200
-@@ -7,5 +7,5 @@
- Description: Low level DVD access library
- Version: @VERSION@
- 
--Cflags: -I${includedir}
--Libs: -L${libdir} -ldvdread
-+Cflags: -I.
-+Libs: -ldvdread
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-401-we_dont_need_libXinerama-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-401-we_dont_need_libXinerama-0.1.patch
deleted file mode 100644
index c3e6dea659..0000000000
--- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-401-we_dont_need_libXinerama-0.1.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
---- xbmc-31903/configure.in	2010-07-17 16:50:57.045376680 +0200
-+++ xbmc-31903.patch/configure.in	2010-07-17 16:52:57.912501212 +0200
-@@ -585,9 +585,6 @@
-   PKG_CHECK_MODULES([XMU],   [xmu],
-     [INCLUDES="$INCLUDES $XMU_CFLAGS"; LIBS="$LIBS $XMU_LIBS"],
-     AC_MSG_ERROR($missing_library))
--  PKG_CHECK_MODULES([XINERAMA],[xinerama],
--    [INCLUDES="$INCLUDES $XINERAMA_CFLAGS"; LIBS="$LIBS $XINERAMA_LIBS"],
--    AC_MSG_ERROR($missing_library))
-   PKG_CHECK_MODULES([CURL],  [libcurl],
-     [INCLUDES="$INCLUDES $CURL_CFLAGS"; LIBS="$LIBS $CURL_LIBS"],
-     AC_MSG_ERROR($missing_library))
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch
deleted file mode 100644
index a77ad31d11..0000000000
--- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-501-fixed_bitstream_mode_improperly_set-Ticket-10981.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur xbmc-10.0-Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c xbmc-10.0-Dharma.patch/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c
---- xbmc-10.0-Dharma/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c	2010-12-17 20:13:36.000000000 +0100
-+++ xbmc-10.0-Dharma.patch/xbmc/cores/dvdplayer/Codecs/ffmpeg/libavformat/spdif.c	2011-01-07 01:19:48.721555949 +0100
-@@ -108,7 +108,7 @@
- static int spdif_header_ac3(AVFormatContext *s, AVPacket *pkt)
- {
-     IEC958Context *ctx = s->priv_data;
--    int bitstream_mode = pkt->data[6] & 0x7;
-+    int bitstream_mode = pkt->data[5] & 0x7;
- 
-     ctx->data_type  = IEC958_AC3 | (bitstream_mode << 8);
-     ctx->pkt_offset = AC3_FRAME_SIZE << 2;
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-902-advancedsettings_videolibrary.flattenmoviesets.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-902-advancedsettings_videolibrary.flattenmoviesets.patch
deleted file mode 100644
index a22d3acb65..0000000000
--- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-902-advancedsettings_videolibrary.flattenmoviesets.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur xbmc-dharma-35003/xbmc/GUISettings.cpp xbmc-dharma-35003.patch/xbmc/GUISettings.cpp
---- xbmc-dharma-35003/xbmc/GUISettings.cpp	2010-10-25 23:37:10.165043528 +0200
-+++ xbmc-dharma-35003.patch/xbmc/GUISettings.cpp	2010-10-25 23:37:27.888251923 +0200
-@@ -528,6 +528,7 @@
-   AddBool(NULL, "videolibrary.seasonthumbs", 20382, true);
-   AddBool(vdl, "videolibrary.actorthumbs", 20402, true);
-   AddInt(vdl, "videolibrary.flattentvshows", 20412, 1, 0, 1, 2, SPIN_CONTROL_TEXT);
-+  AddBool(NULL, "videolibrary.flattenmoviesets", 22002, false);
-   AddBool(vdl, "videolibrary.updateonstartup", 22000, false);
-   AddBool(vdl, "videolibrary.backgroundupdate", 22001, false);
-   AddSeparator(vdl, "videolibrary.sep3");
-diff -Naur xbmc-dharma-35003/xbmc/VideoDatabase.cpp xbmc-dharma-35003.patch/xbmc/VideoDatabase.cpp
---- xbmc-dharma-35003/xbmc/VideoDatabase.cpp	2010-10-25 15:36:19.000000000 +0200
-+++ xbmc-dharma-35003.patch/xbmc/VideoDatabase.cpp	2010-10-25 23:37:27.887251911 +0200
-@@ -4394,7 +4394,7 @@
-     if (NULL == m_pDS.get()) return false;
- 
-     CStdString strSQL = "select * from movieview ";
--    if (fetchSets)
-+    if (fetchSets && !g_guiSettings.GetBool("videolibrary.flattenmoviesets"))
-     {
-       // not getting a set, so grab all sets that match this where clause first
-       CStdString setsWhere;
-diff -Naur xbmc-dharma-35003/xbmc/VideoDatabase.cpp.orig xbmc-dharma-35003.patch/xbmc/VideoDatabase.cpp.orig
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-101-don_not_check_for_Confluence_at_configure-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-101-don_not_check_for_Confluence_at_configure-0.1.patch
new file mode 100644
index 0000000000..9d6c19c81d
--- /dev/null
+++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-101-don_not_check_for_Confluence_at_configure-0.1.patch
@@ -0,0 +1,12 @@
+diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
+--- xbmc-31903/configure.in	2011-03-02 20:11:20.857533002 +0100
++++ xbmc-31903.patch/configure.in	2011-03-02 20:21:14.527533001 +0100
+@@ -25154,7 +25154,6 @@
+ 
+ OUTPUT_FILES="Makefile \
+     Makefile.include \
+-    addons/skin.confluence/media/Makefile \
+     xbmc/Makefile \
+     xbmc/cdrip/Makefile \
+     xbmc/cores/Makefile \
+
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-201-let_select_XBMCProjectM-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-201-let_select_XBMCProjectM-0.1.patch
similarity index 95%
rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-201-let_select_XBMCProjectM-0.1.patch
rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-201-let_select_XBMCProjectM-0.1.patch
index 8da9696e60..db6e1e80ba 100644
--- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-201-let_select_XBMCProjectM-0.1.patch
+++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-201-let_select_XBMCProjectM-0.1.patch
@@ -73,18 +73,20 @@ diff -Naur xbmc-31903/Makefile.in xbmc-31903.patch/Makefile.in
 --- xbmc-31903/Makefile.in	2010-07-17 16:25:37.000000000 +0200
 +++ xbmc-31903.patch/Makefile.in	2010-07-17 16:46:16.391376663 +0200
 @@ -108,8 +108,10 @@
- 
- VIS_DIRS=\
+ ifeq (@USE_OPENGL@,1)
+ VIS_DIRS+=\
  	xbmc/visualizations/OpenGLSpectrum \
 -	xbmc/visualizations/WaveForm \
--	xbmc/visualizations/XBMCProjectM
+-	xbmc/visualizations/XBMCProjectM \
 +	xbmc/visualizations/WaveForm
+ 
+ endif
 +ifneq (@BUILD_XBMCPROJECTM@,1)
 +VIS_DIRS+=xbmc/visualizations/XBMCProjectM
 +endif
- ifeq ($(findstring osx,$(ARCH)), osx)
- VIS_DIRS+=xbmc/visualizations/iTunes
- endif
+ ifeq ($(findstring osx,@ARCH@), osx)
+ VIS_DIRS+=xbmc/visualizations/iTunes \
+ 
 @@ -307,7 +309,9 @@
  ifneq (arm, $(ARCH))
  	$(MAKE) -C xbmc/visualizations/OpenGLSpectrum
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-202-let_select_RSXS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-202-let_select_RSXS-0.1.patch
similarity index 95%
rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-202-let_select_RSXS-0.1.patch
rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-202-let_select_RSXS-0.1.patch
index 378eb81c50..b9be5bba6c 100644
--- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-202-let_select_RSXS-0.1.patch
+++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-202-let_select_RSXS-0.1.patch
@@ -86,14 +86,14 @@ diff -Naur xbmc-31903/Makefile.in xbmc-31903.patch/Makefile.in
  VIS_DIRS=\
  	xbmc/visualizations/OpenGLSpectrum \
 @@ -323,8 +325,10 @@
-	$(MAKE) -C xbmc/pvrclients/tvheadend
+ 	$(MAKE) -C xbmc/pvrclients/tvheadend
  screensavers: exports
- ifneq (arm, $(ARCH))
+ ifneq (arm, @ARCH@)
 +ifneq (@BUILD_RSXS@,1)
  	$(MAKE) -C xbmc/screensavers/rsxs-0.9/xbmc
  endif
 +endif
  libaddon: exports
-	$(MAKE) -C lib/addons/library.xbmc.addon
-	$(MAKE) -C lib/addons/library.xbmc.gui
+ 	$(MAKE) -C lib/addons/library.xbmc.addon
+ 	$(MAKE) -C lib/addons/library.xbmc.gui
 
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-303-fix_libdvd_xFLAGS-0.1.patch
new file mode 100644
index 0000000000..2e1713f760
--- /dev/null
+++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-303-fix_libdvd_xFLAGS-0.1.patch
@@ -0,0 +1,119 @@
+diff -Naur xbmc-dharma-33517/lib/libdvd/libdvdcss/src/libdvdcss.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss/src/libdvdcss.pc.in
+--- xbmc-dharma-33517/lib/libdvd/libdvdcss/src/libdvdcss.pc.in	2010-09-04 04:22:52.000000000 +0200
++++ xbmc-dharma-33517.patch/lib/libdvd/libdvdcss/src/libdvdcss.pc.in	2010-09-06 00:34:45.247116875 +0200
+@@ -6,5 +6,5 @@
+ Name: libdvdcss
+ Description: DVD access and decryption library.
+ Version: @VERSION@
+-Libs: -L${libdir} -ldvdcss
+-Cflags: -I{includedir} -I${includedir}/@PACKAGE@
++Libs: -ldvdcss
++Cflags: -I.
+diff -Naur xbmc-dharma-33517/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config2.sh
+--- xbmc-dharma-33517/xbmc/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh	2010-09-04 04:22:50.000000000 +0200
++++ xbmc-dharma-33517.patch/lib/libdvd/libdvdnav/misc/dvdnav-config2.sh	2010-09-06 00:30:38.943396556 +0200
+@@ -56,17 +56,17 @@
+ fi
+ 
+ if test "$echo_cflags" = "yes"; then
+-      echo -I$prefix/include $dvdread_cflags $extracflags $threadcflags
++      echo $dvdread_cflags $extracflags $threadcflags
+ fi
+ 
+ if test "$echo_minicflags" = "yes"; then
+-      echo -I$prefix/include -I$prefix/include/dvdnav $extracflags $threadcflags
++      echo $extracflags $threadcflags
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-      echo -L$libdir -ldvdnav $dvdread_libs $threadlib
++      echo -ldvdnav $dvdread_libs $threadlib
+ fi      
+ 
+ if test "$echo_minilibs" = "yes"; then
+-      echo -L$libdir -ldvdnavmini $threadlib
++      echo -ldvdnavmini $threadlib
+ fi
+diff -Naur xbmc-dharma-33517/lib/libdvd/libdvdnav/misc/dvdnav-config.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav-config.in
+--- xbmc-dharma-33517/lib/libdvd/libdvdnav/misc/dvdnav-config.in	2010-09-04 04:22:50.000000000 +0200
++++ xbmc-dharma-33517.patch/lib/libdvd/libdvdnav/misc/dvdnav-config.in	2010-09-06 00:31:04.643116783 +0200
+@@ -76,13 +76,13 @@
+ fi
+ 
+ if test "$echo_cflags" = "yes"; then
+-      echo -I@includedir@ -I@includedir@/libdvdread @THREAD_CFLAGS@
++      echo @THREAD_CFLAGS@
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-      echo -L@libdir@ -ldvdnav -ldvdread @THREAD_LIBS@
++      echo -ldvdnav -ldvdread @THREAD_LIBS@
+ fi
+ 
+ if test "$echo_minilibs" = "yes"; then
+-      echo -L@libdir@ -ldvdnavmini @THREAD_LIBS@
++      echo -ldvdnavmini @THREAD_LIBS@
+ fi      
+diff -Naur xbmc-dharma-33517/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnavmini.pc.in
+--- xbmc-dharma-33517/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in	2010-09-04 04:22:50.000000000 +0200
++++ xbmc-dharma-33517.patch/lib/libdvd/libdvdnav/misc/dvdnavmini.pc.in	2010-09-06 00:31:31.665116765 +0200
+@@ -7,5 +7,5 @@
+ Description: DVD Navigation mini library
+ Version: @VERSION@
+ 
+-Cflags: -I${includedir} @DVDREAD_CFLAGS@ @THREAD_CFLAGS@
+-Libs: -L${libdir} -ldvdnav @THREAD_LIBS@
++Cflags: @DVDREAD_CFLAGS@ @THREAD_CFLAGS@
++Libs: -ldvdnav @THREAD_LIBS@
+diff -Naur xbmc-dharma-33517/lib/libdvd/libdvdnav/misc/dvdnav.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/misc/dvdnav.pc.in
+--- xbmc-dharma-33517/lib/libdvd/libdvdnav/misc/dvdnav.pc.in	2010-09-04 04:22:50.000000000 +0200
++++ xbmc-dharma-33517.patch/lib/libdvd/libdvdnav/misc/dvdnav.pc.in	2010-09-06 00:31:18.193116906 +0200
+@@ -8,5 +8,5 @@
+ Version: @VERSION@
+ 
+ Requires.private: dvdread >= 4.1.2
+-Cflags: -I${includedir} @THREAD_CFLAGS@
+-Libs: -L${libdir} -ldvdnav @THREAD_LIBS@
++Cflags: @THREAD_CFLAGS@
++Libs: -ldvdnav @THREAD_LIBS@
+diff -Naur xbmc-dharma-33517/lib/libdvd/libdvdread/misc/dvdread-config.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.in
+--- xbmc-dharma-33517/lib/libdvd/libdvdread/misc/dvdread-config.in	2010-09-04 04:22:51.000000000 +0200
++++ xbmc-dharma-33517.patch/lib/libdvd/libdvdread/misc/dvdread-config.in	2010-09-06 00:32:18.255991830 +0200
+@@ -72,9 +72,9 @@
+ fi
+ 
+ if test "$echo_cflags" = "yes"; then
+-      echo -I@includedir@
++      echo ""
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-      echo -L@libdir@ -ldvdread
++      echo -ldvdread
+ fi
+diff -Naur xbmc-dharma-33517/lib/libdvd/libdvdread/misc/dvdread-config.sh xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread-config.sh
+--- xbmc-dharma-33517/lib/libdvd/libdvdread/misc/dvdread-config.sh	2010-09-04 04:22:51.000000000 +0200
++++ xbmc-dharma-33517.patch/lib/libdvd/libdvdread/misc/dvdread-config.sh	2010-09-06 00:32:35.283991243 +0200
+@@ -48,9 +48,9 @@
+ fi
+ 
+ if test "$echo_cflags" = "yes"; then
+-      echo -I$prefix/include $extracflags
++      echo $extracflags
+ fi
+ 
+ if test "$echo_libs" = "yes"; then
+-      echo -L$libdir $dvdreadlib
++      echo $dvdreadlib
+ fi      
+diff -Naur xbmc-dharma-33517/lib/libdvd/libdvdread/misc/dvdread.pc.in xbmc-dharma-33517.patch/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/misc/dvdread.pc.in
+--- xbmc-dharma-33517/lib/libdvd/libdvdread/misc/dvdread.pc.in	2010-09-04 04:22:51.000000000 +0200
++++ xbmc-dharma-33517.patch/lib/libdvd/libdvdread/misc/dvdread.pc.in	2010-09-06 00:32:57.831991741 +0200
+@@ -7,5 +7,5 @@
+ Description: Low level DVD access library
+ Version: @VERSION@
+ 
+-Cflags: -I${includedir}
+-Libs: -L${libdir} -ldvdread
++Cflags: -I.
++Libs: -ldvdread
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-321-CrystalHD_use_yuy2_to_yv12-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-321-CrystalHD_use_yuy2_to_yv12-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-321-CrystalHD_use_yuy2_to_yv12-0.1.patch
rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-321-CrystalHD_use_yuy2_to_yv12-0.1.patch
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-402-enable_yasm_in_ffmpeg-0.1.patch
similarity index 92%
rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-402-enable_yasm_in_ffmpeg-0.1.patch
rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-402-enable_yasm_in_ffmpeg-0.1.patch
index f2db6fd5a2..296379243d 100644
--- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-402-enable_yasm_in_ffmpeg-0.1.patch
+++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-402-enable_yasm_in_ffmpeg-0.1.patch
@@ -6,9 +6,9 @@ diff -Naur xbmc-31903/configure.in xbmc-31903.patch/configure.in
  fi
  
 +AC_CHECK_PROG(HAVE_YASM,yasm,"yes","no",)
- AC_CHECK_PROG(HAVE_SVNVERSION,svnversion,"yes","no",)
  AC_CHECK_PROG(HAVE_GIT,git,"yes","no",)
  
+ # Checks for header files.
 @@ -1639,6 +1640,7 @@
        `if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\
        `if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-403-openssl_only_needed_for_internal_python-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-403-openssl_only_needed_for_internal_python-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-403-openssl_only_needed_for_internal_python-0.1.patch
rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-403-openssl_only_needed_for_internal_python-0.1.patch
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-452-change_lcd_content-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-452-change_lcd_content-0.1.patch
rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-452-change_lcd_content-0.1.patch
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-452-ps3_remote_be_more_quiet-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-452-ps3_remote_be_more_quiet-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-452-ps3_remote_be_more_quiet-0.1.patch
rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-452-ps3_remote_be_more_quiet-0.1.patch
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-462-add_remote_irtrans_mediacenter-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-462-add_remote_irtrans_mediacenter-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-462-add_remote_irtrans_mediacenter-0.1.patch
rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-462-add_remote_irtrans_mediacenter-0.1.patch
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-463-add_remote_devinput-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-463-add_remote_devinput-0.1.patch
rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-463-add_remote_devinput-0.1.patch
diff --git a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-901-advancedsettings_alwaysextractflags.patch b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-901-advancedsettings_alwaysextractflags.patch
similarity index 87%
rename from packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-901-advancedsettings_alwaysextractflags.patch
rename to packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-901-advancedsettings_alwaysextractflags.patch
index de16d8ec29..2861db307a 100644
--- a/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-10.0-Dharma-pvr-7647593-901-advancedsettings_alwaysextractflags.patch
+++ b/packages/mediacenter/xbmc-pvr/patches/xbmc-pvr-master-2a1a563-901-advancedsettings_alwaysextractflags.patch
@@ -1,6 +1,6 @@
 diff -Naur xbmc-dharma-35003/xbmc/GUISettings.cpp xbmc-dharma-35003.patch/xbmc/GUISettings.cpp
---- xbmc-dharma-35003/xbmc/GUISettings.cpp	2010-10-25 15:36:18.000000000 +0200
-+++ xbmc-dharma-35003.patch/xbmc/GUISettings.cpp	2010-10-25 23:34:14.131974258 +0200
+--- xbmc-dharma-35003/xbmc/settings/GUISettings.cpp	2010-10-25 15:36:18.000000000 +0200
++++ xbmc-dharma-35003.patch/xbmc/settings/GUISettings.cpp	2010-10-25 23:34:14.131974258 +0200
 @@ -618,6 +618,7 @@
    AddInt(vid, "myvideos.selectaction", 22079, SELECT_ACTION_PLAY_OR_RESUME, SELECT_ACTION_CHOOSE, 1, SELECT_ACTION_INFO, SPIN_CONTROL_TEXT);
    AddBool(NULL, "myvideos.treatstackasfile", 20051, true);
diff --git a/tools/mkpkg/mkpkg_xbmc-master-pvr b/tools/mkpkg/mkpkg_xbmc-master-pvr
new file mode 100755
index 0000000000..3883e58b51
--- /dev/null
+++ b/tools/mkpkg/mkpkg_xbmc-master-pvr
@@ -0,0 +1,80 @@
+#!/bin/sh
+################################################################################
+#      This file is part of OpenELEC - http://www.openelec.tv
+#      Copyright (C) 2009-2011 Stephan Raue (stephan@openelec.tv)
+#
+#  This Program is free software; you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation; either version 2, or (at your option)
+#  any later version.
+#
+#  This Program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with OpenELEC.tv; see the file COPYING.  If not, write to
+#  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
+#  http://www.gnu.org/copyleft/gpl.html
+################################################################################
+
+PKG_NAME="xbmc-pvr"
+PKG_VERSION="master"
+GIT_REPO="-b $PKG_VERSION git://github.com/opdenkamp/xbmc.git"
+DEST_DIR="$PKG_NAME-$PKG_VERSION"
+
+echo "getting sources..."
+  if [ ! -d $DEST_DIR-latest ]; then
+    git clone $GIT_REPO $DEST_DIR-latest
+  fi
+
+  cd $DEST_DIR-latest
+    git checkout $PKG_VERSION
+    git pull
+
+echo "getting version..."
+  GIT_REV=`git log -n1 --format=%h`
+  echo $GIT_REV
+  cd ..
+
+echo "copying sources..."
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV
+  cp -R $DEST_DIR-latest $PKG_NAME-$PKG_VERSION-$GIT_REV
+  echo "$GIT_REV" > $PKG_NAME-$PKG_VERSION-$GIT_REV/git.version
+
+echo "cleaning sources..."
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/.git
+
+echo "seperating theme..."
+  rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV
+  mv $PKG_NAME-$PKG_VERSION-$GIT_REV/addons/skin.confluence $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV
+
+echo "cleaning sources..."
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/visualisations
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/lib/libSDL-*
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/lib/libcurl-*
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/project
+
+  for i in "Changelog" "Fake\ Episode\ Maker" "MingwBuildEnvironment" \
+           "PackageMaker" "Translator" "XBMCLive" "XprPack" \
+           "HardwareConfigure" "Mach5" "osx" "UpdateThumbs.py" "XBMCTex"; do
+    rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV/tools/$i
+  done
+
+  for i in dll a lib so bat; do
+    find $PKG_NAME-$PKG_VERSION-$GIT_REV -name *.$i -exec rm -rf {} ";"
+  done
+
+  # bundled win32 binaries
+  rm -r $PKG_NAME-$PKG_VERSION-$GIT_REV/xbmc/visualizations/XBMCProjectM/win32
+
+echo "packing sources..."
+  tar cvjf $PKG_NAME-$PKG_VERSION-$GIT_REV.tar.bz2 $PKG_NAME-$PKG_VERSION-$GIT_REV
+  tar cvjf $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV.tar.bz2 $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV
+
+echo "remove temporary sourcedir..."
+  rm -rf $PKG_NAME-$PKG_VERSION-$GIT_REV
+  rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION-$GIT_REV
+
+