Author: alexlan Update of /cvs/free/rpms/xbmc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv449 Modified Files: .cvsignore sources xbmc-10-python2.7.patch xbmc-generate-tarball-xz.sh xbmc.spec Log Message: - Rebase to Dharma rc2 (SVN r35567) - Update Python 2.7 patch, to fix DLL search patch problems (#1532). Thanks to Richard Guest for patch. Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 20 Nov 2010 00:38:43 -0000 1.7 +++ .cvsignore 12 Dec 2010 20:48:28 -0000 1.8 @@ -1 +1 @@ -xbmc-Dharma_rc1-patched.tar.xz +xbmc-Dharma_rc2-patched.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/sources,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- sources 20 Nov 2010 00:38:43 -0000 1.7 +++ sources 12 Dec 2010 20:48:28 -0000 1.8 @@ -1 +1 @@ -d0102d9f22dbbd9a6bb3b1386f00f971 xbmc-Dharma_rc1-patched.tar.xz +70c07e24b2924a57b7ab0075a2d0f245 xbmc-Dharma_rc2-patched.tar.xz xbmc-10-python2.7.patch: configure.in | 10 ++++++- xbmc/lib/libPython/XBPyThread.cpp | 5 +++ xbmc/lib/libPython/XBPyThread.h | 4 ++- xbmc/lib/libPython/XBPython.cpp | 24 ++++++++++++++----- xbmc/lib/libPython/XBPythonDll.cpp | 4 ++- xbmc/lib/libPython/XBPythonDllFuncs.S | 4 ++- xbmc/lib/libPython/linux/Makefile.in | 5 +++ xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h | 4 ++- xbmc/lib/libPython/xbmcmodule/PythonAddon.h | 4 ++- xbmc/lib/libPython/xbmcmodule/PythonPlayer.h | 4 ++- xbmc/lib/libPython/xbmcmodule/action.h | 4 ++- xbmc/lib/libPython/xbmcmodule/control.h | 4 ++- xbmc/lib/libPython/xbmcmodule/controlbutton.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlgroup.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlimage.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controllabel.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controllist.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlprogress.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlslider.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controlspin.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/controltextbox.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/dialog.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/dialog.h | 4 ++- xbmc/lib/libPython/xbmcmodule/infotagmusic.h | 4 ++- xbmc/lib/libPython/xbmcmodule/infotagvideo.h | 4 ++- xbmc/lib/libPython/xbmcmodule/keyboard.h | 4 ++- xbmc/lib/libPython/xbmcmodule/listitem.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/listitem.h | 4 ++- xbmc/lib/libPython/xbmcmodule/player.h | 4 ++- xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/pyplaylist.h | 4 ++- xbmc/lib/libPython/xbmcmodule/pyutil.h | 4 ++- xbmc/lib/libPython/xbmcmodule/window.h | 4 ++- xbmc/lib/libPython/xbmcmodule/winxml.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/winxml.h | 4 ++- xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp | 4 ++- xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp | 5 +++ xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp | 4 ++- 42 files changed, 149 insertions(+), 48 deletions(-) Index: xbmc-10-python2.7.patch =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc-10-python2.7.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xbmc-10-python2.7.patch 2 Sep 2010 03:17:55 -0000 1.1 +++ xbmc-10-python2.7.patch 12 Dec 2010 20:48:28 -0000 1.2 @@ -616,6 +616,61 @@ #include <python2.6/Python.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/Python.h> +@@ -63,7 +63,9 @@ + #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86-osx.so" + #endif + #elif defined(__x86_64__) +-#if (defined HAVE_LIBPYTHON2_6) ++#if (defined HAVE_LIBPYTHON2_7) ++#define PYTHON_DLL "special://xbmcbin/system/python/python27-x86_64-linux.so" ++#elif (defined HAVE_LIBPYTHON2_6) + #define PYTHON_DLL "special://xbmcbin/system/python/python26-x86_64-linux.so" + #elif (defined HAVE_LIBPYTHON2_5) + #define PYTHON_DLL "special://xbmcbin/system/python/python25-x86_64-linux.so" +@@ -71,7 +73,9 @@ + #define PYTHON_DLL "special://xbmcbin/system/python/python24-x86_64-linux.so" + #endif + #elif defined(_POWERPC) +-#if (defined HAVE_LIBPYTHON2_6) ++#if (defined HAVE_LIBPYTHON2_7) ++#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc-linux.so" ++#elif (defined HAVE_LIBPYTHON2_6) + #define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc-linux.so" + #elif (defined HAVE_LIBPYTHON2_5) + #define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc-linux.so" +@@ -79,7 +83,9 @@ + #define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc-linux.so" + #endif + #elif defined(_POWERPC64) +-#if (defined HAVE_LIBPYTHON2_6) ++#if (defined HAVE_LIBPYTHON2_7) ++#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc64-linux.so" ++#elif (defined HAVE_LIBPYTHON2_6) + #define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc64-linux.so" + #elif (defined HAVE_LIBPYTHON2_5) + #define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc64-linux.so" +@@ -87,7 +93,9 @@ + #define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc64-linux.so" + #endif + #elif defined(_ARMEL) +-#if (defined HAVE_LIBPYTHON2_6) ++#if (defined HAVE_LIBPYTHON2_7) ++#define PYTHON_DLL "special://xbmc/system/python/python27-arm.so" ++#elif (defined HAVE_LIBPYTHON2_6) + #define PYTHON_DLL "special://xbmc/system/python/python26-arm.so" + #elif (defined HAVE_LIBPYTHON2_5) + #define PYTHON_DLL "special://xbmc/system/python/python25-arm.so" +@@ -95,7 +103,9 @@ + #define PYTHON_DLL "special://xbmc/system/python/python24-arm.so" + #endif + #else /* !__x86_64__ && !__powerpc__ */ +-#if (defined HAVE_LIBPYTHON2_6) ++#if (defined HAVE_LIBPYTHON2_7) ++#define PYTHON_DLL "special://xbmcbin/system/python/python27-i486-linux.so" ++#elif (defined HAVE_LIBPYTHON2_6) + #define PYTHON_DLL "special://xbmcbin/system/python/python26-i486-linux.so" + #elif (defined HAVE_LIBPYTHON2_5) + #define PYTHON_DLL "special://xbmcbin/system/python/python25-i486-linux.so" Index: configure.in =================================================================== --- configure.in (revision 32022) Index: xbmc-generate-tarball-xz.sh =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc-generate-tarball-xz.sh,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- xbmc-generate-tarball-xz.sh 20 Nov 2010 00:38:43 -0000 1.6 +++ xbmc-generate-tarball-xz.sh 12 Dec 2010 20:48:28 -0000 1.7 @@ -9,12 +9,12 @@ #SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk # use SVN version number passed from script, or otherwise use default -SVNVERSION=${1-35326} +SVNVERSION=${1-35567} # uncomment following if you want to always pull from tip of branch # SVNVERSION=$(svn info $SVNURL |grep "Revision:"|cut -d' ' -f2) #VERSION=$MAJORVERSION-$SVNVERSION -VERSION=Dharma_rc1 +VERSION=Dharma_rc2 # remove existing checkout rm -r xbmc-$VERSION Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- xbmc.spec 21 Nov 2010 21:12:41 -0000 1.21 +++ xbmc.spec 12 Dec 2010 20:48:28 -0000 1.22 @@ -1,12 +1,12 @@ -%global SVNVERSION 35326 -%global PRERELEASE Dharma_rc1 +%global SVNVERSION 35567 +%global PRERELEASE Dharma_rc2 # use below for SVN snapshot #global DIRVERSION %{version}-%{SVNVERSION} %global DIRVERSION %{PRERELEASE} Name: xbmc Version: 10.0 -Release: 0.22.%{PRERELEASE}%{?dist} +Release: 0.23.%{PRERELEASE}%{?dist} URL: http://www.xbmc.org/ Source0: %{name}-%{DIRVERSION}-patched.tar.xz @@ -212,6 +212,11 @@ %{_datadir}/icons/hicolor/*/*/*.png %changelog +* Sun Dec 12 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.0-0.23.Dharma_rc2 +- Rebase to Dharma rc2 (SVN r35567) +- Update Python 2.7 patch, to fix DLL search patch problems (#1532). Thanks to + Richard Guest for patch. + * Sun Nov 21 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.0-0.22.Dharma_rc1 - Need explicit requires for librtmp and libbluray: loaded dynamically via XBMC's DLL mechanism which is missed by autodeps