[patch] patch to xbmc source code

xbmc-10.0-python27.patch (text/plain), 29.73 KB, created by Piergiorgio Beruto on 2011-01-02 13:55:22 UTC

diff -urNa xbmc-10.0.orig/configure.in xbmc-10.0/configure.in
--- xbmc-10.0.orig/configure.in	2010-12-30 12:45:37.818680234 +0100
+++ xbmc-10.0/configure.in	2010-12-30 12:46:08.871148778 +0100
@@ -919,7 +919,11 @@
 
 # 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],
@@ -931,9 +935,10 @@
     [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])
@@ -1491,6 +1496,7 @@
 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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.cpp xbmc-10.0/xbmc/lib/libPython/XBPyThread.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.cpp	2010-12-30 12:45:39.926373154 +0100
+++ xbmc-10.0/xbmc/lib/libPython/XBPyThread.cpp	2010-12-30 12:50:10.308530266 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.h xbmc-10.0/xbmc/lib/libPython/XBPyThread.h
--- xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.h	2010-12-30 12:45:39.926373154 +0100
+++ xbmc-10.0/xbmc/lib/libPython/XBPyThread.h	2010-12-30 13:33:59.137947200 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/XBPython.cpp xbmc-10.0/xbmc/lib/libPython/XBPython.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/XBPython.cpp	2010-12-30 12:45:39.926373154 +0100
+++ xbmc-10.0/xbmc/lib/libPython/XBPython.cpp	2010-12-30 14:14:18.782995825 +0100
@@ -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 @@
 #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 @@
 #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 @@
 #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 @@
 #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 @@
 #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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDll.cpp xbmc-10.0/xbmc/lib/libPython/XBPythonDll.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDll.cpp	2010-12-30 12:45:39.440443956 +0100
+++ xbmc-10.0/xbmc/lib/libPython/XBPythonDll.cpp	2010-12-30 13:36:40.467080776 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDllFuncs.S xbmc-10.0/xbmc/lib/libPython/XBPythonDllFuncs.S
--- xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDllFuncs.S	2010-12-30 12:45:39.926373154 +0100
+++ xbmc-10.0/xbmc/lib/libPython/XBPythonDllFuncs.S	2010-12-30 13:33:00.549977647 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/linux/Makefile.in xbmc-10.0/xbmc/lib/libPython/linux/Makefile.in
--- xbmc-10.0.orig/xbmc/lib/libPython/linux/Makefile.in	2010-12-30 12:45:39.433444977 +0100
+++ xbmc-10.0/xbmc/lib/libPython/linux/Makefile.in	2010-12-30 12:46:08.872148631 +0100
@@ -5,7 +5,10 @@
 SHELL=/bin/bash
 SYSDIR=../../../../system/python
 
-ifeq (@USE_PYTHON2_6@,1)
+ifeq (@USE_PYTHON2_7@,1)
+    PYVERSION=python2.7
+    SO=python27-$(ARCH).so
+else (@USE_PYTHON2_6@,1)
     PYVERSION=python2.6
     SO=python26-$(ARCH).so
 else ifeq (@USE_PYTHON2_5@,1)
diff -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h	2010-12-30 12:45:39.434444832 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h	2010-12-30 14:11:30.613916521 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonAddon.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonAddon.h
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonAddon.h	2010-12-30 12:45:39.435444686 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonAddon.h	2010-12-30 14:11:04.871884258 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h	2010-12-30 12:45:39.433444977 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h	2010-12-30 14:10:38.768907620 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/action.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/action.h
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/action.h	2010-12-30 12:45:39.435444686 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/action.h	2010-12-30 14:10:12.018030880 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/control.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/control.h
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/control.h	2010-12-30 12:45:39.437444394 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/control.h	2010-12-30 14:09:45.747080148 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp	2010-12-30 12:45:39.438444248 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp	2010-12-30 14:09:24.956284729 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp	2010-12-30 12:45:39.439444102 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp	2010-12-30 13:44:05.505484893 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp	2010-12-30 12:45:39.438444248 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp	2010-12-30 14:08:59.533203305 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp	2010-12-30 12:45:39.438444248 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp	2010-12-30 14:08:34.534056539 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlimage.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlimage.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlimage.cpp	2010-12-30 12:45:39.434444832 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlimage.cpp	2010-12-30 14:08:06.887317884 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllabel.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllabel.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllabel.cpp	2010-12-30 12:45:39.433444977 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllabel.cpp	2010-12-30 14:07:34.057378093 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllist.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllist.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllist.cpp	2010-12-30 12:45:39.438444248 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllist.cpp	2010-12-30 14:07:03.146142582 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp	2010-12-30 12:45:39.440443956 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp	2010-12-30 13:43:22.729078224 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp	2010-12-30 12:45:39.434444832 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp	2010-12-30 14:06:32.331892147 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlslider.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlslider.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlslider.cpp	2010-12-30 12:45:39.436444540 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlslider.cpp	2010-12-30 14:05:51.413199158 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlspin.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlspin.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlspin.cpp	2010-12-30 12:45:39.437444394 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlspin.cpp	2010-12-30 14:05:23.590487583 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp	2010-12-30 12:45:39.434444832 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp	2010-12-30 14:04:56.312692042 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.cpp	2010-12-30 12:45:39.436444540 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.cpp	2010-12-30 14:02:34.102611557 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.h
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.h	2010-12-30 12:45:39.439444102 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.h	2010-12-30 13:44:58.960245659 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagmusic.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagmusic.h
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagmusic.h	2010-12-30 12:45:39.433444977 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagmusic.h	2010-12-30 14:01:55.735525254 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagvideo.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagvideo.h
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagvideo.h	2010-12-30 12:45:39.436444540 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagvideo.h	2010-12-30 14:01:33.032024656 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/keyboard.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/keyboard.h
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/keyboard.h	2010-12-30 12:45:39.436444540 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/keyboard.h	2010-12-30 14:01:04.770380756 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.cpp	2010-12-30 12:45:39.434444832 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.cpp	2010-12-30 14:00:02.524974935 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.h
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.h	2010-12-30 12:45:39.435444686 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.h	2010-12-30 13:59:41.501215421 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/player.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/player.h
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/player.h	2010-12-30 12:45:39.435444686 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/player.h	2010-12-30 13:59:09.079212792 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp	2010-12-30 12:45:39.435444686 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp	2010-12-30 13:58:29.457319897 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.h
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.h	2010-12-30 12:45:39.435444686 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.h	2010-12-30 13:58:02.226517098 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyutil.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyutil.h
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyutil.h	2010-12-30 12:45:39.435444686 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyutil.h	2010-12-30 13:57:16.340589724 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/window.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/window.h
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/window.h	2010-12-30 12:45:39.439444102 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/window.h	2010-12-30 13:56:43.453658749 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.cpp	2010-12-30 12:45:39.434444832 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.cpp	2010-12-30 13:56:04.368683098 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.h
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.h	2010-12-30 12:45:39.439444102 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.h	2010-12-30 13:55:19.803552131 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp	2010-12-30 12:45:39.439444102 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp	2010-12-30 13:54:37.756033115 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp	2010-12-30 12:45:39.435444686 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp	2010-12-30 13:53:19.465100463 +0100
@@ -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 -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp	2010-12-30 12:45:39.436444540 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp	2010-12-30 13:51:50.539806954 +0100
@@ -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>
     #include <python2.6/structmember.h>
   #elif (defined HAVE_LIBPYTHON2_5)
diff -urNa xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp	2010-12-30 12:45:39.438444248 +0100
+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp	2010-12-30 13:50:21.791486146 +0100
@@ -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>