diff --git a/packages/mediacenter/xbmc-frodo-theme-Confluence/meta b/packages/mediacenter/xbmc-frodo-theme-Confluence/meta
index 97355bda77..a4d63972ad 100644
--- a/packages/mediacenter/xbmc-frodo-theme-Confluence/meta
+++ b/packages/mediacenter/xbmc-frodo-theme-Confluence/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-frodo-theme-Confluence"
-PKG_VERSION="8f0c91b"
+PKG_VERSION="5ea1d22"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
diff --git a/packages/mediacenter/xbmc-frodo/meta b/packages/mediacenter/xbmc-frodo/meta
index b793564755..9e3e1000e2 100644
--- a/packages/mediacenter/xbmc-frodo/meta
+++ b/packages/mediacenter/xbmc-frodo/meta
@@ -19,7 +19,7 @@
 ################################################################################
 
 PKG_NAME="xbmc-frodo"
-PKG_VERSION="8f0c91b"
+PKG_VERSION="5ea1d22"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
@@ -43,8 +43,10 @@ PKG_AUTORECONF="no"
   PKG_DEPENDS="$PKG_DEPENDS simplejson"
 
 # various PVR clients
-  PKG_DEPENDS="$PKG_DEPENDS xbmc-addon-xvdr xbmc-addon-njoy"
-  PKG_DEPENDS="$PKG_DEPENDS xbmc-addon-xvdr xbmc-addon-vuplus"
+  PKG_DEPENDS="$PKG_DEPENDS xbmc-pvr-addons"
+#  PKG_DEPENDS="$PKG_DEPENDS xbmc-addon-njoy"
+  PKG_DEPENDS="$PKG_DEPENDS xbmc-addon-vuplus"
+  PKG_DEPENDS="$PKG_DEPENDS xbmc-addon-xvdr"
 
 if [ "$DISPLAYSERVER" = "xorg-server" ]; then
   # for libX11 support
diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc-frodo/patches/bk/xbmc-frodo-5ea1d22-321-texturepacker-hostflags-and-rework.patch
similarity index 100%
rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-321-texturepacker-hostflags-and-rework.patch
rename to packages/mediacenter/xbmc-frodo/patches/bk/xbmc-frodo-5ea1d22-321-texturepacker-hostflags-and-rework.patch
diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-402-enable_yasm_in_ffmpeg-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/bk/xbmc-frodo-5ea1d22-402-enable_yasm_in_ffmpeg-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-402-enable_yasm_in_ffmpeg-0.1.patch
rename to packages/mediacenter/xbmc-frodo/patches/bk/xbmc-frodo-5ea1d22-402-enable_yasm_in_ffmpeg-0.1.patch
diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/bk/xbmc-frodo-5ea1d22-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
rename to packages/mediacenter/xbmc-frodo/patches/bk/xbmc-frodo-5ea1d22-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-999-crosscompile.patch b/packages/mediacenter/xbmc-frodo/patches/bk/xbmc-frodo-5ea1d22-999-crosscompile.patch
similarity index 100%
rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-999-crosscompile.patch
rename to packages/mediacenter/xbmc-frodo/patches/bk/xbmc-frodo-5ea1d22-999-crosscompile.patch
diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-001-add_support_to_specify_GIT_REV-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-001-add_support_to_specify_GIT_REV-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-001-add_support_to_specify_GIT_REV-0.1.patch
rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-001-add_support_to_specify_GIT_REV-0.1.patch
diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-303-fix_libdvd_xFLAGS-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-303-fix_libdvd_xFLAGS-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-303-fix_libdvd_xFLAGS-0.1.patch
rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-303-fix_libdvd_xFLAGS-0.1.patch
diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-311-fix_rsxs_build-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-311-fix_rsxs_build-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-311-fix_rsxs_build-0.1.patch
rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-311-fix_rsxs_build-0.1.patch
diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-321-texturepacker-hostflags-and-rework.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-321-texturepacker-hostflags-and-rework.patch
new file mode 100644
index 0000000000..db7d6f6c61
--- /dev/null
+++ b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-321-texturepacker-hostflags-and-rework.patch
@@ -0,0 +1,188 @@
+diff -Naur xbmc-frodo-5ea1d22/configure.in xbmc-frodo-5ea1d22.patch/configure.in
+--- xbmc-frodo-5ea1d22/configure.in	2012-09-05 13:27:56.000000000 +0200
++++ xbmc-frodo-5ea1d22.patch/configure.in	2012-09-05 17:55:46.727316107 +0200
+@@ -437,6 +437,12 @@
+   [use_texturepacker=$enableval],
+   [use_texturepacker=auto])
+ 
++AC_ARG_WITH([texturepacker-root],
++  [AS_HELP_STRING([--with-texturepacker-root],
++  [root dir to search for librarys and includes if building native TexturePacker (default is \$prefix)])],
++  [use_texturepacker_root=$withval],
++  [use_texturepacker_root=$prefix])
++
+ AC_ARG_WITH([lirc-device],
+   [AS_HELP_STRING([--with-lirc-device=file],
+   [specify the default LIRC device (default is /dev/lircd)])],
+@@ -570,8 +576,7 @@
+      use_cpu=cortex-a8
+      check_sdl_arch=[`file /opt/local/lib/libSDL_image.dylib | awk '{V=7; print $V}'`]
+      if test "x$check_sdl_arch" = "xi386"; then
+-       use_texturepacker_native=yes
+-       USE_TEXTUREPACKER_NATIVE_ROOT="/opt/local"
++       use_texturepacker_root="/opt/local"
+      else
+        use_texturepacker=no
+      fi
+@@ -587,8 +592,6 @@
+   *86*-apple-darwin*)
+      use_joystick=no
+      use_vtbdecoder=no
+-     use_texturepacker_native=yes
+-     USE_TEXTUREPACKER_NATIVE_ROOT="$prefix"
+      ARCH="x86-osx"
+      AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_DARWIN -DTARGET_DARWIN_OSX -D_LINUX")
+      ;;
+@@ -1938,13 +1941,13 @@
+ 
+ USE_TEXTUREPACKER_NATIVE=0
+ if test "x$use_texturepacker" != "xno"; then
+-  final_message="$final_message\n  TexturePacker:Yes"
+   USE_TEXTUREPACKER=1
+-  if test "x$use_texturepacker_native" = "xyes"; then
++  if test "x$cross_compiling" = "xyes"; then
+     USE_TEXTUREPACKER_NATIVE=1
+-    if [[ ! -d "$USE_TEXTUREPACKER_NATIVE_ROOT" ]]; then 
+-      USE_TEXTUREPACKER_NATIVE_ROOT= 
+-    fi
++    USE_TEXTUREPACKER_NATIVE_ROOT="$use_texturepacker_root"
++    final_message="$final_message\n  TexturePacker:Native ($USE_TEXTUREPACKER_NATIVE_ROOT)"
++  else
++    final_message="$final_message\n  TexturePacker:Yes"
+   fi
+ else
+   final_message="$final_message\n  TexturePacker:No"
+diff -Naur xbmc-frodo-5ea1d22/lib/libsquish/Makefile.in xbmc-frodo-5ea1d22.patch/lib/libsquish/Makefile.in
+--- xbmc-frodo-5ea1d22/lib/libsquish/Makefile.in	2012-09-05 13:28:31.000000000 +0200
++++ xbmc-frodo-5ea1d22.patch/lib/libsquish/Makefile.in	2012-09-05 17:56:05.017178267 +0200
+@@ -11,26 +11,25 @@
+   singlecolourfit.cpp \
+   squish.cpp
+ 
+-CXXFLAGS+=-I.
+-
+-LIB=libsquish.a
+-
+-ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
+-NATIVE_LIB=libsquish-native.so
+-CLEAN_FILES+=$(NATIVE_LIB)
++LIB              = libsquish.a
++NATIVE_LIB       = libsquish-native.so
++CLEAN_FILES     += $(NATIVE_LIB)
++
++HOST_CXX        ?= g++
++CXXFLAGS        += -I.
++HOST_CXXFLAGS   += -I.
+ 
+ ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
+-NATIVE_ARCH=@DARWIN_NATIVE_ARCH@
++  HOST_CXXFLAGS += @DARWIN_NATIVE_ARCH@
+ endif
+ 
+-all: $(LIB) $(NATIVE_LIB)
++$(LIB): $(SRCS)
+ # TexturePacker links to libsquish and needs to run on build system, so make a native flavor.
+ $(NATIVE_LIB): $(SRCS)
+ ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
+-	g++ $(NATIVE_ARCH) -I. $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
++	$(HOST_CXX) $(HOST_CXXFLAGS) $(SRCS) -dynamiclib -install_name `pwd`/libsquish-native.so -o $@
+ else
+-	g++ -I. $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
+-endif
++	$(HOST_CXX) $(HOST_CXXFLAGS) $(SRCS) -shared -fPIC -Wl,-soname,`pwd`/libsquish-native.so -o $@
+ endif
+ 
+ include ../../Makefile.include
+diff -Naur xbmc-frodo-5ea1d22/tools/TexturePacker/Makefile.in xbmc-frodo-5ea1d22.patch/tools/TexturePacker/Makefile.in
+--- xbmc-frodo-5ea1d22/tools/TexturePacker/Makefile.in	2012-09-05 13:28:16.000000000 +0200
++++ xbmc-frodo-5ea1d22.patch/tools/TexturePacker/Makefile.in	2012-09-05 17:55:49.927291649 +0200
+@@ -1,56 +1,54 @@
+-DEFINES += -D_LINUX -DUSE_LZO_PACKING
++DEFINES       += -D_LINUX -DUSE_LZO_PACKING
+ ifneq ($(or $(findstring powerpc,@ARCH@),$(findstring ppc, @ARCH@)),)
+-DEFINES += -DHOST_BIGENDIAN
++DEFINES       += -DHOST_BIGENDIAN
+ endif
+ 
+-CXXFLAGS+= \
++SRCS           = \
++  md5.cpp \
++  SDL_anigif.cpp \
++  XBTFWriter.cpp \
++  XBMCTex.cpp \
++  @abs_top_srcdir@/xbmc/guilib/XBTF.cpp
++
++TARGET         = TexturePacker
++CLEAN_FILES    = $(TARGET)
++
++all: $(TARGET)
++
++HOST_CXX      ?= g++
++HOST_ROOT_PATH = @USE_TEXTUREPACKER_NATIVE_ROOT@
++
++LIBS          += -lSDL_image -lSDL -llzo2
++LIBS          += -L@abs_top_srcdir@/lib/libsquish -lsquish
++HOST_LIBS     += -L$(HOST_ROOT_PATH)/lib -lSDL_image -lSDL -llzo2
++HOST_LIBS     += -L@abs_top_srcdir@/lib/libsquish -lsquish-native
++
++CXXFLAGS      += \
+   -I. \
+   -I@abs_top_srcdir@/lib \
+   -I@abs_top_srcdir@/xbmc \
+   -I@abs_top_srcdir@/xbmc/linux
+ 
+-RPATH=-Wl,-rpath=$(NATIVE_ROOT_PATH)/lib
++HOST_CXXFLAGS += \
++  -I. \
++  -I@abs_top_srcdir@/lib \
++  -I@abs_top_srcdir@/xbmc \
++  -I@abs_top_srcdir@/xbmc/linux \
++  -I$(HOST_ROOT_PATH)/include
++
++RPATH=-Wl,-rpath=$(HOST_ROOT_PATH)/lib
+ 
+-ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
+-NATIVE_ROOT_PATH=@USE_TEXTUREPACKER_NATIVE_ROOT@
+-ifdef NATIVE_ROOT_PATH
+ ifeq ($(findstring Darwin,$(shell uname -s)),Darwin)
+ DEFINES += -DTARGET_DARWIN
+ NATIVE_ARCH=@DARWIN_NATIVE_ARCH@
+ RPATH=
+ endif
+-NATIVE_CXXFLAGS+= -I. \
+-                  -I$(NATIVE_ROOT_PATH)/include \
+-                  -I@abs_top_srcdir@/lib \
+-                  -I@abs_top_srcdir@/xbmc \
+-                  -I@abs_top_srcdir@/xbmc/linux
+-NATIVE_LIBS    += -L$(NATIVE_ROOT_PATH)/lib
+-endif
+-NATIVE_LIBS    += -lSDL_image -lSDL -llzo2
+-NATIVE_LIBS    += -L@abs_top_srcdir@/lib/libsquish -lsquish-native
+-else
+-LIBS    += -L@abs_top_srcdir@/lib/libsquish -lsquish
+-endif
+-
+-LIBS    += -lSDL_image -lSDL -llzo2
+-
+-SRCS = \
+-  md5.cpp \
+-  SDL_anigif.cpp \
+-  XBTFWriter.cpp \
+-  XBMCTex.cpp \
+-  @abs_top_srcdir@/xbmc/guilib/XBTF.cpp
+-
+-
+-TARGET = TexturePacker
+-CLEAN_FILES=$(TARGET)
+-
+-all: $(TARGET)
+ 
+ ifeq (@USE_TEXTUREPACKER_NATIVE@,1)
+ # TexturePacker run native on build system, build it with native tools
+ $(TARGET): $(SRCS)
+-	g++ $(DEFINES) $(NATIVE_ARCH) $(NATIVE_CXXFLAGS) $(SRCS) $(NATIVE_LIBS) $(RPATH) -o $(TARGET)
++	make -C @abs_top_srcdir@/lib/libsquish libsquish-native.so
++	$(HOST_CXX) $(DEFINES) $(NATIVE_ARCH) $(HOST_CXXFLAGS) $(SRCS) $(HOST_LIBS) $(RPATH) -o $(TARGET)
+ clean:
+ 	rm -f $(TARGET)
+ else
diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
new file mode 100644
index 0000000000..c320f3cacc
--- /dev/null
+++ b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-408-enable_PYTHONOPTIMIZE_with_external_Python-0.1.patch
@@ -0,0 +1,19 @@
+diff -Naur xbmc-frodo-5ea1d22/xbmc/interfaces/python/XBPython.cpp xbmc-frodo-5ea1d22.patch/xbmc/interfaces/python/XBPython.cpp
+--- xbmc-frodo-5ea1d22/xbmc/interfaces/python/XBPython.cpp	2012-09-05 13:28:20.000000000 +0200
++++ xbmc-frodo-5ea1d22.patch/xbmc/interfaces/python/XBPython.cpp	2012-09-05 15:50:42.642317031 +0200
+@@ -525,11 +525,10 @@
+       // at http://docs.python.org/using/cmdline.html#environment-variables
+ 
+ #if !defined(_WIN32) && !defined(TARGET_ANDROID)
+-      /* PYTHONOPTIMIZE is set off intentionally when using external Python.
+-         Reason for this is because we cannot be sure what version of Python
+-         was used to compile the various Python object files (i.e. .pyo,
+-         .pyc, etc.). */
+-        // check if we are running as real xbmc.app or just binary
++      // Required for python to find optimized code (pyo) files
++      setenv("PYTHONOPTIMIZE", "1", 1);
++
++      // check if we are running as real xbmc.app or just binary
+       if (!CUtil::GetFrameworksPath(true).IsEmpty())
+       {
+         // using external python, it's build looking for xxx/lib/python2.6
diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-452-change_lcd_content-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-452-change_lcd_content-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-452-change_lcd_content-0.1.patch
rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-452-change_lcd_content-0.1.patch
diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-453-add_openelec.tv_RSS_news-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-453-add_openelec.tv_RSS_news-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-453-add_openelec.tv_RSS_news-0.1.patch
rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-453-add_openelec.tv_RSS_news-0.1.patch
diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-454-disable_backslash-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-454-disable_backslash-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-454-disable_backslash-0.1.patch
rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-454-disable_backslash-0.1.patch
diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-457-fix_connection_check-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-457-fix_connection_check-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-457-fix_connection_check-0.1.patch
rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-457-fix_connection_check-0.1.patch
diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-463-add_remote_devinput-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-463-add_remote_devinput-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-463-add_remote_devinput-0.1.patch
rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-463-add_remote_devinput-0.1.patch
diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-464-add_eject_keymapping_for_lirc-0.1.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-464-add_eject_keymapping_for_lirc-0.1.patch
similarity index 100%
rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-464-add_eject_keymapping_for_lirc-0.1.patch
rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-464-add_eject_keymapping_for_lirc-0.1.patch
diff --git a/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-981-toggleButtonState.patch b/packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-981-toggleButtonState.patch
similarity index 100%
rename from packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-8f0c91b-981-toggleButtonState.patch
rename to packages/mediacenter/xbmc-frodo/patches/xbmc-frodo-5ea1d22-981-toggleButtonState.patch
diff --git a/tools/mkpkg/mkpkg_xbmc-frodo-pvr b/tools/mkpkg/mkpkg_xbmc-frodo-pvr
deleted file mode 100755
index 8d93733912..0000000000
--- a/tools/mkpkg/mkpkg_xbmc-frodo-pvr
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/sh
-################################################################################
-#      This file is part of OpenELEC - http://www.openelec.tv
-#      Copyright (C) 2009-2012 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, 51 Franklin Street, Suite 500, Boston, MA 02110, USA.
-#  http://www.gnu.org/copyleft/gpl.html
-################################################################################
-
-PKG_NAME="xbmc-frodo"
-PKG_VERSION="pvr"
-GIT_REPO="-b master git://github.com/opdenkamp/xbmc.git"
-DEST_DIR="$PKG_NAME-pvr"
-
-echo "getting sources..."
-  if [ ! -d $DEST_DIR-latest ]; then
-    git clone $GIT_REPO $DEST_DIR-latest
-  fi
-
-  cd $DEST_DIR-latest
-    git pull
-
-echo "getting version..."
-  GIT_REV=`git log -n1 --format=%h`
-  echo $GIT_REV
-  cd ..
-  PKG_VERSION="$PKG_VERSION-$GIT_REV"
-
-echo "copying sources..."
-  rm -rf $PKG_NAME-$PKG_VERSION
-  cp -R $DEST_DIR-latest $PKG_NAME-$PKG_VERSION
-  echo "$GIT_REV" > $PKG_NAME-$PKG_VERSION/git.version
-
-echo "cleaning sources..."
-  rm -rf $PKG_NAME-$PKG_VERSION/.git
-
-echo "seperating theme..."
-  rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION
-  mv $PKG_NAME-$PKG_VERSION/addons/skin.confluence $PKG_NAME-theme-Confluence-$PKG_VERSION
-
-echo "cleaning sources..."
-  rm -rf $PKG_NAME-$PKG_VERSION/visualisations
-  rm -rf $PKG_NAME-$PKG_VERSION/lib/libSDL-*
-  rm -rf $PKG_NAME-$PKG_VERSION/lib/libcurl-*
-  rm -rf $PKG_NAME-$PKG_VERSION/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/tools/$i
-  done
-
-  for i in dll a lib so bat; do
-    find $PKG_NAME-$PKG_VERSION -name *.$i -exec rm -rf {} ";"
-  done
-
-  # bundled win32 binaries
-  rm -r $PKG_NAME-$PKG_VERSION/xbmc/visualizations/XBMCProjectM/win32
-
-echo "packing sources..."
-  tar cvJf $PKG_NAME-$PKG_VERSION.tar.xz $PKG_NAME-$PKG_VERSION
-  tar cvJf $PKG_NAME-theme-Confluence-$PKG_VERSION.tar.xz $PKG_NAME-theme-Confluence-$PKG_VERSION
-
-echo "remove temporary sourcedir..."
-  rm -rf $PKG_NAME-$PKG_VERSION
-  rm -rf $PKG_NAME-theme-Confluence-$PKG_VERSION