rpms/xbmc/F-12 xbmc-9.11-python2.7.patch, NONE, 1.1 xbmc.spec, 1.4, 1.5

Author: alexlan Update of /cvs/free/rpms/xbmc/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv2750 Modified Files: xbmc.spec Added Files: xbmc-9.11-python2.7.patch Log Message: Sync with devel/F-13. Fixes lirc daemon location etc. xbmc-9.11-python2.7.patch: configure.in | 12 ++++++++---- xbmc/lib/libPython/XBPyThread.cpp | 5 ++++- xbmc/lib/libPython/XBPyThread.h | 4 +++- xbmc/lib/libPython/XBPython.cpp | 4 +++- xbmc/lib/libPython/linux/Makefile.in | 5 ++++- xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h | 4 +++- xbmc/lib/libPython/xbmcmodule/PythonPlayer.h | 4 +++- xbmc/lib/libPython/xbmcmodule/PythonSettings.h | 4 +++- xbmc/lib/libPython/xbmcmodule/action.h | 4 +++- xbmc/lib/libPython/xbmcmodule/control.h | 4 +++- xbmc/lib/libPython/xbmcmodule/controlbutton.cpp | 4 +++- xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp | 4 +++- xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp | 4 +++- xbmc/lib/libPython/xbmcmodule/controlgroup.cpp | 4 +++- xbmc/lib/libPython/xbmcmodule/controlimage.cpp | 4 +++- xbmc/lib/libPython/xbmcmodule/controllabel.cpp | 4 +++- xbmc/lib/libPython/xbmcmodule/controllist.cpp | 4 +++- xbmc/lib/libPython/xbmcmodule/controlprogress.cpp | 4 +++- xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp | 4 +++- xbmc/lib/libPython/xbmcmodule/controlspin.cpp | 4 +++- xbmc/lib/libPython/xbmcmodule/controltextbox.cpp | 4 +++- xbmc/lib/libPython/xbmcmodule/dialog.cpp | 4 +++- xbmc/lib/libPython/xbmcmodule/dialog.h | 4 +++- xbmc/lib/libPython/xbmcmodule/infotagmusic.h | 4 +++- xbmc/lib/libPython/xbmcmodule/infotagvideo.h | 4 +++- xbmc/lib/libPython/xbmcmodule/keyboard.h | 4 +++- xbmc/lib/libPython/xbmcmodule/language.h | 4 +++- xbmc/lib/libPython/xbmcmodule/listitem.cpp | 4 +++- xbmc/lib/libPython/xbmcmodule/listitem.h | 4 +++- xbmc/lib/libPython/xbmcmodule/player.h | 4 +++- xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp | 4 +++- xbmc/lib/libPython/xbmcmodule/pyplaylist.h | 4 +++- xbmc/lib/libPython/xbmcmodule/pyutil.h | 4 +++- xbmc/lib/libPython/xbmcmodule/window.h | 4 +++- xbmc/lib/libPython/xbmcmodule/winxml.cpp | 4 +++- xbmc/lib/libPython/xbmcmodule/winxml.h | 4 +++- xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp | 4 +++- xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp | 5 ++++- xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp | 4 +++- 39 files changed, 125 insertions(+), 42 deletions(-) --- NEW FILE xbmc-9.11-python2.7.patch --- Index: xbmc/lib/libPython/linux/Makefile.in =================================================================== --- xbmc/lib/libPython/linux/Makefile.in.orig 2010-08-29 21:38:20.939294072 -0400 +++ xbmc/lib/libPython/linux/Makefile.in 2010-08-29 21:39:46.832294131 -0400 @@ -2,7 +2,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 ifeq (@USE_PYTHON2_6@,1) PYVERSION=python2.6 SO=python26-$(ARCH).so else ifeq (@USE_PYTHON2_5@,1) Index: xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/dialog.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/dialog.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/dialog.h (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp (working copy) @@ -23,7 +23,10 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/Python.h> + #include <python2.7/structmember.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/Python.h> #include <python2.6/structmember.h> #elif (defined HAVE_LIBPYTHON2_5) Index: xbmc/lib/libPython/xbmcmodule/keyboard.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/keyboard.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/keyboard.h (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/controllist.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controllist.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controllist.cpp (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/winxml.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/winxml.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/winxml.cpp (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/controllabel.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controllabel.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controllabel.cpp (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/action.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/action.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/action.h (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/controlimage.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlimage.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlimage.cpp (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/infotagvideo.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/infotagvideo.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/infotagvideo.h (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/control.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/control.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/control.h (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/controlgroup.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlgroup.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlgroup.cpp (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/infotagmusic.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/infotagmusic.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/infotagmusic.h (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/controltextbox.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controltextbox.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controltextbox.cpp (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/listitem.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/listitem.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/listitem.h (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/dialog.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/dialog.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/dialog.cpp (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/player.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/player.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/player.h (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/PythonPlayer.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/PythonPlayer.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/PythonPlayer.h (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/controlprogress.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlprogress.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlprogress.cpp (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/controlspin.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlspin.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlspin.cpp (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/controlbutton.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlbutton.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlbutton.cpp (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/window.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/window.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/window.h (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/pyplaylist.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/pyplaylist.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/pyplaylist.h (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/winxml.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/winxml.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/winxml.h (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/listitem.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/listitem.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/listitem.cpp (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/pyutil.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/pyutil.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/pyutil.h (working copy) @@ -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> Index: xbmc/lib/libPython/xbmcmodule/language.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/language.h.orig 2010-08-30 02:53:36.545418596 -0400 +++ xbmc/lib/libPython/xbmcmodule/language.h 2010-08-30 02:54:07.381668564 -0400 @@ -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> Index: xbmc/lib/libPython/xbmcmodule/PythonSettings.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/PythonSettings.h.orig 2010-08-30 03:02:55.131669137 -0400 +++ xbmc/lib/libPython/xbmcmodule/PythonSettings.h 2010-08-30 03:03:18.218294899 -0400 @@ -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> Index: xbmc/lib/libPython/XBPyThread.h =================================================================== --- xbmc/lib/libPython/XBPyThread.h (revision 32022) +++ xbmc/lib/libPython/XBPyThread.h (working copy) @@ -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> Index: xbmc/lib/libPython/XBPyThread.cpp =================================================================== --- xbmc/lib/libPython/XBPyThread.cpp (revision 32022) +++ xbmc/lib/libPython/XBPyThread.cpp (working copy) @@ -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) Index: xbmc/lib/libPython/XBPython.cpp =================================================================== --- xbmc/lib/libPython/XBPython.cpp (revision 32022) +++ xbmc/lib/libPython/XBPython.cpp (working copy) @@ -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> Index: configure.in =================================================================== --- configure.in (revision 32022) +++ configure.in (working copy) @@ -636,18 +636,21 @@ # External Python if test "$use_external_libraries" = "yes" || test "$use_external_python" = "yes"; then - AC_CHECK_LIB([python2.6], [main],, + AC_CHECK_LIB([python2.7], [main],, + [AC_CHECK_LIB([python2.6], [main],, [AC_CHECK_LIB([python2.5], [main],, [AC_CHECK_LIB([python2.4], [main],, - [AC_MSG_ERROR($missing_library)] )] )] ) + [AC_MSG_ERROR($missing_library)] )] )] )] ) # Test again, but this time just set some variables we need in Makefiles - AC_CHECK_LIB([python2.6], [main],[USE_PYTHON2_6=1], + AC_CHECK_LIB([python2.7], [main],[USE_PYTHON2_7=1], + [AC_CHECK_LIB([python2.6], [main],[USE_PYTHON2_6=1], [AC_CHECK_LIB([python2.5], [main],[USE_PYTHON2_5=1], [AC_CHECK_LIB([python2.4], [main],[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]) @@ -1032,6 +1035,7 @@ AC_SUBST(USE_EXTERNAL_LIBOGG) 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) Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/F-12/xbmc.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- xbmc.spec 25 Aug 2010 07:30:31 -0000 1.4 +++ xbmc.spec 1 Sep 2010 03:49:44 -0000 1.5 @@ -1,6 +1,6 @@ Name: xbmc Version: 9.11 -Release: 19%{?dist} +Release: 21%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{version}-patched.tar.xz @@ -69,6 +69,9 @@ # an attempt to force hdhomerun to be external Patch26: xbmc-9.11-hdhomerun.patch +# search for Python 2.7 as well +Patch27: xbmc-9.11-python2.7.patch + ExcludeArch: ppc64 Buildroot: %{_tmppath}/%{name}-%{version} Summary: Media center @@ -177,6 +180,7 @@ %patch24 -p1 %patch25 -p1 %patch26 -p1 -b .hdhomerun +%patch27 -p0 # Prevent rerunning the autotools. touch -r xbmc/screensavers/rsxs-0.9/aclocal.m4 \ @@ -197,8 +201,8 @@ --disable-webserver \ SVN_REV=26017 \ CPPFLAGS="-I/usr/include/ffmpeg" \ -CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg" \ -CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg" \ +CFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \ +CXXFLAGS="$RPM_OPT_FLAGS -fPIC -I/usr/include/ffmpeg -D__STDC_CONSTANT_MACROS" \ LDFLAGS="-fPIC" \ LIBS="-L%{_libdir}/mysql -lhdhomerun $LIBS" \ ASFLAGS=-fPIC @@ -238,6 +242,14 @@ %{_datadir}/pixmaps/xbmc.png %changelog +* Mon Aug 30 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-21 +- Fix python 2.7 patch + +* Sun Aug 29 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-20 +- Add -D__STDC_CONSTANT_MACROS for building with ffmpeg > 0.6 + as per: http://forum.xbmc.org/showthread.php?t=75800 +- Add patch for Python 2.7 + * Wed Aug 25 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-19 - Default to using /var/run/lirc/lircd (#1325)