xbmc-python27.patch

   1 diff -urN xbmc-10.0.orig/configure.in xbmc-10.0/configure.in
   2 --- xbmc-10.0.orig/configure.in 2010-12-22 20:53:28.933000073 +0100
   3 +++ xbmc-10.0/configure.in      2010-12-22 21:46:29.535000096 +0100
   4 @@ -919,7 +919,11 @@
   5
   6  # External Python
   7  if test "$use_external_python" = "yes"; then
   8 -  AC_CHECK_LIB([python2.6], [main],
   9 +  AC_CHECK_LIB([python2.7], [main],
  10 +    [AC_DEFINE([HAVE_LIBPYTHON2_7], [1],
  11 +    [Define to 1 if you have the 'python2.7' library.])
  12 +    USE_PYTHON2_7=1],
  13 +  [AC_CHECK_LIB([python2.6], [main],
  14      [AC_DEFINE([HAVE_LIBPYTHON2_6], [1],
  15      [Define to 1 if you have the 'python2.6' library.])
  16      USE_PYTHON2_6=1],
  17 @@ -931,9 +935,10 @@
  18      [AC_DEFINE([HAVE_LIBPYTHON2_4], [1],
  19      [Define to 1 if you have the 'python2.4' library.])
  20      USE_PYTHON2_4=1],
  21 -  [AC_MSG_ERROR($missing_library)] )] )] )
  22 +  [AC_MSG_ERROR($missing_library)] )] )] )] )
  23
  24    AC_MSG_NOTICE($external_python_enabled)
  25 +  test "$USE_PYTHON2_7" && AC_MSG_NOTICE([Using Python 2.7])
  26    test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6])
  27    test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5])
  28    test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4])
  29 @@ -1491,6 +1496,7 @@
  30  AC_SUBST(USE_EXTERNAL_LIBMPEG2)
  31  AC_SUBST(USE_EXTERNAL_LIBWAVPACK)
  32  AC_SUBST(USE_EXTERNAL_PYTHON)
  33 +AC_SUBST(USE_PYTHON2_7)
  34  AC_SUBST(USE_PYTHON2_6)
  35  AC_SUBST(USE_PYTHON2_5)
  36  AC_SUBST(USE_PYTHON2_4)
  37 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/linux/Makefile.in xbmc-10.0/xbmc/lib/libPython/linux/Makefile.in
  38 --- xbmc-10.0.orig/xbmc/lib/libPython/linux/Makefile.in 2010-12-17 07:17:41.000000000 +0100
  39 +++ xbmc-10.0/xbmc/lib/libPython/linux/Makefile.in      2010-12-22 21:46:29.566000076 +0100
  40 @@ -5,7 +5,10 @@
  41  SHELL=/bin/bash
  42  SYSDIR=../../../../system/python
  43
  44 -ifeq (@USE_PYTHON2_6@,1)
  45 +ifeq (@USE_PYTHON2_7@,1)
  46 +    PYVERSION=python2.7
  47 +    SO=python27-$(ARCH).so
  48 +else ifeq (@USE_PYTHON2_6@,1)
  49      PYVERSION=python2.6
  50      SO=python26-$(ARCH).so
  51  else ifeq (@USE_PYTHON2_5@,1)
  52 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/action.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/action.h
  53 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/action.h       2010-12-17 07:17:41.000000000 +0100
  54 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/action.h    2010-12-22 21:46:29.566000076 +0100
  55 @@ -23,7 +23,9 @@
  56    #include "config.h"
  57  #endif
  58  #if (defined USE_EXTERNAL_PYTHON)
  59 -  #if (defined HAVE_LIBPYTHON2_6)
  60 +  #if (defined HAVE_LIBPYTHON2_7)
  61 +    #include <python2.7/Python.h>
  62 +  #elif (defined HAVE_LIBPYTHON2_6)
  63      #include <python2.6/Python.h>
  64    #elif (defined HAVE_LIBPYTHON2_5)
  65      #include <python2.5/Python.h>
  66 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp
  67 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp      2010-12-17 07:17:41.000000000 +0100
  68 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp   2010-12-22 21:46:29.567000079 +0100
  69 @@ -23,7 +23,9 @@
  70    #include "config.h"
  71  #endif
  72  #if (defined USE_EXTERNAL_PYTHON)
  73 -  #if (defined HAVE_LIBPYTHON2_6)
  74 +  #if (defined HAVE_LIBPYTHON2_7)
  75 +    #include <python2.7/Python.h>
  76 +  #elif (defined HAVE_LIBPYTHON2_6)
  77      #include <python2.6/Python.h>
  78    #elif (defined HAVE_LIBPYTHON2_5)
  79      #include <python2.5/Python.h>
  80 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp
  81 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp   2010-12-17 07:17:41.000000000 +0100
  82 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp        2010-12-22 21:46:29.567000079 +0100
  83 @@ -23,7 +23,9 @@
  84    #include "config.h"
  85  #endif
  86  #if (defined USE_EXTERNAL_PYTHON)
  87 -  #if (defined HAVE_LIBPYTHON2_6)
  88 +  #if (defined HAVE_LIBPYTHON2_7)
  89 +    #include <python2.7/Python.h>
  90 +  #elif (defined HAVE_LIBPYTHON2_6)
  91      #include <python2.6/Python.h>
  92    #elif (defined HAVE_LIBPYTHON2_5)
  93      #include <python2.5/Python.h>
  94 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp
  95 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp   2010-12-17 07:17:41.000000000 +0100
  96 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp        2010-12-22 21:46:29.568000080 +0100
  97 @@ -23,7 +23,9 @@
  98    #include "config.h"
  99  #endif
 100  #if (defined USE_EXTERNAL_PYTHON)
 101 -  #if (defined HAVE_LIBPYTHON2_6)
 102 +  #if (defined HAVE_LIBPYTHON2_7)
 103 +    #include <python2.7/Python.h>
 104 +  #elif (defined HAVE_LIBPYTHON2_6)
 105      #include <python2.6/Python.h>
 106    #elif (defined HAVE_LIBPYTHON2_5)
 107      #include <python2.5/Python.h>
 108 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp
 109 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp       2010-12-17 07:17:41.000000000 +0100
 110 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp    2010-12-22 21:46:29.568000080 +0100
 111 @@ -23,7 +23,9 @@
 112    #include "config.h"
 113  #endif
 114  #if (defined USE_EXTERNAL_PYTHON)
 115 -  #if (defined HAVE_LIBPYTHON2_6)
 116 +  #if (defined HAVE_LIBPYTHON2_7)
 117 +    #include <python2.7/Python.h>
 118 +  #elif (defined HAVE_LIBPYTHON2_6)
 119      #include <python2.6/Python.h>
 120    #elif (defined HAVE_LIBPYTHON2_5)
 121      #include <python2.5/Python.h>
 122 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/control.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/control.h
 123 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/control.h      2010-12-17 07:17:41.000000000 +0100
 124 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/control.h   2010-12-22 21:46:29.569000080 +0100
 125 @@ -23,7 +23,9 @@
 126    #include "config.h"
 127  #endif
 128  #if (defined USE_EXTERNAL_PYTHON)
 129 -  #if (defined HAVE_LIBPYTHON2_6)
 130 +  #if (defined HAVE_LIBPYTHON2_7)
 131 +    #include <python2.7/Python.h>
 132 +  #elif (defined HAVE_LIBPYTHON2_6)
 133      #include <python2.6/Python.h>
 134    #elif (defined HAVE_LIBPYTHON2_5)
 135      #include <python2.5/Python.h>
 136 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlimage.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlimage.cpp
 137 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlimage.cpp       2010-12-17 07:17:41.000000000 +0100
 138 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlimage.cpp    2010-12-22 21:46:29.569000080 +0100
 139 @@ -23,7 +23,9 @@
 140    #include "config.h"
 141  #endif
 142  #if (defined USE_EXTERNAL_PYTHON)
 143 -  #if (defined HAVE_LIBPYTHON2_6)
 144 +  #if (defined HAVE_LIBPYTHON2_7)
 145 +    #include <python2.7/Python.h>
 146 +  #elif (defined HAVE_LIBPYTHON2_6)
 147      #include <python2.6/Python.h>
 148    #elif (defined HAVE_LIBPYTHON2_5)
 149      #include <python2.5/Python.h>
 150 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllabel.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllabel.cpp
 151 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllabel.cpp       2010-12-17 07:17:41.000000000 +0100
 152 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllabel.cpp    2010-12-22 21:46:29.570000079 +0100
 153 @@ -23,7 +23,9 @@
 154    #include "config.h"
 155  #endif
 156  #if (defined USE_EXTERNAL_PYTHON)
 157 -  #if (defined HAVE_LIBPYTHON2_6)
 158 +  #if (defined HAVE_LIBPYTHON2_7)
 159 +    #include <python2.7/Python.h>
 160 +  #elif (defined HAVE_LIBPYTHON2_6)
 161      #include <python2.6/Python.h>
 162    #elif (defined HAVE_LIBPYTHON2_5)
 163      #include <python2.5/Python.h>
 164 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllist.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllist.cpp
 165 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllist.cpp        2010-12-17 07:17:41.000000000 +0100
 166 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllist.cpp     2010-12-22 21:46:29.571000077 +0100
 167 @@ -23,7 +23,9 @@
 168    #include "config.h"
 169  #endif
 170  #if (defined USE_EXTERNAL_PYTHON)
 171 -  #if (defined HAVE_LIBPYTHON2_6)
 172 +  #if (defined HAVE_LIBPYTHON2_7)
 173 +    #include <python2.7/Python.h>
 174 +  #elif (defined HAVE_LIBPYTHON2_6)
 175      #include <python2.6/Python.h>
 176    #elif (defined HAVE_LIBPYTHON2_5)
 177      #include <python2.5/Python.h>
 178 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp
 179 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp    2010-12-17 07:17:41.000000000 +0100
 180 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp 2010-12-22 21:46:29.572000076 +0100
 181 @@ -23,7 +23,9 @@
 182    #include "config.h"
 183  #endif
 184  #if (defined USE_EXTERNAL_PYTHON)
 185 -  #if (defined HAVE_LIBPYTHON2_6)
 186 +  #if (defined HAVE_LIBPYTHON2_7)
 187 +    #include <python2.7/Python.h>
 188 +  #elif (defined HAVE_LIBPYTHON2_6)
 189      #include <python2.6/Python.h>
 190    #elif (defined HAVE_LIBPYTHON2_5)
 191      #include <python2.5/Python.h>
 192 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp
 193 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp 2010-12-17 07:17:41.000000000 +0100
 194 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp      2010-12-22 21:46:29.572000076 +0100
 195 @@ -23,7 +23,9 @@
 196    #include "config.h"
 197  #endif
 198  #if (defined USE_EXTERNAL_PYTHON)
 199 -  #if (defined HAVE_LIBPYTHON2_6)
 200 +  #if (defined HAVE_LIBPYTHON2_7)
 201 +    #include <python2.7/Python.h>
 202 +  #elif (defined HAVE_LIBPYTHON2_6)
 203      #include <python2.6/Python.h>
 204    #elif (defined HAVE_LIBPYTHON2_5)
 205      #include <python2.5/Python.h>
 206 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlslider.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlslider.cpp
 207 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlslider.cpp      2010-12-17 07:17:41.000000000 +0100
 208 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlslider.cpp   2010-12-22 21:46:29.572000076 +0100
 209 @@ -23,7 +23,9 @@
 210    #include "config.h"
 211  #endif
 212  #if (defined USE_EXTERNAL_PYTHON)
 213 -  #if (defined HAVE_LIBPYTHON2_6)
 214 +  #if (defined HAVE_LIBPYTHON2_7)
 215 +    #include <python2.7/Python.h>
 216 +  #elif (defined HAVE_LIBPYTHON2_6)
 217      #include <python2.6/Python.h>
 218    #elif (defined HAVE_LIBPYTHON2_5)
 219      #include <python2.5/Python.h>
 220 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlspin.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlspin.cpp
 221 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlspin.cpp        2010-12-17 07:17:41.000000000 +0100
 222 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlspin.cpp     2010-12-22 21:46:29.572000076 +0100
 223 @@ -23,7 +23,9 @@
 224    #include "config.h"
 225  #endif
 226  #if (defined USE_EXTERNAL_PYTHON)
 227 -  #if (defined HAVE_LIBPYTHON2_6)
 228 +  #if (defined HAVE_LIBPYTHON2_7)
 229 +    #include <python2.7/Python.h>
 230 +  #elif (defined HAVE_LIBPYTHON2_6)
 231      #include <python2.6/Python.h>
 232    #elif (defined HAVE_LIBPYTHON2_5)
 233      #include <python2.5/Python.h>
 234 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp
 235 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp     2010-12-17 07:17:41.000000000 +0100
 236 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp  2010-12-22 21:46:29.572000076 +0100
 237 @@ -23,7 +23,9 @@
 238    #include "config.h"
 239  #endif
 240  #if (defined USE_EXTERNAL_PYTHON)
 241 -  #if (defined HAVE_LIBPYTHON2_6)
 242 +  #if (defined HAVE_LIBPYTHON2_7)
 243 +    #include <python2.7/Python.h>
 244 +  #elif (defined HAVE_LIBPYTHON2_6)
 245      #include <python2.6/Python.h>
 246    #elif (defined HAVE_LIBPYTHON2_5)
 247      #include <python2.5/Python.h>
 248 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.cpp
 249 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.cpp     2010-12-17 07:17:41.000000000 +0100
 250 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.cpp  2010-12-22 21:46:29.572000076 +0100
 251 @@ -24,7 +24,9 @@
 252  #endif
 253  #include "dialog.h"
 254  #if (defined USE_EXTERNAL_PYTHON)
 255 -  #if (defined HAVE_LIBPYTHON2_6)
 256 +  #if (defined HAVE_LIBPYTHON2_7)
 257 +    #include <python2.7/Python.h>
 258 +  #elif (defined HAVE_LIBPYTHON2_6)
 259      #include <python2.6/Python.h>
 260    #elif (defined HAVE_LIBPYTHON2_5)
 261      #include <python2.5/Python.h>
 262 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.h
 263 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.h       2010-12-17 07:17:41.000000000 +0100
 264 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.h    2010-12-22 21:46:29.573000077 +0100
 265 @@ -23,7 +23,9 @@
 266    #include "config.h"
 267  #endif
 268  #if (defined USE_EXTERNAL_PYTHON)
 269 -  #if (defined HAVE_LIBPYTHON2_6)
 270 +  #if (defined HAVE_LIBPYTHON2_7)
 271 +    #include <python2.7/Python.h>
 272 +  #elif (defined HAVE_LIBPYTHON2_6)
 273      #include <python2.6/Python.h>
 274    #elif (defined HAVE_LIBPYTHON2_5)
 275      #include <python2.5/Python.h>
 276 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h
 277 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h      2010-12-17 07:17:41.000000000 +0100
 278 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h   2010-12-22 21:46:29.573000077 +0100
 279 @@ -26,7 +26,9 @@
 280    #include "config.h"
 281  #endif
 282  #if (defined USE_EXTERNAL_PYTHON)
 283 -  #if (defined HAVE_LIBPYTHON2_6)
 284 +  #if (defined HAVE_LIBPYTHON2_7)
 285 +    #include <python2.7/Python.h>
 286 +  #elif (defined HAVE_LIBPYTHON2_6)
 287      #include <python2.6/Python.h>
 288    #elif (defined HAVE_LIBPYTHON2_5)
 289      #include <python2.5/Python.h>
 290 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagmusic.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagmusic.h
 291 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagmusic.h 2010-12-17 07:17:41.000000000 +0100
 292 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagmusic.h      2010-12-22 21:46:29.573000077 +0100
 293 @@ -23,7 +23,9 @@
 294    #include "config.h"
 295  #endif
 296  #if (defined USE_EXTERNAL_PYTHON)
 297 -  #if (defined HAVE_LIBPYTHON2_6)
 298 +  #if (defined HAVE_LIBPYTHON2_7)
 299 +    #include <python2.7/Python.h>
 300 +  #elif (defined HAVE_LIBPYTHON2_6)
 301      #include <python2.6/Python.h>
 302    #elif (defined HAVE_LIBPYTHON2_5)
 303      #include <python2.5/Python.h>
 304 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagvideo.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagvideo.h
 305 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagvideo.h 2010-12-17 07:17:41.000000000 +0100
 306 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagvideo.h      2010-12-22 21:46:29.573000077 +0100
 307 @@ -23,7 +23,9 @@
 308    #include "config.h"
 309  #endif
 310  #if (defined USE_EXTERNAL_PYTHON)
 311 -  #if (defined HAVE_LIBPYTHON2_6)
 312 +  #if (defined HAVE_LIBPYTHON2_7)
 313 +    #include <python2.7/Python.h>
 314 +  #elif (defined HAVE_LIBPYTHON2_6)
 315      #include <python2.6/Python.h>
 316    #elif (defined HAVE_LIBPYTHON2_5)
 317      #include <python2.5/Python.h>
 318 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/keyboard.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/keyboard.h
 319 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/keyboard.h     2010-12-17 07:17:41.000000000 +0100
 320 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/keyboard.h  2010-12-22 21:46:29.573000077 +0100
 321 @@ -23,7 +23,9 @@
 322    #include "config.h"
 323  #endif
 324  #if (defined USE_EXTERNAL_PYTHON)
 325 -  #if (defined HAVE_LIBPYTHON2_6)
 326 +  #if (defined HAVE_LIBPYTHON2_7)
 327 +    #include <python2.7/Python.h>
 328 +  #elif (defined HAVE_LIBPYTHON2_6)
 329      #include <python2.6/Python.h>
 330    #elif (defined HAVE_LIBPYTHON2_5)
 331      #include <python2.5/Python.h>
 332 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.cpp
 333 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.cpp   2010-12-17 07:17:41.000000000 +0100
 334 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.cpp        2010-12-22 21:46:29.573000077 +0100
 335 @@ -23,7 +23,9 @@
 336    #include "config.h"
 337  #endif
 338  #if (defined USE_EXTERNAL_PYTHON)
 339 -  #if (defined HAVE_LIBPYTHON2_6)
 340 +  #if (defined HAVE_LIBPYTHON2_7)
 341 +    #include <python2.7/Python.h>
 342 +  #elif (defined HAVE_LIBPYTHON2_6)
 343      #include <python2.6/Python.h>
 344    #elif (defined HAVE_LIBPYTHON2_5)
 345      #include <python2.5/Python.h>
 346 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.h
 347 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.h     2010-12-17 07:17:41.000000000 +0100
 348 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.h  2010-12-22 21:46:29.573000077 +0100
 349 @@ -25,7 +25,9 @@
 350    #include "config.h"
 351  #endif
 352  #if (defined USE_EXTERNAL_PYTHON)
 353 -  #if (defined HAVE_LIBPYTHON2_6)
 354 +  #if (defined HAVE_LIBPYTHON2_7)
 355 +    #include <python2.7/Python.h>
 356 +  #elif (defined HAVE_LIBPYTHON2_6)
 357      #include <python2.6/Python.h>
 358    #elif (defined HAVE_LIBPYTHON2_5)
 359      #include <python2.5/Python.h>
 360 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/player.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/player.h
 361 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/player.h       2010-12-17 07:17:41.000000000 +0100
 362 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/player.h    2010-12-22 21:46:29.573000077 +0100
 363 @@ -23,7 +23,9 @@
 364    #include "config.h"
 365  #endif
 366  #if (defined USE_EXTERNAL_PYTHON)
 367 -  #if (defined HAVE_LIBPYTHON2_6)
 368 +  #if (defined HAVE_LIBPYTHON2_7)
 369 +    #include <python2.7/Python.h>
 370 +  #elif (defined HAVE_LIBPYTHON2_6)
 371      #include <python2.6/Python.h>
 372    #elif (defined HAVE_LIBPYTHON2_5)
 373      #include <python2.5/Python.h>
 374 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp
 375 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp 2010-12-17 07:17:41.000000000 +0100
 376 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp      2010-12-22 21:46:29.574000079 +0100
 377 @@ -26,7 +26,9 @@
 378  #include "Util.h"
 379  #include "pyplaylist.h"
 380  #if (defined USE_EXTERNAL_PYTHON)
 381 -  #if (defined HAVE_LIBPYTHON2_6)
 382 +  #if (defined HAVE_LIBPYTHON2_7)
 383 +    #include <python2.7/Python.h>
 384 +  #elif (defined HAVE_LIBPYTHON2_6)
 385      #include <python2.6/Python.h>
 386    #elif (defined HAVE_LIBPYTHON2_5)
 387      #include <python2.5/Python.h>
 388 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.h
 389 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.h   2010-12-17 07:17:41.000000000 +0100
 390 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.h        2010-12-22 21:46:29.574000079 +0100
 391 @@ -25,7 +25,9 @@
 392    #include "config.h"
 393  #endif
 394  #if (defined USE_EXTERNAL_PYTHON)
 395 -  #if (defined HAVE_LIBPYTHON2_6)
 396 +  #if (defined HAVE_LIBPYTHON2_7)
 397 +    #include <python2.7/Python.h>
 398 +  #elif (defined HAVE_LIBPYTHON2_6)
 399      #include <python2.6/Python.h>
 400    #elif (defined HAVE_LIBPYTHON2_5)
 401      #include <python2.5/Python.h>
 402 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonAddon.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonAddon.h
 403 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonAddon.h  2010-12-17 07:17:41.000000000 +0100
 404 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonAddon.h       2010-12-22 21:46:29.574000079 +0100
 405 @@ -25,7 +25,9 @@
 406    #include "config.h"
 407  #endif
 408  #if (defined USE_EXTERNAL_PYTHON)
 409 -  #if (defined HAVE_LIBPYTHON2_6)
 410 +  #if (defined HAVE_LIBPYTHON2_7)
 411 +    #include <python2.7/Python.h>
 412 +  #elif (defined HAVE_LIBPYTHON2_6)
 413      #include <python2.6/Python.h>
 414    #elif (defined HAVE_LIBPYTHON2_5)
 415      #include <python2.5/Python.h>
 416 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h
 417 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h 2010-12-17 07:17:41.000000000 +0100
 418 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h      2010-12-22 21:46:29.574000079 +0100
 419 @@ -25,7 +25,9 @@
 420    #include "config.h"
 421  #endif
 422  #if (defined USE_EXTERNAL_PYTHON)
 423 -  #if (defined HAVE_LIBPYTHON2_6)
 424 +  #if (defined HAVE_LIBPYTHON2_7)
 425 +    #include <python2.7/Python.h>
 426 +  #elif (defined HAVE_LIBPYTHON2_6)
 427      #include <python2.6/Python.h>
 428    #elif (defined HAVE_LIBPYTHON2_5)
 429      #include <python2.5/Python.h>
 430 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyutil.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyutil.h
 431 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyutil.h       2010-12-17 07:17:41.000000000 +0100
 432 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyutil.h    2010-12-22 21:46:29.574000079 +0100
 433 @@ -25,7 +25,9 @@
 434    #include "config.h"
 435  #endif
 436  #if (defined USE_EXTERNAL_PYTHON)
 437 -  #if (defined HAVE_LIBPYTHON2_6)
 438 +  #if (defined HAVE_LIBPYTHON2_7)
 439 +    #include <python2.7/Python.h>
 440 +  #elif (defined HAVE_LIBPYTHON2_6)
 441      #include <python2.6/Python.h>
 442    #elif (defined HAVE_LIBPYTHON2_5)
 443      #include <python2.5/Python.h>
 444 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/window.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/window.h
 445 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/window.h       2010-12-17 07:17:41.000000000 +0100
 446 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/window.h    2010-12-22 21:46:29.574000079 +0100
 447 @@ -23,7 +23,9 @@
 448    #include "config.h"
 449  #endif
 450  #if (defined USE_EXTERNAL_PYTHON)
 451 -  #if (defined HAVE_LIBPYTHON2_6)
 452 +  #if (defined HAVE_LIBPYTHON2_7)
 453 +    #include <python2.7/Python.h>
 454 +  #elif (defined HAVE_LIBPYTHON2_6)
 455      #include <python2.6/Python.h>
 456    #elif (defined HAVE_LIBPYTHON2_5)
 457      #include <python2.5/Python.h>
 458 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.cpp
 459 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.cpp     2010-12-17 07:17:41.000000000 +0100
 460 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.cpp  2010-12-22 21:46:29.574000079 +0100
 461 @@ -24,7 +24,9 @@
 462  #endif
 463  #include "winxml.h"
 464  #if (defined USE_EXTERNAL_PYTHON)
 465 -  #if (defined HAVE_LIBPYTHON2_6)
 466 +  #if (defined HAVE_LIBPYTHON2_7)
 467 +    #include <python2.7/Python.h>
 468 +  #elif (defined HAVE_LIBPYTHON2_6)
 469      #include <python2.6/Python.h>
 470    #elif (defined HAVE_LIBPYTHON2_5)
 471      #include <python2.5/Python.h>
 472 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp
 473 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp       2010-12-17 07:17:41.000000000 +0100
 474 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp    2010-12-22 21:46:29.575000080 +0100
 475 @@ -24,7 +24,9 @@
 476  #endif
 477  #include "winxml.h"
 478  #if (defined USE_EXTERNAL_PYTHON)
 479 -  #if (defined HAVE_LIBPYTHON2_6)
 480 +  #if (defined HAVE_LIBPYTHON2_7)
 481 +    #include <python2.7/Python.h>
 482 +  #elif (defined HAVE_LIBPYTHON2_6)
 483      #include <python2.6/Python.h>
 484    #elif (defined HAVE_LIBPYTHON2_5)
 485      #include <python2.5/Python.h>
 486 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.h xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.h
 487 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.h       2010-12-17 07:17:41.000000000 +0100
 488 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.h    2010-12-22 21:46:29.575000080 +0100
 489 @@ -23,7 +23,9 @@
 490    #include "config.h"
 491  #endif
 492  #if (defined USE_EXTERNAL_PYTHON)
 493 -  #if (defined HAVE_LIBPYTHON2_6)
 494 +  #if (defined HAVE_LIBPYTHON2_7)
 495 +    #include <python2.7/Python.h>
 496 +  #elif (defined HAVE_LIBPYTHON2_6)
 497      #include <python2.6/Python.h>
 498    #elif (defined HAVE_LIBPYTHON2_5)
 499      #include <python2.5/Python.h>
 500 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp
 501 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp    2010-12-22 21:48:38.245000078 +0100
 502 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp 2010-12-22 21:47:26.853999676 +0100
 503 @@ -23,7 +23,9 @@
 504    #include "config.h"
 505  #endif
 506  #if (defined USE_EXTERNAL_PYTHON)
 507 -  #if (defined HAVE_LIBPYTHON2_6)
 508 +  #if (defined HAVE_LIBPYTHON2_7)
 509 +    #include <python2.7/Python.h>
 510 +  #elif (defined HAVE_LIBPYTHON2_6)
 511      #include <python2.6/Python.h>
 512    #elif (defined HAVE_LIBPYTHON2_5)
 513      #include <python2.5/Python.h>
 514 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp
 515 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp      2010-12-17 07:17:41.000000000 +0100
 516 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp   2010-12-22 21:46:29.575000080 +0100
 517 @@ -23,7 +23,10 @@
 518    #include "config.h"
 519  #endif
 520  #if (defined USE_EXTERNAL_PYTHON)
 521 -  #if (defined HAVE_LIBPYTHON2_6)
 522 +  #if (defined HAVE_LIBPYTHON2_7)
 523 +    #include <python2.7/Python.h>
 524 +    #include <python2.7/structmember.h>
 525 +  #elif (defined HAVE_LIBPYTHON2_6)
 526      #include <python2.6/Python.h>
 527      #include <python2.6/structmember.h>
 528    #elif (defined HAVE_LIBPYTHON2_5)
 529 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
 530 --- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp 2010-12-17 07:17:41.000000000 +0100
 531 +++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp      2010-12-22 21:46:29.575000080 +0100
 532 @@ -23,7 +23,9 @@
 533    #include "config.h"
 534  #endif
 535  #if (defined USE_EXTERNAL_PYTHON)
 536 -  #if (defined HAVE_LIBPYTHON2_6)
 537 +  #if (defined HAVE_LIBPYTHON2_7)
 538 +    #include <python2.7/Python.h>
 539 +  #elif (defined HAVE_LIBPYTHON2_6)
 540      #include <python2.6/Python.h>
 541    #elif (defined HAVE_LIBPYTHON2_5)
 542      #include <python2.5/Python.h>
 543 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPython.cpp xbmc-10.0/xbmc/lib/libPython/XBPython.cpp
 544 --- xbmc-10.0.orig/xbmc/lib/libPython/XBPython.cpp      2010-12-17 07:17:41.000000000 +0100
 545 +++ xbmc-10.0/xbmc/lib/libPython/XBPython.cpp   2010-12-22 21:46:29.576000080 +0100
 546 @@ -24,7 +24,9 @@
 547    #include "config.h"
 548  #endif
 549  #if (defined USE_EXTERNAL_PYTHON)
 550 -  #if (defined HAVE_LIBPYTHON2_6)
 551 +  #if (defined HAVE_LIBPYTHON2_7)
 552 +    #include <python2.7/Python.h>
 553 +  #elif (defined HAVE_LIBPYTHON2_6)
 554      #include <python2.6/Python.h>
 555    #elif (defined HAVE_LIBPYTHON2_5)
 556      #include <python2.5/Python.h>
 557 @@ -61,7 +63,9 @@
 558  #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86-osx.so"
 559  #endif
 560  #elif defined(__x86_64__)
 561 -#if (defined HAVE_LIBPYTHON2_6)
 562 +#if (defined HAVE_LIBPYTHON2_7)
 563 +#define PYTHON_DLL "special://xbmcbin/system/python/python27-x86_64-linux.so"
 564 +#elif (defined HAVE_LIBPYTHON2_6)
 565  #define PYTHON_DLL "special://xbmcbin/system/python/python26-x86_64-linux.so"
 566  #elif (defined HAVE_LIBPYTHON2_5)
 567  #define PYTHON_DLL "special://xbmcbin/system/python/python25-x86_64-linux.so"
 568 @@ -69,7 +73,9 @@
 569  #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86_64-linux.so"
 570  #endif
 571  #elif defined(_POWERPC)
 572 -#if (defined HAVE_LIBPYTHON2_6)
 573 +#if (defined HAVE_LIBPYTHON2_7)
 574 +#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc-linux.so"
 575 +#elif (defined HAVE_LIBPYTHON2_6)
 576  #define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc-linux.so"
 577  #elif (defined HAVE_LIBPYTHON2_5)
 578  #define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc-linux.so"
 579 @@ -77,7 +83,9 @@
 580  #define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc-linux.so"
 581  #endif
 582  #elif defined(_POWERPC64)
 583 -#if (defined HAVE_LIBPYTHON2_6)
 584 +#if (defined HAVE_LIBPYTHON2_7)
 585 +#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc64-linux.so"
 586 +#elif (defined HAVE_LIBPYTHON2_6)
 587  #define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc64-linux.so"
 588  #elif (defined HAVE_LIBPYTHON2_5)
 589  #define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc64-linux.so"
 590 @@ -85,7 +93,9 @@
 591  #define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc64-linux.so"
 592  #endif
 593  #elif defined(_ARMEL)
 594 -#if (defined HAVE_LIBPYTHON2_6)
 595 +#if (defined HAVE_LIBPYTHON2_7)
 596 +#define PYTHON_DLL "special://xbmc/system/python/python27-arm.so"
 597 +#elif (defined HAVE_LIBPYTHON2_6)
 598  #define PYTHON_DLL "special://xbmc/system/python/python26-arm.so"
 599  #elif (defined HAVE_LIBPYTHON2_5)
 600  #define PYTHON_DLL "special://xbmc/system/python/python25-arm.so"
 601 @@ -93,7 +103,9 @@
 602  #define PYTHON_DLL "special://xbmc/system/python/python24-arm.so"
 603  #endif
 604  #else /* !__x86_64__ && !__powerpc__ */
 605 -#if (defined HAVE_LIBPYTHON2_6)
 606 +#if (defined HAVE_LIBPYTHON2_7)
 607 +#define PYTHON_DLL "special://xbmcbin/system/python/python27-i486-linux.so"
 608 +#elif (defined HAVE_LIBPYTHON2_6)
 609  #define PYTHON_DLL "special://xbmcbin/system/python/python26-i486-linux.so"
 610  #elif (defined HAVE_LIBPYTHON2_5)
 611  #define PYTHON_DLL "special://xbmcbin/system/python/python25-i486-linux.so"
 612 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDll.cpp xbmc-10.0/xbmc/lib/libPython/XBPythonDll.cpp
 613 --- xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDll.cpp   2010-12-17 07:17:41.000000000 +0100
 614 +++ xbmc-10.0/xbmc/lib/libPython/XBPythonDll.cpp        2010-12-22 21:46:29.576000080 +0100
 615 @@ -23,7 +23,9 @@
 616    #include "config.h"
 617  #endif
 618  #if (defined USE_EXTERNAL_PYTHON)
 619 -  #if (defined HAVE_LIBPYTHON2_6)
 620 +  #if (defined HAVE_LIBPYTHON2_7)
 621 +    #include <python2.7/pyconfig.h>
 622 +  #elif (defined HAVE_LIBPYTHON2_6)
 623      #include <python2.6/pyconfig.h>
 624    #elif (defined HAVE_LIBPYTHON2_5)
 625      #include <python2.5/pyconfig.h>
 626 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDllFuncs.S xbmc-10.0/xbmc/lib/libPython/XBPythonDllFuncs.S
 627 --- xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDllFuncs.S        2010-12-17 07:17:41.000000000 +0100
 628 +++ xbmc-10.0/xbmc/lib/libPython/XBPythonDllFuncs.S     2010-12-22 21:46:29.576000080 +0100
 629 @@ -2,7 +2,9 @@
 630    #include "config.h"
 631  #endif
 632  #if (defined USE_EXTERNAL_PYTHON)
 633 -  #if (defined HAVE_LIBPYTHON2_6)
 634 +  #if (defined HAVE_LIBPYTHON2_7)
 635 +    #include <python2.7/pyconfig.h>
 636 +  #elif (defined HAVE_LIBPYTHON2_6)
 637      #include <python2.6/pyconfig.h>
 638    #elif (defined HAVE_LIBPYTHON2_5)
 639      #include <python2.5/pyconfig.h>
 640 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.cpp xbmc-10.0/xbmc/lib/libPython/XBPyThread.cpp
 641 --- xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.cpp    2010-12-17 07:17:41.000000000 +0100
 642 +++ xbmc-10.0/xbmc/lib/libPython/XBPyThread.cpp 2010-12-22 21:46:29.576000080 +0100
 643 @@ -24,7 +24,10 @@
 644    #include "config.h"
 645  #endif
 646  #if (defined USE_EXTERNAL_PYTHON)
 647 -  #if (defined HAVE_LIBPYTHON2_6)
 648 +  #if (defined HAVE_LIBPYTHON2_7)
 649 +    #include <python2.7/Python.h>
 650 +    #include <python2.7/osdefs.h>
 651 +  #elif (defined HAVE_LIBPYTHON2_6)
 652      #include <python2.6/Python.h>
 653      #include <python2.6/osdefs.h>
 654    #elif (defined HAVE_LIBPYTHON2_5)
 655 diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.h xbmc-10.0/xbmc/lib/libPython/XBPyThread.h
 656 --- xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.h      2010-12-17 07:17:41.000000000 +0100
 657 +++ xbmc-10.0/xbmc/lib/libPython/XBPyThread.h   2010-12-22 21:46:29.576000080 +0100
 658 @@ -26,7 +26,9 @@
 659    #include "config.h"
 660  #endif
 661  #if (defined USE_EXTERNAL_PYTHON)
 662 -  #if (defined HAVE_LIBPYTHON2_6)
 663 +  #if (defined HAVE_LIBPYTHON2_7)
 664 +    #include <python2.7/Python.h>
 665 +  #elif (defined HAVE_LIBPYTHON2_6)
 666      #include <python2.6/Python.h>
 667    #elif (defined HAVE_LIBPYTHON2_5)
 668      #include <python2.5/Python.h>