diff --git a/alarm/xbmc-tegra/FEH.sh b/alarm/xbmc-tegra/FEH.sh
deleted file mode 100755
index db8c69249..000000000
--- a/alarm/xbmc-tegra/FEH.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-RETVAL=0
-
-if [[ -z $(glxinfo | grep "direct rendering.*Yes" | uniq) ]]; then
-  echo "XBMC needs hardware accelerated OpenGL rendering."
-  echo "Install an appropriate graphics driver."
-  echo 
-  echo "Please consult XBMC Wiki for supported hardware"
-  echo "http://xbmc.org/wiki/?title=Supported_hardware"
-  echo
-  RETVAL=1
-fi
-
-if [[ -z $(xdpyinfo | grep "depth of root.*24" | uniq) ]]; then
-  echo "XBMC cannot run unless the"
-  echo "screen color depth is at least 24 bit."
-  echo
-  echo "Please reconfigure your screen."
-  RETVAL=1
-fi
-
-exit ${RETVAL}
diff --git a/alarm/xbmc-tegra/PKGBUILD b/alarm/xbmc-tegra/PKGBUILD
deleted file mode 100644
index d9f0a1141..000000000
--- a/alarm/xbmc-tegra/PKGBUILD
+++ /dev/null
@@ -1,123 +0,0 @@
-# $Id: PKGBUILD 58617 2011-11-16 15:35:16Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Brad Fanella <bradfanella@archlinux.us>
-# Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
-# Contributor: Zeqadious <zeqadious.at.gmail.dot.com>
-# Contributor: BlackEagle < ike DOT devolder AT herecura DOT be >
-
-# ALARM: macau <tema.prokopenko@gmail.com>
-#        Kevin Mihelich <kevin@archlinuxarm.org>
-#  - fix issues for tegra2-based devices, hw video decoding via gles2
-#  - adjusted depends to include python2, libgles
-#  - conflicts with and provides xbmc
-
-plugrel=1
-noautobuild=1
-
-_prefix=/usr
-pkgname=xbmc-tegra
-pkgver=10.1
-pkgrel=9
-pkgdesc="A software media player and entertainment hub for digital media"
-arch=('armv7h')
-url="http://xbmc.org"
-license=('GPL' 'custom')
-depends=('bzip2' 'curl' 'enca' 'faac' 'faad2' 'fontconfig' 'fribidi'
-        'glew' 'jasper' 'libcdio' 'libegl' 'libgl' 'libgles' 'libmad' 'libmms'
-        'libmpeg2' 'libmysqlclient' 'libsamplerate' 'libxinerama'
-        'libxrandr' 'libxtst' 'lzo2' 'sdl_image' 'sdl_mixer'
-        'smbclient' 'wavpack' 'mesa-demos' 'xorg-xdpyinfo' 'libmicrohttpd'
-        'libssh' 'libva' 'libmodplug' 'rtmpdump' 'lsb-release'
-        'libpulse' 'sqlite3' 'libass' 'python2')
-makedepends=('boost' 'cmake' 'gperf' 'nasm' 'unzip' 'zip' 'mesa')
-optdepends=('lirc: remote controller support'
-        'unrar: access compressed files without unpacking them'
-        'udisks: automount external drives'
-        'upower: used to trigger suspend functionality'
-        'lcms'
-        'tk')
-conflicts=('xbmc')
-provides=('xbmc=${pkgver}')
-install="${pkgname}.install"
-source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
-	'FEH.sh'
-	xbmc-10.0-python-2.7.patch
-	xbmc-10.1-gcc-4.6.patch
-	http://trac.xbmc.org/raw-attachment/ticket/11584/xbmcplugin_int_format.patch
-	gles_bgra.patch)
-md5sums=('391398126cb86a4f6fbd0b7037997d84'
-         '7127c0336f91ff48e408e2d1078fe8eb'
-         '62d46c8b44e4e5313a10922209cb14f8'
-         'd88b854d6f356a74d7658cd1f74a4695'
-         'f42aa74a982ca854491a74e960f13804'
-         '48441891ee2d210c210a34769c7938ad')
-
-build() {
-  cd "${srcdir}/xbmc-$pkgver"
-  
-  #fix gles issue on tegra boards
-  patch -p1 < $srcdir/gles_bgra.patch
-
-  patch -p1 <$srcdir/xbmc-10.0-python-2.7.patch
-  patch -p1 <$srcdir/xbmc-10.1-gcc-4.6.patch
-  (cd xbmc/lib/libPython/xbmcmodule && patch -p5 <$srcdir/xbmcplugin_int_format.patch)
-
-  LDFLAGS="-Wl,--hash-style=gnu"
-
-  # fix linking issue with gcc 4.5, see git 6ea61fce78q
-  sed -i 's: --soname,: -Wl,--soname,:' \
-      xbmc/cores/dvdplayer/Codecs/{,libdvd/}Makefile.in
-
-  msg "Bootstrapping XBMC"
-  ./bootstrap
-
-  #bad idea use softfp on hardfp system 
-  sed s/softfp/hard/g -i configure
-
-  #update python 
-  sed s/lpython2.5/lpython2.7/g -i Makefile.in
-
-  msg "Configuring XBMC"
-  
-  ./configure --prefix=${_prefix} --disable-vdpau --disable-pulse --disable-hal --disable-avahi --enable-external-libraries --disable-liba52 --disable-libdts --enable-external-python --disable-debug --enable-gles --disable-gl --disable-dvdcss --disable-joystick --disable-openmax --enable-tegra --disable-vaapi --disable-ccache --disable-external-ffmpeg --disable-optimizations
-    
-  # Now (finally) build
-  msg "Running make"
-  make
-  make -C lib/addons/script.module.pil
-  make -C lib/addons/script.module.pysqlite
-}
-
-package() {
-  cd "${srcdir}/xbmc-$pkgver"
-  msg "Running make install"
-  make prefix="${pkgdir}${_prefix}" install
-
-  # Replace FEH.py with FEH.sh (and thus remove external python dependency)
-  install -D -m 0755 "${srcdir}/FEH.sh" "${pkgdir}${_prefix}/share/xbmc/FEH.sh"
-  sed -i -e 's/^python \(.*\)FEH.py \(.*\)$/\1FEH.sh \2/' "${pkgdir}${_prefix}/bin/xbmc"
-
-  # lsb_release fix
-  sed -i -e 's/which lsb_release &> \/dev\/null/\[ -f \/etc\/arch-release ]/g' "${pkgdir}${_prefix}/bin/xbmc"
-  sed -i -e "s/lsb_release -a 2> \/dev\/null | sed -e 's\/\^\/    \/'/cat \/etc\/arch-release/g" "${pkgdir}${_prefix}/bin/xbmc"
-
-  # .desktop files
-  install -D -m 0644 "${srcdir}/xbmc-$pkgver/tools/Linux/xbmc.desktop" "${pkgdir}${_prefix}/share/applications/xbmc.desktop"
-  install -D -m 0644 "${srcdir}/xbmc-$pkgver/tools/Linux/xbmc-48x48.png" "${pkgdir}${_prefix}/share/pixmaps/xbmc.png"
-
-  # Tools
-  install -D -m 0755 "${srcdir}/xbmc-$pkgver/xbmc-xrandr" "${pkgdir}${_prefix}/share/xbmc/xbmc-xrandr"
-  install -D -m 0755 "${srcdir}/xbmc-$pkgver/tools/TexturePacker/TexturePacker" "${pkgdir}${_prefix}/share/xbmc/"
-
-  # Licenses
-  install -d -m 0755 "${pkgdir}${_prefix}/share/licenses/${pkgname}"
-  for licensef in LICENSE.GPL copying.txt; do
-    mv "${pkgdir}${_prefix}/share/doc/xbmc/${licensef}" "${pkgdir}${_prefix}/share/licenses/${pkgname}"
-  done
-
-  # cleanup some stuff
-  msg "Cleanup unneeded files"
-  rm -rf "${pkgdir}/usr/share/xsessions"
-  rm -f "${pkgdir}/usr/share/xbmc/FEH.py"
-  rm -f "${pkgdir}/usr/share/icons/hicolor/icon-theme.cache"
-}
diff --git a/alarm/xbmc-tegra/gles_bgra.patch b/alarm/xbmc-tegra/gles_bgra.patch
deleted file mode 100644
index 2fece04b8..000000000
--- a/alarm/xbmc-tegra/gles_bgra.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- a/xbmc/cores/VideoRenderers/OverlayRendererGL.cpp	2011-03-05 03:33:37.000000000 +0000
-+++ b/xbmc/cores/VideoRenderers/OverlayRendererGL.cpp	2011-11-28 18:20:47.957645004 +0000
-@@ -125,7 +125,11 @@
-             , o->width * 4
-             , &m_u, &m_v
-             , GL_RGBA
-+#ifndef HAS_GLES            
-             , GL_BGRA
-+#else
-+	    , GL_RGBA
-+#endif            
-             , rgba);
-   free(rgba);
- 
-@@ -199,7 +203,11 @@
-             , o->width * 4
-             , &m_u, &m_v
-             , GL_RGBA
-+#ifndef HAS_GLES            
-             , GL_BGRA
-+#else
-+	    , GL_RGBA
-+#endif            
-             , rgba + min_x + min_y * o->width);
- 
-   free(rgba);
diff --git a/alarm/xbmc-tegra/xbmc-10.0-python-2.7.patch b/alarm/xbmc-tegra/xbmc-10.0-python-2.7.patch
deleted file mode 100644
index e3d17a5e0..000000000
--- a/alarm/xbmc-tegra/xbmc-10.0-python-2.7.patch
+++ /dev/null
@@ -1,768 +0,0 @@
-patch from upstream
-
-https://bugs.gentoo.org/350098
-
-From ab0f816c6307f38d7248d0469379c981f94b816d Mon Sep 17 00:00:00 2001
-From: ceros7 <ceros7@568bbfeb-2a22-0410-94d2-cc84cf5bfa90>
-Date: Mon, 30 Aug 2010 16:46:50 +0000
-Subject: [PATCH] Support external python2.7.
-
-git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/python2.7@33342 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
----
- configure.in                                       |   10 ++++++-
- xbmc/lib/libPython/XBPyThread.cpp                  |    5 +++-
- xbmc/lib/libPython/XBPyThread.h                    |    4 ++-
- xbmc/lib/libPython/XBPython.cpp                    |   24 +++++++++++++++-----
- xbmc/lib/libPython/XBPythonDll.cpp                 |    4 ++-
- xbmc/lib/libPython/XBPythonDllFuncs.S              |    4 ++-
- xbmc/lib/libPython/linux/Makefile.in               |    5 +++-
- xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h    |    4 ++-
- xbmc/lib/libPython/xbmcmodule/PythonAddon.h        |    4 ++-
- xbmc/lib/libPython/xbmcmodule/PythonPlayer.h       |    4 ++-
- xbmc/lib/libPython/xbmcmodule/action.h             |    4 ++-
- xbmc/lib/libPython/xbmcmodule/control.h            |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controlbutton.cpp    |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controlgroup.cpp     |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controlimage.cpp     |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controllabel.cpp     |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controllist.cpp      |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controlprogress.cpp  |    4 ++-
- .../libPython/xbmcmodule/controlradiobutton.cpp    |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controlslider.cpp    |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controlspin.cpp      |    4 ++-
- xbmc/lib/libPython/xbmcmodule/controltextbox.cpp   |    4 ++-
- xbmc/lib/libPython/xbmcmodule/dialog.cpp           |    4 ++-
- xbmc/lib/libPython/xbmcmodule/dialog.h             |    4 ++-
- xbmc/lib/libPython/xbmcmodule/infotagmusic.h       |    4 ++-
- xbmc/lib/libPython/xbmcmodule/infotagvideo.h       |    4 ++-
- xbmc/lib/libPython/xbmcmodule/keyboard.h           |    4 ++-
- xbmc/lib/libPython/xbmcmodule/listitem.cpp         |    4 ++-
- xbmc/lib/libPython/xbmcmodule/listitem.h           |    4 ++-
- xbmc/lib/libPython/xbmcmodule/player.h             |    4 ++-
- xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp       |    4 ++-
- xbmc/lib/libPython/xbmcmodule/pyplaylist.h         |    4 ++-
- xbmc/lib/libPython/xbmcmodule/pyutil.h             |    4 ++-
- xbmc/lib/libPython/xbmcmodule/window.h             |    4 ++-
- xbmc/lib/libPython/xbmcmodule/winxml.cpp           |    4 ++-
- xbmc/lib/libPython/xbmcmodule/winxml.h             |    4 ++-
- xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp     |    4 ++-
- xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp  |    4 ++-
- xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp    |    5 +++-
- xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp       |    4 ++-
- 42 files changed, 149 insertions(+), 48 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 4c0b1b7..cd3429e 100644
---- a/configure.in
-+++ b/configure.in
-@@ -901,7 +901,11 @@ fi
- 
- # External Python
- if test "$use_external_python" = "yes"; then
--  AC_CHECK_LIB([python2.6], [main],
-+  AC_CHECK_LIB([python2.7], [main],
-+    [AC_DEFINE([HAVE_LIBPYTHON2_7], [1],
-+    [Define to 1 if you have the 'python2.7' library.])
-+    USE_PYTHON2_7=1],
-+  [AC_CHECK_LIB([python2.6], [main],
-     [AC_DEFINE([HAVE_LIBPYTHON2_6], [1],
-     [Define to 1 if you have the 'python2.6' library.])
-     USE_PYTHON2_6=1],
-@@ -913,9 +917,10 @@ if test "$use_external_python" = "yes"; then
-     [AC_DEFINE([HAVE_LIBPYTHON2_4], [1],
-     [Define to 1 if you have the 'python2.4' library.])
-     USE_PYTHON2_4=1],
--  [AC_MSG_ERROR($missing_library)] )] )] )
-+  [AC_MSG_ERROR($missing_library)] )] )] )] )
- 
-   AC_MSG_NOTICE($external_python_enabled)
-+  test "$USE_PYTHON2_7" && AC_MSG_NOTICE([Using Python 2.7])
-   test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6])
-   test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5])
-   test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4])
-@@ -1471,6 +1476,7 @@ AC_SUBST(USE_INTERNAL_LIBDTS)
- AC_SUBST(USE_EXTERNAL_LIBMPEG2)
- AC_SUBST(USE_EXTERNAL_LIBWAVPACK)
- AC_SUBST(USE_EXTERNAL_PYTHON)
-+AC_SUBST(USE_PYTHON2_7)
- AC_SUBST(USE_PYTHON2_6)
- AC_SUBST(USE_PYTHON2_5)
- AC_SUBST(USE_PYTHON2_4)
-diff --git a/xbmc/lib/libPython/XBPyThread.cpp b/xbmc/lib/libPython/XBPyThread.cpp
-index 3a6f34e..71b4b9a 100644
---- a/xbmc/lib/libPython/XBPyThread.cpp
-+++ b/xbmc/lib/libPython/XBPyThread.cpp
-@@ -24,7 +24,10 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+    #include <python2.7/osdefs.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-     #include <python2.6/osdefs.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-diff --git a/xbmc/lib/libPython/XBPyThread.h b/xbmc/lib/libPython/XBPyThread.h
-index c3da337..eea7fea 100644
---- a/xbmc/lib/libPython/XBPyThread.h
-+++ b/xbmc/lib/libPython/XBPyThread.h
-@@ -26,7 +26,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/XBPython.cpp b/xbmc/lib/libPython/XBPython.cpp
-index e52cdfb..defcf14 100644
---- a/xbmc/lib/libPython/XBPython.cpp
-+++ b/xbmc/lib/libPython/XBPython.cpp
-@@ -24,7 +24,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-@@ -61,7 +63,9 @@ XBPython g_pythonParser;
- #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86-osx.so"
- #endif
- #elif defined(__x86_64__)
--#if (defined HAVE_LIBPYTHON2_6)
-+#if (defined HAVE_LIBPYTHON2_7)
-+#define PYTHON_DLL "special://xbmcbin/system/python/python27-x86_64-linux.so"
-+#elif (defined HAVE_LIBPYTHON2_6)
- #define PYTHON_DLL "special://xbmcbin/system/python/python26-x86_64-linux.so"
- #elif (defined HAVE_LIBPYTHON2_5)
- #define PYTHON_DLL "special://xbmcbin/system/python/python25-x86_64-linux.so"
-@@ -69,7 +73,9 @@ XBPython g_pythonParser;
- #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86_64-linux.so"
- #endif
- #elif defined(_POWERPC)
--#if (defined HAVE_LIBPYTHON2_6)
-+#if (defined HAVE_LIBPYTHON2_7)
-+#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc-linux.so"
-+#elif (defined HAVE_LIBPYTHON2_6)
- #define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc-linux.so"
- #elif (defined HAVE_LIBPYTHON2_5)
- #define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc-linux.so"
-@@ -77,7 +83,9 @@ XBPython g_pythonParser;
- #define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc-linux.so"
- #endif
- #elif defined(_POWERPC64)
--#if (defined HAVE_LIBPYTHON2_6)
-+#if (defined HAVE_LIBPYTHON2_7)
-+#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc64-linux.so"
-+#elif (defined HAVE_LIBPYTHON2_6)
- #define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc64-linux.so"
- #elif (defined HAVE_LIBPYTHON2_5)
- #define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc64-linux.so"
-@@ -85,7 +93,9 @@ XBPython g_pythonParser;
- #define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc64-linux.so"
- #endif
- #elif defined(_ARMEL)
--#if (defined HAVE_LIBPYTHON2_6)
-+#if (defined HAVE_LIBPYTHON2_7)
-+#define PYTHON_DLL "special://xbmc/system/python/python27-arm.so"
-+#elif (defined HAVE_LIBPYTHON2_6)
- #define PYTHON_DLL "special://xbmc/system/python/python26-arm.so"
- #elif (defined HAVE_LIBPYTHON2_5)
- #define PYTHON_DLL "special://xbmc/system/python/python25-arm.so"
-@@ -93,7 +103,9 @@ XBPython g_pythonParser;
- #define PYTHON_DLL "special://xbmc/system/python/python24-arm.so"
- #endif
- #else /* !__x86_64__ && !__powerpc__ */
--#if (defined HAVE_LIBPYTHON2_6)
-+#if (defined HAVE_LIBPYTHON2_7)
-+#define PYTHON_DLL "special://xbmcbin/system/python/python27-i486-linux.so"
-+#elif (defined HAVE_LIBPYTHON2_6)
- #define PYTHON_DLL "special://xbmcbin/system/python/python26-i486-linux.so"
- #elif (defined HAVE_LIBPYTHON2_5)
- #define PYTHON_DLL "special://xbmcbin/system/python/python25-i486-linux.so"
-diff --git a/xbmc/lib/libPython/XBPythonDll.cpp b/xbmc/lib/libPython/XBPythonDll.cpp
-index bc9d827..87ac7d7 100644
---- a/xbmc/lib/libPython/XBPythonDll.cpp
-+++ b/xbmc/lib/libPython/XBPythonDll.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/pyconfig.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/pyconfig.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/pyconfig.h>
-diff --git a/xbmc/lib/libPython/XBPythonDllFuncs.S b/xbmc/lib/libPython/XBPythonDllFuncs.S
-index 6b7a6c3..f59b192 100644
---- a/xbmc/lib/libPython/XBPythonDllFuncs.S
-+++ b/xbmc/lib/libPython/XBPythonDllFuncs.S
-@@ -2,7 +2,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/pyconfig.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/pyconfig.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/pyconfig.h>
-diff --git a/xbmc/lib/libPython/linux/Makefile.in b/xbmc/lib/libPython/linux/Makefile.in
-index 7011434..0786937 100644
---- a/xbmc/lib/libPython/linux/Makefile.in
-+++ b/xbmc/lib/libPython/linux/Makefile.in
-@@ -5,7 +5,10 @@ LDFLAGS=@LDFLAGS@
- SHELL=/bin/bash
- SYSDIR=../../../../system/python
- 
--ifeq (@USE_PYTHON2_6@,1)
-+ifeq (@USE_PYTHON2_7@,1)
-+    PYVERSION=python2.7
-+    SO=python27-$(ARCH).so
-+else ifeq (@USE_PYTHON2_6@,1)
-     PYVERSION=python2.6
-     SO=python26-$(ARCH).so
- else ifeq (@USE_PYTHON2_5@,1)
-diff --git a/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h b/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h
-index 620d9bd..06fa146 100644
---- a/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h
-+++ b/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h
-@@ -26,7 +26,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/PythonAddon.h b/xbmc/lib/libPython/xbmcmodule/PythonAddon.h
-index ec7ed28..41eb8ea 100644
---- a/xbmc/lib/libPython/xbmcmodule/PythonAddon.h
-+++ b/xbmc/lib/libPython/xbmcmodule/PythonAddon.h
-@@ -25,7 +25,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h b/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h
-index ecee993..24a1c87 100644
---- a/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h
-+++ b/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h
-@@ -25,7 +25,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/action.h b/xbmc/lib/libPython/xbmcmodule/action.h
-index 0e20000..7f8b1bc 100644
---- a/xbmc/lib/libPython/xbmcmodule/action.h
-+++ b/xbmc/lib/libPython/xbmcmodule/action.h
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/control.h b/xbmc/lib/libPython/xbmcmodule/control.h
-index c76b37c..a9ec63d 100644
---- a/xbmc/lib/libPython/xbmcmodule/control.h
-+++ b/xbmc/lib/libPython/xbmcmodule/control.h
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp b/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp
-index b24ccce..7455ca7 100644
---- a/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp b/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp
-index 96e4743..86a7d8b 100644
---- a/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp b/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp
-index 68442d8..c6eb052 100644
---- a/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp b/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp
-index aadfc17..8275324 100644
---- a/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controlimage.cpp b/xbmc/lib/libPython/xbmcmodule/controlimage.cpp
-index 79835d6..f106e90 100644
---- a/xbmc/lib/libPython/xbmcmodule/controlimage.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controlimage.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controllabel.cpp b/xbmc/lib/libPython/xbmcmodule/controllabel.cpp
-index aca22e4..38a9c07 100644
---- a/xbmc/lib/libPython/xbmcmodule/controllabel.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controllabel.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controllist.cpp b/xbmc/lib/libPython/xbmcmodule/controllist.cpp
-index 0c67b5c..bb57776 100644
---- a/xbmc/lib/libPython/xbmcmodule/controllist.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controllist.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp b/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp
-index a21e462..b460a2a 100644
---- a/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp b/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp
-index ec54efd..b966a17 100644
---- a/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controlslider.cpp b/xbmc/lib/libPython/xbmcmodule/controlslider.cpp
-index 21ea5e7..c5f65b3 100644
---- a/xbmc/lib/libPython/xbmcmodule/controlslider.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controlslider.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controlspin.cpp b/xbmc/lib/libPython/xbmcmodule/controlspin.cpp
-index 4e24e14..feead3c 100644
---- a/xbmc/lib/libPython/xbmcmodule/controlspin.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controlspin.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp b/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp
-index b4c44d5..4a7c688 100644
---- a/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/dialog.cpp b/xbmc/lib/libPython/xbmcmodule/dialog.cpp
-index caa8986..cffe485 100644
---- a/xbmc/lib/libPython/xbmcmodule/dialog.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/dialog.cpp
-@@ -24,7 +24,9 @@
- #endif
- #include "dialog.h"
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/dialog.h b/xbmc/lib/libPython/xbmcmodule/dialog.h
-index edcae41..a61c4b1 100644
---- a/xbmc/lib/libPython/xbmcmodule/dialog.h
-+++ b/xbmc/lib/libPython/xbmcmodule/dialog.h
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/infotagmusic.h b/xbmc/lib/libPython/xbmcmodule/infotagmusic.h
-index d202e48..590b858 100644
---- a/xbmc/lib/libPython/xbmcmodule/infotagmusic.h
-+++ b/xbmc/lib/libPython/xbmcmodule/infotagmusic.h
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/infotagvideo.h b/xbmc/lib/libPython/xbmcmodule/infotagvideo.h
-index f2bb300..e808573 100644
---- a/xbmc/lib/libPython/xbmcmodule/infotagvideo.h
-+++ b/xbmc/lib/libPython/xbmcmodule/infotagvideo.h
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/keyboard.h b/xbmc/lib/libPython/xbmcmodule/keyboard.h
-index e5c817f..0f069e3 100644
---- a/xbmc/lib/libPython/xbmcmodule/keyboard.h
-+++ b/xbmc/lib/libPython/xbmcmodule/keyboard.h
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/listitem.cpp b/xbmc/lib/libPython/xbmcmodule/listitem.cpp
-index 137436e..20105ef 100644
---- a/xbmc/lib/libPython/xbmcmodule/listitem.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/listitem.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/listitem.h b/xbmc/lib/libPython/xbmcmodule/listitem.h
-index 7ebcd6c..3d4a6c8 100644
---- a/xbmc/lib/libPython/xbmcmodule/listitem.h
-+++ b/xbmc/lib/libPython/xbmcmodule/listitem.h
-@@ -25,7 +25,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/player.h b/xbmc/lib/libPython/xbmcmodule/player.h
-index 48dc9c7..34a102d 100644
---- a/xbmc/lib/libPython/xbmcmodule/player.h
-+++ b/xbmc/lib/libPython/xbmcmodule/player.h
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp b/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp
-index c7e7f62..6df8548 100644
---- a/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp
-@@ -26,7 +26,9 @@
- #include "Util.h"
- #include "pyplaylist.h"
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/pyplaylist.h b/xbmc/lib/libPython/xbmcmodule/pyplaylist.h
-index f2334bb..2410314 100644
---- a/xbmc/lib/libPython/xbmcmodule/pyplaylist.h
-+++ b/xbmc/lib/libPython/xbmcmodule/pyplaylist.h
-@@ -25,7 +25,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/pyutil.h b/xbmc/lib/libPython/xbmcmodule/pyutil.h
-index 4acf6e5..1a156f8 100644
---- a/xbmc/lib/libPython/xbmcmodule/pyutil.h
-+++ b/xbmc/lib/libPython/xbmcmodule/pyutil.h
-@@ -25,7 +25,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/window.h b/xbmc/lib/libPython/xbmcmodule/window.h
-index 6ce8e72..40304ff 100644
---- a/xbmc/lib/libPython/xbmcmodule/window.h
-+++ b/xbmc/lib/libPython/xbmcmodule/window.h
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/winxml.cpp b/xbmc/lib/libPython/xbmcmodule/winxml.cpp
-index d3b703f..3e1b3c8 100644
---- a/xbmc/lib/libPython/xbmcmodule/winxml.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/winxml.cpp
-@@ -24,7 +24,9 @@
- #endif
- #include "winxml.h"
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/winxml.h b/xbmc/lib/libPython/xbmcmodule/winxml.h
-index 6e6489e..f3a8dd8 100644
---- a/xbmc/lib/libPython/xbmcmodule/winxml.h
-+++ b/xbmc/lib/libPython/xbmcmodule/winxml.h
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp b/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp
-index b021501..92d9903 100644
---- a/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp
-@@ -24,7 +24,9 @@
- #endif
- #include "winxml.h"
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp b/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp
-index b8bc0a3..c65aded 100644
---- a/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
-diff --git a/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp b/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp
-index 87c0ead..9941769 100644
---- a/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp
-@@ -23,7 +23,10 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+    #include <python2.7/structmember.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-     #include <python2.6/structmember.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-diff --git a/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp b/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
-index 3bab5a9..1e2c480 100644
---- a/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
-+++ b/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
-@@ -23,7 +23,9 @@
-   #include "config.h"
- #endif
- #if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
-+  #if (defined HAVE_LIBPYTHON2_7)
-+    #include <python2.7/Python.h>
-+  #elif (defined HAVE_LIBPYTHON2_6)
-     #include <python2.6/Python.h>
-   #elif (defined HAVE_LIBPYTHON2_5)
-     #include <python2.5/Python.h>
--- 
-1.7.3.1
-
diff --git a/alarm/xbmc-tegra/xbmc-10.1-gcc-4.6.patch b/alarm/xbmc-tegra/xbmc-10.1-gcc-4.6.patch
deleted file mode 100644
index b3e8c7c24..000000000
--- a/alarm/xbmc-tegra/xbmc-10.1-gcc-4.6.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-http://trac.xbmc.org/ticket/11383
-http://bugs.gentoo.org/367261
-
-From c66099c4d8e6b2d748ca3ddc31ee90b731d0f620 Mon Sep 17 00:00:00 2001
-From: Stephan Raue <stephan@openelec.tv>
-Date: Wed, 30 Mar 2011 14:57:28 +0200
-Subject: [PATCH] dvdplayer: fix build with gcc-4.6. Flags to the Linker must be passed via -Wl,. This fixes ticket #11383
-
-Signed-off-by: Stephan Raue <stephan@openelec.tv>
----
- xbmc/cores/dvdplayer/Codecs/Makefile.in        |   18 +++++++++---------
- xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in |    4 ++--
- 2 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/xbmc/cores/dvdplayer/Codecs/Makefile.in b/xbmc/cores/dvdplayer/Codecs/Makefile.in
-index a7ef1a0..308664a 100644
---- a/xbmc/cores/dvdplayer/Codecs/Makefile.in
-+++ b/xbmc/cores/dvdplayer/Codecs/Makefile.in
-@@ -148,32 +148,32 @@ liba52:
- else
- 
- $(SYSDIR)/avutil-50-$(ARCH).so: ffmpeg/libavutil/libavutil.so
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
- 		ffmpeg/libavutil/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- $(SYSDIR)/avcodec-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavcodec/libavcodec.so
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
- 		ffmpeg/libavcodec/*.o ffmpeg/libavcodec/$(ARCH_DIR)/*.o \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- $(SYSDIR)/avformat-52-$(ARCH).so: $(WRAPPER) ffmpeg/libavformat/libavformat.so
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
- 		ffmpeg/libavformat/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- ifneq ($(ARCH), arm)
- $(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
- 		ffmpeg/libswscale/*.o ffmpeg/libswscale/$(ARCH_DIR)/*.o \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- else # No ARM version of swscale available yet.
- $(SYSDIR)/swscale-0.6.1-$(ARCH).so: $(WRAPPER) ffmpeg/libswscale/libswscale.so
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
- 		ffmpeg/libswscale/*.o \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- endif
- 
- $(SYSDIR)/postproc-51-$(ARCH).so: $(WRAPPER) ffmpeg/libpostproc/libpostproc.so
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ -Wl,-Bsymbolic \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ -Wl,-Bsymbolic \
- 		ffmpeg/libpostproc/*.o `cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- ffmpeg/libavutil/libavutil.so     : ffmpeg;
-@@ -185,17 +185,17 @@ ffmpeg:
- 	$(MAKE) -C $@
- 
- $(SYSDIR)/libdts-$(ARCH).so: $(WRAPPER) libdts/libdts/libdts.a
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
- 		libdts/libdts/bitstream.o \
- 		libdts/libdts/downmix.o libdts/libdts/parse.o \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- $(SYSDIR)/liba52-$(ARCH).so: $(WRAPPER) liba52/liba52/liba52.la
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/liba52/.libs/*.o \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ liba52/liba52/.libs/*.o \
- 		-Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- $(SYSDIR)/libao-$(ARCH).so: $(WRAPPER) liba52/libao/libao.a
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ liba52/libao/libao.a \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ liba52/libao/libao.a \
- 		-Wl`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- libdts/libdts/libdts.a : libdts;
-diff --git a/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in b/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
-index 3c487e9..6d4abd4 100644
---- a/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
-+++ b/xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in
-@@ -49,12 +49,12 @@ $(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER_OSX) $(DVDCSS_A) libdvdread/obj/libdvd
- else
- 
- $(SYSDIR)/libdvdcss-$(ARCH).so: $(WRAPPER) libdvdcss/src/.libs/libdvdcss.a
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ \
- 		libdvdcss/src/*.o \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- $(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
--	$(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
-+	$(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \
- 		`cat $(WRAPPER:.o=.def)` $(WRAPPER)
- 
- endif
--- 
-1.7.0.2
-
diff --git a/alarm/xbmc-tegra/xbmc-tegra.install b/alarm/xbmc-tegra/xbmc-tegra.install
deleted file mode 100644
index 213889cdd..000000000
--- a/alarm/xbmc-tegra/xbmc-tegra.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  [[ $(type -p gtk-update-icon-cache) ]] && /usr/bin/gtk-update-icon-cache -qtf usr/share/icons/hicolor
-  [[ $(type -p update-desktop-database) ]] && /usr/bin/update-desktop-database -q usr/share/applications
-  /bin/true
-}
-
-post_upgrade() {
-  post_install $1
-  /bin/true
-}
-
-post_remove() {
-  post_install $1
-  /bin/true
-}
diff --git a/alarm/xbmc-tegra/xbmcplugin_int_format.patch b/alarm/xbmc-tegra/xbmcplugin_int_format.patch
deleted file mode 100644
index 6d20751b5..000000000
--- a/alarm/xbmc-tegra/xbmcplugin_int_format.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/xbmc/interfaces/python/xbmcmodule/xbmcplugin.cpp b/xbmc/interfaces/python/xbmcmodule/xbmcplugin.cpp
-index a6623b8..1f88c94 100644
---- a/xbmc/interfaces/python/xbmcmodule/xbmcplugin.cpp
-+++ b/xbmc/interfaces/python/xbmcmodule/xbmcplugin.cpp
-@@ -68,7 +68,7 @@ namespace PYXBMC
-     if (!PyArg_ParseTupleAndKeywords(
-       args,
-       kwds,
--      (char*)"iOO|bl",
-+      (char*)"iOO|bi",
-       (char**)keywords,
-       &handle,
-       &pURL,
-@@ -120,7 +120,7 @@ namespace PYXBMC
-     if (!PyArg_ParseTupleAndKeywords(
-       args,
-       kwds,
--      (char*)"iO|l",
-+      (char*)"iO|i",
-       (char**)keywords,
-       &handle,
-       &pItems,