- enca befor patching CR infected file

Changed files:
    xbmc-python27.patch -> 1.4

diff --git a/xbmc-python27.patch b/xbmc-python27.patch
index 1054cf50963cef6478677694f090b4f18bdc490e..ed3e8136db503525d372bd2751cbfee5403933f1 100644 (file)
--- a/xbmc-python27.patch
+++ b/xbmc-python27.patch
@@ -1,6 +1,6 @@
 diff -urN xbmc-10.0.orig/configure.in xbmc-10.0/configure.in
 --- xbmc-10.0.orig/configure.in        2010-12-22 20:53:28.933000073 +0100
-+++ xbmc-10.0/configure.in     2010-12-22 21:09:50.212000081 +0100
++++ xbmc-10.0/configure.in     2010-12-22 21:46:29.535000096 +0100
 @@ -919,7 +919,11 @@
  
  # External Python
@@ -36,7 +36,7 @@ diff -urN xbmc-10.0.orig/configure.in xbmc-10.0/configure.in
  AC_SUBST(USE_PYTHON2_4)
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/linux/Makefile.in     2010-12-22 21:09:50.242000077 +0100
++++ xbmc-10.0/xbmc/lib/libPython/linux/Makefile.in     2010-12-22 21:46:29.566000076 +0100
 @@ -5,7 +5,10 @@
  SHELL=/bin/bash
  SYSDIR=../../../../system/python
@@ -51,7 +51,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/linux/Makefile.in xbmc-10.0/xbmc/lib
  else ifeq (@USE_PYTHON2_5@,1)
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/action.h   2010-12-22 21:09:50.242000077 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/action.h   2010-12-22 21:46:29.566000076 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -65,7 +65,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/action.h xbmc-10.0/xbmc/l
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp  2010-12-22 21:09:50.243000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp  2010-12-22 21:46:29.567000079 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -79,7 +79,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp xbmc-10
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp       2010-12-22 21:09:50.243000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp       2010-12-22 21:46:29.567000079 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -93,7 +93,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp xbmc
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp       2010-12-22 21:09:50.244000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp       2010-12-22 21:46:29.568000080 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -107,7 +107,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp xbmc
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp   2010-12-22 21:09:50.244000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp   2010-12-22 21:46:29.568000080 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -121,7 +121,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp xbmc-10.
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/control.h  2010-12-22 21:09:50.245000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/control.h  2010-12-22 21:46:29.569000080 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -135,7 +135,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/control.h xbmc-10.0/xbmc/
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlimage.cpp   2010-12-22 21:09:50.245000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlimage.cpp   2010-12-22 21:46:29.569000080 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -149,7 +149,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlimage.cpp xbmc-10.
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllabel.cpp   2010-12-22 21:09:50.246000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllabel.cpp   2010-12-22 21:46:29.570000079 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -163,7 +163,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllabel.cpp xbmc-10.
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllist.cpp    2010-12-22 21:09:50.247000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controllist.cpp    2010-12-22 21:46:29.571000077 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -177,7 +177,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controllist.cpp xbmc-10.0
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp        2010-12-22 21:09:50.247000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp        2010-12-22 21:46:29.572000076 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -191,7 +191,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp xbmc-
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp     2010-12-22 21:09:50.248000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp     2010-12-22 21:46:29.572000076 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -205,7 +205,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp xb
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlslider.cpp  2010-12-22 21:09:50.248000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlslider.cpp  2010-12-22 21:46:29.572000076 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -219,7 +219,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlslider.cpp xbmc-10
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlspin.cpp    2010-12-22 21:09:50.249000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controlspin.cpp    2010-12-22 21:46:29.572000076 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -233,7 +233,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controlspin.cpp xbmc-10.0
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp 2010-12-22 21:09:50.249000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp 2010-12-22 21:46:29.572000076 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -247,7 +247,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp xbmc-1
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.cpp 2010-12-22 21:09:50.250000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.cpp 2010-12-22 21:46:29.572000076 +0100
 @@ -24,7 +24,9 @@
  #endif
  #include "dialog.h"
@@ -261,7 +261,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.cpp xbmc-10.0/xbmc
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.h   2010-12-22 21:09:50.250000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/dialog.h   2010-12-22 21:46:29.573000077 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -275,7 +275,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/dialog.h xbmc-10.0/xbmc/l
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h  2010-12-22 21:09:50.251000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h  2010-12-22 21:46:29.573000077 +0100
 @@ -26,7 +26,9 @@
    #include "config.h"
  #endif
@@ -289,7 +289,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h xbmc-10
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagmusic.h     2010-12-22 21:09:50.251000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagmusic.h     2010-12-22 21:46:29.573000077 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -303,7 +303,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagmusic.h xbmc-10.0/
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagvideo.h     2010-12-22 21:09:50.251000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/infotagvideo.h     2010-12-22 21:46:29.573000077 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -317,7 +317,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/infotagvideo.h xbmc-10.0/
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/keyboard.h 2010-12-22 21:09:50.252000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/keyboard.h 2010-12-22 21:46:29.573000077 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -331,7 +331,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/keyboard.h xbmc-10.0/xbmc
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.cpp       2010-12-22 21:09:50.252000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.cpp       2010-12-22 21:46:29.573000077 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -345,7 +345,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.cpp xbmc-10.0/xb
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.h 2010-12-22 21:09:50.252000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/listitem.h 2010-12-22 21:46:29.573000077 +0100
 @@ -25,7 +25,9 @@
    #include "config.h"
  #endif
@@ -359,7 +359,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/listitem.h xbmc-10.0/xbmc
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/player.h   2010-12-22 21:09:50.252000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/player.h   2010-12-22 21:46:29.573000077 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -373,7 +373,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/player.h xbmc-10.0/xbmc/l
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp     2010-12-22 21:09:50.252000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp     2010-12-22 21:46:29.574000079 +0100
 @@ -26,7 +26,9 @@
  #include "Util.h"
  #include "pyplaylist.h"
@@ -387,7 +387,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp xbmc-10.0/
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.h       2010-12-22 21:09:50.252000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyplaylist.h       2010-12-22 21:46:29.574000079 +0100
 @@ -25,7 +25,9 @@
    #include "config.h"
  #endif
@@ -401,7 +401,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyplaylist.h xbmc-10.0/xb
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonAddon.h      2010-12-22 21:09:50.253000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonAddon.h      2010-12-22 21:46:29.574000079 +0100
 @@ -25,7 +25,9 @@
    #include "config.h"
  #endif
@@ -415,7 +415,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonAddon.h xbmc-10.0/x
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h     2010-12-22 21:09:50.253000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h     2010-12-22 21:46:29.574000079 +0100
 @@ -25,7 +25,9 @@
    #include "config.h"
  #endif
@@ -429,7 +429,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h xbmc-10.0/
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyutil.h   2010-12-22 21:09:50.253000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/pyutil.h   2010-12-22 21:46:29.574000079 +0100
 @@ -25,7 +25,9 @@
    #include "config.h"
  #endif
@@ -443,7 +443,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/pyutil.h xbmc-10.0/xbmc/l
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/window.h   2010-12-22 21:09:50.253000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/window.h   2010-12-22 21:46:29.574000079 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -457,7 +457,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/window.h xbmc-10.0/xbmc/l
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.cpp 2010-12-22 21:09:50.253000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.cpp 2010-12-22 21:46:29.574000079 +0100
 @@ -24,7 +24,9 @@
  #endif
  #include "winxml.h"
@@ -471,7 +471,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.cpp xbmc-10.0/xbmc
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp   2010-12-22 21:09:50.253000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp   2010-12-22 21:46:29.575000080 +0100
 @@ -24,7 +24,9 @@
  #endif
  #include "winxml.h"
@@ -485,7 +485,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp xbmc-10.
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.h   2010-12-22 21:09:50.253000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/winxml.h   2010-12-22 21:46:29.575000080 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -498,238 +498,22 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/winxml.h xbmc-10.0/xbmc/l
    #elif (defined HAVE_LIBPYTHON2_5)
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp        2010-12-22 21:16:16.284000079 +0100
-@@ -1,112 +1,114 @@
--/*
-- *      Copyright (C) 2005-2010 Team XBMC
-- *      http://www.xbmc.org
-- *
-- *  This Program is free software; you can redistribute it and/or modify
-- *  it under the terms of the GNU General Public License as published by
-- *  the Free Software Foundation; either version 2, or (at your option)
-- *  any later version.
-- *
-- *  This Program is distributed in the hope that it will be useful,
-- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-- *  GNU General Public License for more details.
-- *
-- *  You should have received a copy of the GNU General Public License
-- *  along with XBMC; see the file COPYING.  If not, write to
-- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-- *  http://www.gnu.org/copyleft/gpl.html
-- *
-- */
--
--#if (defined HAVE_CONFIG_H) && (!defined WIN32)
--  #include "config.h"
--#endif
--#if (defined USE_EXTERNAL_PYTHON)
--  #if (defined HAVE_LIBPYTHON2_6)
--    #include <python2.6/Python.h>
--  #elif (defined HAVE_LIBPYTHON2_5)
--    #include <python2.5/Python.h>
--  #elif (defined HAVE_LIBPYTHON2_4)
--    #include <python2.4/Python.h>
--  #else
--    #error "Could not determine version of Python to use."
--  #endif
--#else
--  #include "lib/libPython/Python/Include/Python.h"
--#endif
--
--#include "PythonAddon.h"
--#include "pyutil.h"
--
--#ifndef __GNUC__
--#pragma code_seg("PY_TEXT")
--#pragma data_seg("PY_DATA")
--#pragma bss_seg("PY_BSS")
--#pragma const_seg("PY_RDATA")
--#endif
--
--#if defined(__GNUG__) && (__GNUC__>4) || (__GNUC__==4 && __GNUC_MINOR__>=2)
--#pragma GCC diagnostic ignored "-Wstrict-aliasing"
--#endif
--
--#ifdef __cplusplus
--extern "C" {
--#endif
--
--namespace PYXBMC
--{
--  /*****************************************************************
--   * start of xbmcaddon methods
--   *****************************************************************/
--  // put module methods here
--
--
--  // define c functions to be used in python here
--  PyMethodDef xbmcAddonMethods[] = {
--    {NULL, NULL, 0, NULL}
--  };
--  /*****************************************************************
--   * end of methods and python objects
--   *****************************************************************/
--
--  PyMODINIT_FUNC
--  InitAddonTypes(void)
--  {
--    initAddon_Type();
--
--    if (PyType_Ready(&Addon_Type) < 0)
--      return;
--  }
--
--  PyMODINIT_FUNC
--  DeinitAddonModule(void)
--  {
--    // no need to Py_DECREF our objects (see InitAddonModule()) as they were created only
--    // so that they could be added to the module, which steals a reference.
--  }
--
--  PyMODINIT_FUNC
--  InitAddonModule(void)
--  {
--    Py_INCREF(&Addon_Type);
--
--    // init general xbmcaddon modules
--    PyObject* pXbmcAddonModule;
--    pXbmcAddonModule = Py_InitModule((char*)"xbmcaddon", xbmcAddonMethods);
--    if (pXbmcAddonModule == NULL) return;
--
--    PyModule_AddObject(pXbmcAddonModule, (char*)"Addon", (PyObject*)&Addon_Type);
--
--    // constants
--    PyModule_AddStringConstant(pXbmcAddonModule, (char*)"__author__", (char*)PY_XBMC_AUTHOR);
--    PyModule_AddStringConstant(pXbmcAddonModule, (char*)"__date__", (char*)"1 May 2010");
--    PyModule_AddStringConstant(pXbmcAddonModule, (char*)"__version__", (char*)"1.0");
--    PyModule_AddStringConstant(pXbmcAddonModule, (char*)"__credits__", (char*)PY_XBMC_CREDITS);
--    PyModule_AddStringConstant(pXbmcAddonModule, (char*)"__platform__", (char*)PY_XBMC_PLATFORM);
--  }
--}
--
--#ifdef __cplusplus
--}
--#endif
-+/*
-+ *      Copyright (C) 2005-2010 Team XBMC
-+ *      http://www.xbmc.org
-+ *
-+ *  This Program is free software; you can redistribute it and/or modify
-+ *  it under the terms of the GNU General Public License as published by
-+ *  the Free Software Foundation; either version 2, or (at your option)
-+ *  any later version.
-+ *
-+ *  This Program is distributed in the hope that it will be useful,
-+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ *  GNU General Public License for more details.
-+ *
-+ *  You should have received a copy of the GNU General Public License
-+ *  along with XBMC; see the file COPYING.  If not, write to
-+ *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
-+ *  http://www.gnu.org/copyleft/gpl.html
-+ *
-+ */
-+
-+#if (defined HAVE_CONFIG_H) && (!defined WIN32)
-+  #include "config.h"
-+#endif
-+#if (defined USE_EXTERNAL_PYTHON)
-+  #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>
-+  #elif (defined HAVE_LIBPYTHON2_4)
-+    #include <python2.4/Python.h>
-+  #else
-+    #error "Could not determine version of Python to use."
-+  #endif
-+#else
-+  #include "lib/libPython/Python/Include/Python.h"
-+#endif
-+
-+#include "PythonAddon.h"
-+#include "pyutil.h"
-+
-+#ifndef __GNUC__
-+#pragma code_seg("PY_TEXT")
-+#pragma data_seg("PY_DATA")
-+#pragma bss_seg("PY_BSS")
-+#pragma const_seg("PY_RDATA")
-+#endif
-+
-+#if defined(__GNUG__) && (__GNUC__>4) || (__GNUC__==4 && __GNUC_MINOR__>=2)
-+#pragma GCC diagnostic ignored "-Wstrict-aliasing"
-+#endif
-+
-+#ifdef __cplusplus
-+extern "C" {
-+#endif
-+
-+namespace PYXBMC
-+{
-+  /*****************************************************************
-+   * start of xbmcaddon methods
-+   *****************************************************************/
-+  // put module methods here
-+
-+
-+  // define c functions to be used in python here
-+  PyMethodDef xbmcAddonMethods[] = {
-+    {NULL, NULL, 0, NULL}
-+  };
-+  /*****************************************************************
-+   * end of methods and python objects
-+   *****************************************************************/
-+
-+  PyMODINIT_FUNC
-+  InitAddonTypes(void)
-+  {
-+    initAddon_Type();
-+
-+    if (PyType_Ready(&Addon_Type) < 0)
-+      return;
-+  }
-+
-+  PyMODINIT_FUNC
-+  DeinitAddonModule(void)
-+  {
-+    // no need to Py_DECREF our objects (see InitAddonModule()) as they were created only
-+    // so that they could be added to the module, which steals a reference.
-+  }
-+
-+  PyMODINIT_FUNC
-+  InitAddonModule(void)
-+  {
-+    Py_INCREF(&Addon_Type);
-+
-+    // init general xbmcaddon modules
-+    PyObject* pXbmcAddonModule;
-+    pXbmcAddonModule = Py_InitModule((char*)"xbmcaddon", xbmcAddonMethods);
-+    if (pXbmcAddonModule == NULL) return;
-+
-+    PyModule_AddObject(pXbmcAddonModule, (char*)"Addon", (PyObject*)&Addon_Type);
-+
-+    // constants
-+    PyModule_AddStringConstant(pXbmcAddonModule, (char*)"__author__", (char*)PY_XBMC_AUTHOR);
-+    PyModule_AddStringConstant(pXbmcAddonModule, (char*)"__date__", (char*)"1 May 2010");
-+    PyModule_AddStringConstant(pXbmcAddonModule, (char*)"__version__", (char*)"1.0");
-+    PyModule_AddStringConstant(pXbmcAddonModule, (char*)"__credits__", (char*)PY_XBMC_CREDITS);
-+    PyModule_AddStringConstant(pXbmcAddonModule, (char*)"__platform__", (char*)PY_XBMC_PLATFORM);
-+  }
-+}
-+
-+#ifdef __cplusplus
-+}
-+#endif
+--- xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp   2010-12-22 21:48:38.245000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp        2010-12-22 21:47:26.853999676 +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 -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp  2010-12-22 21:09:50.254000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp  2010-12-22 21:46:29.575000080 +0100
 @@ -23,7 +23,10 @@
    #include "config.h"
  #endif
@@ -744,7 +528,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp xbmc-10
    #elif (defined HAVE_LIBPYTHON2_5)
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp     2010-12-22 21:09:50.254000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp     2010-12-22 21:46:29.575000080 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -758,7 +542,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp xbmc-10.0/
      #include <python2.5/Python.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/XBPython.cpp  2010-12-22 21:09:50.254000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/XBPython.cpp  2010-12-22 21:46:29.576000080 +0100
 @@ -24,7 +24,9 @@
    #include "config.h"
  #endif
@@ -827,7 +611,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPython.cpp xbmc-10.0/xbmc/lib/libP
  #define PYTHON_DLL "special://xbmcbin/system/python/python25-i486-linux.so"
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/XBPythonDll.cpp       2010-12-22 21:09:50.254000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/XBPythonDll.cpp       2010-12-22 21:46:29.576000080 +0100
 @@ -23,7 +23,9 @@
    #include "config.h"
  #endif
@@ -841,7 +625,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDll.cpp xbmc-10.0/xbmc/lib/l
      #include <python2.5/pyconfig.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/XBPythonDllFuncs.S    2010-12-22 21:09:50.254000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/XBPythonDllFuncs.S    2010-12-22 21:46:29.576000080 +0100
 @@ -2,7 +2,9 @@
    #include "config.h"
  #endif
@@ -855,7 +639,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPythonDllFuncs.S xbmc-10.0/xbmc/li
      #include <python2.5/pyconfig.h>
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/XBPyThread.cpp        2010-12-22 21:09:50.254000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/XBPyThread.cpp        2010-12-22 21:46:29.576000080 +0100
 @@ -24,7 +24,10 @@
    #include "config.h"
  #endif
@@ -870,7 +654,7 @@ diff -urN xbmc-10.0.orig/xbmc/lib/libPython/XBPyThread.cpp xbmc-10.0/xbmc/lib/li
    #elif (defined HAVE_LIBPYTHON2_5)
 diff -urN 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-17 07:17:41.000000000 +0100
-+++ xbmc-10.0/xbmc/lib/libPython/XBPyThread.h  2010-12-22 21:09:50.255000078 +0100
++++ xbmc-10.0/xbmc/lib/libPython/XBPyThread.h  2010-12-22 21:46:29.576000080 +0100
 @@ -26,7 +26,9 @@
    #include "config.h"
  #endif