Author: alexlan Update of /cvs/free/rpms/xbmc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv19453 Modified Files: .cvsignore sources xbmc-generate-tarball-xz.sh xbmc.spec Added Files: xbmc-10-Makefile.patch xbmc-10-bootstrap.patch xbmc-10-disable-zlib-in-cximage.patch xbmc-10-dvdread.patch xbmc-10-hdhomerun.patch xbmc-10-python2.7.patch Removed Files: xbmc-9.11-Makefile.include.in.diff xbmc-9.11-RandomNumberGenerators.hpp.diff xbmc-9.11-Weather.diff xbmc-9.11-XBMCProjectM-cmake.diff xbmc-9.11-b1-dvdlibs-external.patch xbmc-9.11-cflags.patch xbmc-9.11-changeset-26191.diff xbmc-9.11-configure.patch xbmc-9.11-external-zlib.diff xbmc-9.11-fix-Makefile.in.patch xbmc-9.11-goom-missing.diff xbmc-9.11-gymcodec.patch xbmc-9.11-hdhomerun.patch xbmc-9.11-libdca.patch xbmc-9.11-libid3tag.patch xbmc-9.11-librtv.patch xbmc-9.11-macdll.patch xbmc-9.11-maclib.patch xbmc-9.11-python2.7.patch xbmc-9.11-remlibass.patch xbmc-9.11-remove-goahead.patch xbmc-9.11-rsxs-0.9.diff xbmc-9.11-spyce.diff xbmc-9.11-swscale.diff xbmc-9.11-use_cdio_system_headers_on_non_win32.patch xbmc-9.11-xbmc.sh.diff xbmc-9.11-xext.diff Log Message: Rebase to Dharma beta1, sync with specs in http://fedorapeople.org/gitweb?p=alexlan/public_git/xbmc-rpm.git;a=summary xbmc-10-Makefile.patch: Makefile.in | 3 --- 1 file changed, 3 deletions(-) --- NEW FILE xbmc-10-Makefile.patch --- --- Makefile.in.orig 2010-08-20 00:24:13.000000000 -0400 +++ Makefile.in 2010-08-20 00:25:20.956267798 -0400 @@ -518,7 +518,6 @@ endif install-arch: - @# Arch dependent files @find system addons -regextype posix-extended -type f -not -iregex ".*svn.*|.*script\.module\..*" -iregex ".*$(ARCH).*|.*\.vis|.*\.xbs|.*python.*\.zip" -exec install -D "{}" $(DESTDIR)$(libdir)/xbmc/"{}" \; -printf " -- %-75.75f\r" @cp -r addons/script.module.pil $(DESTDIR)$(libdir)/xbmc/addons/ @cp -r addons/script.module.pysqlite $(DESTDIR)$(libdir)/xbmc/addons/ @@ -535,9 +534,7 @@ install -D -m 0644 "$$FILE" "$(DESTDIR)$(docdir)/$$FILE"; done @echo "Done!" @echo "Copying system files to $(DESTDIR)$(datarootdir)/xbmc" - @# Arch independent files @find addons language media sounds userdata system -regextype posix-extended -type f -not -iregex ".*script\.module\..*|.*$(ARCH).*|.*\.vis|.*\.xbs|.*svn.*|.*\.so|.*\.dll|.*\.pyd|.*python.*\.zip" -exec install -D -m 0644 "{}" $(DESTDIR)$(datarootdir)/xbmc/"{}" \; -printf " -- %-75.75f\r" - @# Icons and links @mkdir -p $(DESTDIR)$(datarootdir)/applications @cp -a tools/Linux/xbmc.desktop $(DESTDIR)$(datarootdir)/applications/ @install -D -m 0644 tools/Linux/xbmc-48x48.png $(DESTDIR)$(datadir)/icons/hicolor/48x48/apps/xbmc.png xbmc-10-bootstrap.patch: bootstrap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- NEW FILE xbmc-10-bootstrap.patch --- --- bootstrap.orig 2010-07-19 01:01:26.405392464 -0400 +++ bootstrap 2010-07-19 01:02:03.122518706 -0400 @@ -10,7 +10,8 @@ # order matters with libbdnav and friends [ -d xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss ] && \ autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss -autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread +[ -d xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread ] && \ + autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread autoreconf -vif xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav # Clean the generated files xbmc-10-disable-zlib-in-cximage.patch: configure.in | 8 -------- 1 file changed, 8 deletions(-) --- NEW FILE xbmc-10-disable-zlib-in-cximage.patch --- --- configure.in.orig 2010-08-20 00:17:55.000000000 -0400 +++ configure.in 2010-08-20 00:19:27.621394427 -0400 @@ -1736,14 +1736,6 @@ fi ], [$HOST_NOT_APPLE]) -XB_CONFIG_MODULE([xbmc/lib/cximage-6.0/zlib], [ - if test "$host_vendor" = "apple" ; then - export MACOSX_DEPLOYMENT_TARGET=10.4 - CFLAGS="$CFLAGS -fno-common" \ - ./configure - fi -], [0]) - XB_CONFIG_MODULE([lib/libass], [ if test "$host_vendor" = "apple" ; then CFLAGS="$CFLAGS -fno-common" \ xbmc-10-dvdread.patch: configure.in | 32 ------------------------- xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in | 13 ++++------ 2 files changed, 7 insertions(+), 38 deletions(-) --- NEW FILE xbmc-10-dvdread.patch --- --- configure.in.orig 2010-07-28 09:27:12.000000000 -0400 +++ configure.in 2010-07-29 01:45:59.523143299 -0400 @@ -1663,34 +1663,6 @@ fi ], [$SKIP_CONFIG_DVDCSS]) -XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread], [ - if test "$host_vendor" = "apple" ; then - ./configure2 MACOSX_DEPLOYMENT_TARGET=10.4 \ - --extra-cflags="$CFLAGS -fno-common $DVDREAD_CFLAGS -D__DARWIN__ -I`pwd`/../libdvdcss/src" \ - --enable-static \ - --disable-shared \ - --cc="$CC" && - make dvdread-config && - mkdir -p `pwd`/../includes/dvdread - cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread - else - ./configure2 \ - --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src" \ - --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \ - --host=$host_alias \ - --build=$build_alias \ - --target=$target_alias \ - --enable-static \ - --disable-shared \ - --disable-strip \ - --disable-opts \ - --cc="$CC" && - make dvdread-config && - mkdir -p `pwd`/../includes/dvdread - cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread - fi - -], [0]) XB_CONFIG_MODULE([xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav], [ if test "$host_vendor" = "apple" ; then @@ -1703,9 +1675,7 @@ --cc="$CC" else ./configure2 \ - --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes" \ - --extra-ldflags="-L`pwd`/../libdvdread/obj" \ - --with-dvdread-config="`pwd`/../libdvdread/obj/dvdread-config" \ + --extra-cflags="-D_XBMC -fPIC -DPIC" \ --host=$host_alias \ --build=$build_alias \ --target=$target_alias \ --- xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in.orig 2010-07-19 01:28:37.716268195 -0400 +++ xbmc/cores/dvdplayer/Codecs/libdvd/Makefile.in 2010-07-19 01:31:10.453143936 -0400 @@ -2,13 +2,12 @@ ARCH=@ARCH@ SYSDIR=../../../../../system/players/dvdplayer SOS= libdvdnav-$(ARCH).so -DIRS= libdvdread \ - libdvdnav +DIRS= libdvdnav WRAPPER=../../../DllLoader/exports/wrapper.o WRAPPER_OSX=../../../../../tools/Mach5/wrapper.rb -LDFLAGS += -shared -fPIC -rdynamic +LDFLAGS += -shared -fPIC -rdynamic -ldvdread ifeq ($(ARCH), powerpc-osx) # Add -lbundle1.o for powerpc-osx BUNDLE1_O = -lbundle1.o @@ -41,9 +40,9 @@ libdvdcss/src/*.o $(BUNDLE1_O) $(WRAPPER_OSX) $@;mv output.so $@ -$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER_OSX) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a +$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER_OSX) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a ld -bundle -flat_namespace -undefined suppress -o $@ \ - $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o $(BUNDLE1_O) + $(DVDCSS_O) libdvdnav/obj/*.o $(BUNDLE1_O) $(WRAPPER_OSX) $@;mv output.so $@ else @@ -52,8 +52,8 @@ libdvdcss/src/*.o \ `cat $(WRAPPER:.o=.def)` $(WRAPPER) -$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a - $(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o \ +$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A) libdvdnav/obj/libdvdnav.a + $(CC) -o $@ $(LDFLAGS) --soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o \ `cat $(WRAPPER:.o=.def)` $(WRAPPER) endif xbmc-10-hdhomerun.patch: Makefile.in | 7 +-- configure.in | 1 xbmc/FileSystem/HDHomeRun.h | 78 +++++++++++++++++++++++++++++--------------- 3 files changed, 54 insertions(+), 32 deletions(-) --- NEW FILE xbmc-10-hdhomerun.patch --- --- xbmc-10/Makefile.in.orig 2010-07-19 02:04:32.002268864 -0400 +++ xbmc-10/Makefile.in 2010-07-19 02:06:30.185143439 -0400 @@ -94,7 +94,6 @@ LIB_DIRS=\ xbmc/lib/cximage-6.0 \ xbmc/lib/libexif \ - xbmc/lib/libhdhomerun \ xbmc/lib/libid3tag \ xbmc/lib/libapetag \ xbmc/lib/libPython/linux \ @@ -340,8 +339,6 @@ endif libexif: dllloader $(MAKE) -C xbmc/lib/libexif -libhdhomerun: dllloader - $(MAKE) -C xbmc/lib/libhdhomerun libid3tag: dllloader $(MAKE) -C xbmc/lib/libid3tag papcodecs: dllloader dvdpcodecs @@ -371,9 +368,9 @@ codecs: papcodecs dvdpcodecs ifeq ($(findstring osx,$(ARCH)), osx) -libs: libhdhomerun libid3tag imagelib libexif python system/libcpluff-$(ARCH).so system/players/paplayer/libmodplug-$(ARCH).so +libs: libid3tag imagelib libexif python system/libcpluff-$(ARCH).so system/players/paplayer/libmodplug-$(ARCH).so else -libs: libhdhomerun libid3tag imagelib libexif python system/libcpluff-$(ARCH).so +libs: libid3tag imagelib libexif python system/libcpluff-$(ARCH).so endif externals: codecs libs python visualizations screensavers --- xbmc-10/xbmc/FileSystem/HDHomeRun.h.orig 2010-01-31 20:58:58.000000000 -0500 +++ xbmc-10/xbmc/FileSystem/HDHomeRun.h 2010-07-19 02:17:38.913394783 -0400 @@ -22,7 +22,7 @@ #include "IDirectory.h" #include "DynamicDll.h" -#include "lib/libhdhomerun/hdhomerun.h" +#include <hdhomerun/hdhomerun.h> #include "FileSystem/IFile.h" class DllHdHomeRunInterface @@ -44,31 +44,57 @@ class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface { - DECLARE_DLL_WRAPPER(DllHdHomeRun, DLL_PATH_LIBHDHOMERUN) - DEFINE_METHOD5(int, discover_find_devices_custom, (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5)) - DEFINE_METHOD2(struct hdhomerun_device_t*, device_create_from_str, (const char* p1, struct hdhomerun_debug_t *p2)) - DEFINE_METHOD1(void, device_destroy, (struct hdhomerun_device_t* p1)) - DEFINE_METHOD1(int, device_stream_start, (struct hdhomerun_device_t* p1)) - DEFINE_METHOD3(uint8_t*, device_stream_recv, (struct hdhomerun_device_t* p1, unsigned int p2, unsigned int* p3)) - DEFINE_METHOD1(void, device_stream_stop, (struct hdhomerun_device_t* p1)) - DEFINE_METHOD2(int, device_set_tuner_channel, (struct hdhomerun_device_t *p1, const char *p2)) - DEFINE_METHOD2(int, device_set_tuner_program, (struct hdhomerun_device_t *p1, const char *p2)) - DEFINE_METHOD2(int, device_set_tuner_from_str, (struct hdhomerun_device_t *p1, const char *p2)) - DEFINE_METHOD2(void, device_set_tuner, (struct hdhomerun_device_t *p1, unsigned int p2)) - DEFINE_METHOD3(int, device_get_tuner_status, (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3)); - BEGIN_METHOD_RESOLVE() - RESOLVE_METHOD_RENAME(hdhomerun_discover_find_devices_custom, discover_find_devices_custom) - RESOLVE_METHOD_RENAME(hdhomerun_device_create_from_str, device_create_from_str) - RESOLVE_METHOD_RENAME(hdhomerun_device_destroy, device_destroy) - RESOLVE_METHOD_RENAME(hdhomerun_device_stream_start, device_stream_start) - RESOLVE_METHOD_RENAME(hdhomerun_device_stream_recv, device_stream_recv) - RESOLVE_METHOD_RENAME(hdhomerun_device_stream_stop, device_stream_stop) - RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_channel, device_set_tuner_channel) - RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_program, device_set_tuner_program) - RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_from_str, device_set_tuner_from_str) - RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner, device_set_tuner) - RESOLVE_METHOD_RENAME(hdhomerun_device_get_tuner_status, device_get_tuner_status) - END_METHOD_RESOLVE() +public: + virtual ~DllHdHomeRun () {}; + + virtual int discover_find_devices_custom (uint32_t p1, uint32_t p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5) + { return ::hdhomerun_discover_find_devices_custom (p1, p2, p3, p4, p5); } + + virtual struct hdhomerun_device_t *device_create_from_str (const char* p1, struct hdhomerun_debug_t *p2) + { return ::hdhomerun_device_create_from_str (p1, p2); } + + virtual void device_destroy (struct hdhomerun_device_t* p1) + { ::hdhomerun_device_destroy (p1); } + + virtual int device_stream_start (struct hdhomerun_device_t* p1) + { return ::hdhomerun_device_stream_start (p1); } + + + virtual uint8_t *device_stream_recv (struct hdhomerun_device_t* p1, unsigned int p2, unsigned int* p3) + { + uint8_t *retval; + + size_t tmp = *p3; + retval = ::hdhomerun_device_stream_recv (p1, p2, &tmp); + *p3 = tmp; + + return retval; + } + + virtual void device_stream_stop (struct hdhomerun_device_t* p1) + { ::hdhomerun_device_stream_stop (p1); } + + virtual int device_set_tuner_channel (struct hdhomerun_device_t *p1, const char *p2) + { return ::hdhomerun_device_set_tuner_channel (p1, p2); } + + virtual int device_set_tuner_program (struct hdhomerun_device_t *p1, const char *p2) + { return ::hdhomerun_device_set_tuner_program (p1, p2); } + + + virtual int device_set_tuner_from_str (struct hdhomerun_device_t *p1, const char *p2) + { return ::hdhomerun_device_set_tuner_from_str (p1, p2); } + + + virtual void device_set_tuner (struct hdhomerun_device_t *p1, unsigned int p2) + { ::hdhomerun_device_set_tuner (p1, p2); } + + virtual int device_get_tuner_status (struct hdhomerun_device_t *p1, char **p2, struct hdhomerun_tuner_status_t *p3) + { return ::hdhomerun_device_get_tuner_status (p1, p2, p3); } + + // DLL faking. + virtual bool ResolveExports() { return true; } + virtual bool Load() { return true; } + virtual void Unload() {} }; namespace XFILE --- xbmc-10/configure.in.orig 2010-07-19 02:11:59.114393341 -0400 +++ xbmc-10/configure.in 2010-07-19 02:12:07.951143138 -0400 @@ -1348,7 +1348,6 @@ xbmc/lib/libRTV/Makefile \ xbmc/lib/libexif/Makefile \ xbmc/lib/libXDAAP/Makefile \ - xbmc/lib/libhdhomerun/Makefile \ xbmc/lib/libhttpapi/Makefile \ lib/jsoncpp/jsoncpp/src/lib_json/Makefile \ xbmc/lib/libjsonrpc/Makefile \ 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 | 4 +++- 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, 134 insertions(+), 43 deletions(-) --- NEW FILE xbmc-10-python2.7.patch --- Index: xbmc/lib/libPython/linux/Makefile.in =================================================================== --- xbmc/lib/libPython/linux/Makefile.in (revision 32022) +++ xbmc/lib/libPython/linux/Makefile.in (working copy) @@ -5,7 +5,10 @@ SHELL=/bin/bash SYSDIR=../../../../system/python -ifeq (@USE_PYTHON2_6@,1) +ifeq (@USE_PYTHON2_7@,1) + PYVERSION=python2.7 + SO=python27-$(ARCH).so +else 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/xbmcaddonmodule.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.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/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/controlslider.cpp =================================================================== --- xbmc/lib/libPython/xbmcmodule/controlslider.cpp (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/controlslider.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/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/PythonAddon.h =================================================================== --- xbmc/lib/libPython/xbmcmodule/PythonAddon.h (revision 32022) +++ xbmc/lib/libPython/xbmcmodule/PythonAddon.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/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/XBPythonDllFuncs.S =================================================================== --- xbmc/lib/libPython/XBPythonDllFuncs.S (revision 32022) +++ xbmc/lib/libPython/XBPythonDllFuncs.S (working copy) @@ -2,7 +2,9 @@ #include "config.h" #endif #if (defined USE_EXTERNAL_PYTHON) - #if (defined HAVE_LIBPYTHON2_6) + #if (defined HAVE_LIBPYTHON2_7) + #include <python2.7/pyconfig.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/pyconfig.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/pyconfig.h> Index: xbmc/lib/libPython/XBPythonDll.cpp =================================================================== --- xbmc/lib/libPython/XBPythonDll.cpp (revision 32022) +++ xbmc/lib/libPython/XBPythonDll.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/pyconfig.h> + #elif (defined HAVE_LIBPYTHON2_6) #include <python2.6/pyconfig.h> #elif (defined HAVE_LIBPYTHON2_5) #include <python2.5/pyconfig.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) @@ -835,7 +835,11 @@ # External Python if test "$use_external_python" = "yes"; then - AC_CHECK_LIB([python2.6], [main], + AC_CHECK_LIB([python2.7], [main], + [AC_DEFINE([HAVE_LIBPYTHON2_7], [1], + [Define to 1 if you have the 'python2.7' library.]) + USE_PYTHON2_7=1], + [AC_CHECK_LIB([python2.6], [main], [AC_DEFINE([HAVE_LIBPYTHON2_6], [1], [Define to 1 if you have the 'python2.6' library.]) USE_PYTHON2_6=1], @@ -847,9 +851,10 @@ [AC_DEFINE([HAVE_LIBPYTHON2_4], [1], [Define to 1 if you have the 'python2.4' library.]) USE_PYTHON2_4=1], - [AC_MSG_ERROR($missing_library)] )] )] ) + [AC_MSG_ERROR($missing_library)] )] )] )] ) AC_MSG_NOTICE($external_python_enabled) + test "$USE_PYTHON2_7" && AC_MSG_NOTICE([Using Python 2.7]) test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6]) test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5]) test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4]) @@ -1429,6 +1434,7 @@ AC_SUBST(USE_EXTERNAL_LIBMPEG2) AC_SUBST(USE_EXTERNAL_LIBWAVPACK) AC_SUBST(USE_EXTERNAL_PYTHON) +AC_SUBST(USE_PYTHON2_7) AC_SUBST(USE_PYTHON2_6) AC_SUBST(USE_PYTHON2_5) AC_SUBST(USE_PYTHON2_4) Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/.cvsignore,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- .cvsignore 26 Mar 2010 23:39:00 -0000 1.2 +++ .cvsignore 2 Sep 2010 03:17:55 -0000 1.3 @@ -1 +1 @@ -xbmc-9.11-patched.tar.xz +xbmc-Dharma_beta1-patched.tar.xz Index: sources =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/sources,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sources 26 Mar 2010 23:39:00 -0000 1.2 +++ sources 2 Sep 2010 03:17:55 -0000 1.3 @@ -1 +1 @@ -c8c54a8839b289a97140f7f41acfedc4 xbmc-9.11-patched.tar.xz +1e987ff1c5baac9d79cece45bf7c2699 xbmc-Dharma_beta1-patched.tar.xz Index: xbmc-generate-tarball-xz.sh =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc-generate-tarball-xz.sh,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xbmc-generate-tarball-xz.sh 26 Mar 2010 23:39:00 -0000 1.1 +++ xbmc-generate-tarball-xz.sh 2 Sep 2010 03:17:55 -0000 1.2 @@ -1,14 +1,38 @@ #!/bin/sh -VERSION=${1-9.11} +MAJORVERSION=10.9 +# pull from Dharma branch +SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma + +# uncomment this to switch to trunk +#SVNURL=https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk + +# use SVN version number passed from script, or otherwise use default +SVNVERSION=${1-33324} +# 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_beta1 + +# remove existing checkout +rm -r xbmc-$VERSION + +#svn export -r $SVNVERSION $SVNURL xbmc-$VERSION + +# don't need to extra tarball, already expanded +# comment out with tarball tar -xzvf xbmc-$VERSION.tar.gz +# rename tarball directory +mv -i $VERSION xbmc-$VERSION cd xbmc-$VERSION # remove bundled libraries (including zlib and OSX), saves space and forces using external versions # also remove legally problematic libGoAhead library -for i in libass libcdio libCDRip libcurl libenca libfribidi liblzo libmms libpcre libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib libSDL-OSX boost libportaudio libglew libGoAhead libhdhomerun +#for i in libass libcdio libCDRip libcurl libenca libfribidi liblzo libmms libpcre libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib libSDL-OSX boost libportaudio libglew libGoAhead libhdhomerun +for i in liblzo libmms libsamplerate sqLite/sqlite libPython/Python cximage-6.0/zlib libid3tag/zlib zlib boost libglew libhdhomerun do rm -r xbmc/lib/$i done @@ -17,16 +41,19 @@ rm -r xbmc/visualizations/XBMCProjectM/win32 # remove various headers -rm xbmc/FileSystem/zlib.h +#rm xbmc/FileSystem/zlib.h # remove more bundled codecs # libfaad2, libmad needs upstream patches to be able to remove from tarball # even though the bundled libaries aren't, I think, compiled -for i in ffmpeg liba52 libmpeg2 libdts +# grrr, have to keep in ffmpeg for now (2010-07-019) since upstream +# seems to require files within that subdirectory <sigh> +for i in liba52 libmpeg2 libdts do rm -r xbmc/cores/dvdplayer/Codecs/$i done + # remove DVD stuff we can't ship, or is already in external libraries for i in libdvdcss libdvdread includes do @@ -34,12 +61,29 @@ done # remove all prebuilt binaries (e.g., .so files and Win32 DLLs) -find \( -name '*.so' -o -name '*.DLL' -o -name '*.dll' -o -name '*.lib' -o -name '*.zlib' -o -name '*.obj' -o -name '*.exe' -o -name '*.vis' \) | xargs rm -f +find \( -type f -name '*.so' -o -name '*.DLL' -o -name '*.dll' -o -name '*.lib' -o -name '*.zlib' -o -name '*.obj' -o -name '*.exe' -o -name '*.vis' \) | xargs rm -f -# remove other packages that should be system-wide -rm -rf lib +# remove all other packages that should be system-wide +# except for libass, cpluff, jsoncpp (need to figure out how to +# remove these too) +# xbmc-dll-symbols seems to be XBMC-specific +for i in enca freetype fribidi libcdio libcrystalhd libcurl-mingw32 libcurl-OSX libiconv liblame libmicrohttpd libmicrohttpd_win32 libmodplug libmysql_win32 libSDL-OSX libSDL-WIN32 libssh_win32 pcre +do + rm -r lib/$i +done + +# TODO/FIXME: remove tools/XBMCLive/ and other things under tools/ +# also remove anything to do with win32 +for i in arm MingwBuildEnvironment PackageMaker win32buildtools XBMCLive XBMCTex +do + rm -r tools/$i +done cd - # repack tar -cJvf xbmc-$VERSION-patched.tar.xz xbmc-$VERSION + +echo "Release:" +echo "$(date +'%Y%m%d')svn${SVNVERSION}" + Index: xbmc.spec =================================================================== RCS file: /cvs/free/rpms/xbmc/devel/xbmc.spec,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- xbmc.spec 30 Aug 2010 07:09:18 -0000 1.8 +++ xbmc.spec 2 Sep 2010 03:17:55 -0000 1.9 @@ -1,9 +1,15 @@ +%global SVNVERSION 33324 +%global PRERELEASE Dharma_beta1 +# use below for SVN snapshot +#global DIRVERSION %{version}-%{SVNVERSION} +%global DIRVERSION %{PRERELEASE} + Name: xbmc -Version: 9.11 -Release: 21%{?dist} +Version: 10.9 +Release: 0.11.%{PRERELEASE}%{?dist} URL: http://www.xbmc.org/ -Source0: %{name}-%{version}-patched.tar.xz +Source0: %{name}-%{DIRVERSION}-patched.tar.xz # xbmc contains code that we cannot ship, as well as redundant private # copies of upstream libraries that we already distribute. Therefore # we use this script to remove the code before shipping it. @@ -14,63 +20,30 @@ # where <version> is the particular version being used Source1: xbmc-generate-tarball-xz.sh -# look for libdca, rather than libdts -# http://xbmc.org/trac/ticket/8040 -Patch1: xbmc-9.11-libdca.patch - -# Needs work before being submitted upstream -Patch2: xbmc-9.11-b1-dvdlibs-external.patch - -# http://xbmc.org/trac/ticket/8026 (this will be in next release) -Patch3: xbmc-9.11-use_cdio_system_headers_on_non_win32.patch - -# Next 3 patches to use %{_libdir} -# http://xbmc.org/trac/ticket/8590 -Patch4: xbmc-9.11-fix-Makefile.in.patch -Patch5: xbmc-9.11-Makefile.include.in.diff -Patch6: xbmc-9.11-xbmc.sh.diff - -# Next 2 patches submitted upstream -# http://www.xbmc.org/trac/ticket/8629 -Patch7: xbmc-9.11-spyce.diff -Patch8: xbmc-9.11-RandomNumberGenerators.hpp.diff - -# Needs work before being submitted upstream -Patch9: xbmc-9.11-remlibass.patch - -# Fixes GCC warning: partial backport to 9.11 -# (should be fixed in next release) -Patch10: xbmc-9.11-changeset-26191.diff - -# remove goahead completely from compilation, it's been replaced -# by libmicrohttpd in SVN, so should add that BuildRequires for 10.5 -# and drop this patch -Patch11: xbmc-9.11-remove-goahead.patch - -# Next 12 patches submitted upstream: -# http://www.xbmc.org/trac/ticket/8629 -Patch12: xbmc-9.11-external-zlib.diff -Patch13: xbmc-9.11-goom-missing.diff -Patch14: xbmc-9.11-rsxs-0.9.diff -Patch15: xbmc-9.11-Weather.diff -Patch16: xbmc-9.11-XBMCProjectM-cmake.diff -Patch17: xbmc-9.11-cflags.patch -Patch18: xbmc-9.11-configure.patch -Patch19: xbmc-9.11-gymcodec.patch -Patch20: xbmc-9.11-macdll.patch -Patch21: xbmc-9.11-maclib.patch -Patch22: xbmc-9.11-libid3tag.patch -Patch23: xbmc-9.11-librtv.patch - -# these next 2 are (hopefully temporary) hacks -Patch24: xbmc-9.11-swscale.diff -Patch25: xbmc-9.11-xext.diff - -# 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 +# new patches for bootstrap +# no trac ticket filed as yet +Patch1: xbmc-10-bootstrap.patch + +# filed ticket, but patch still needs work +# http://trac.xbmc.org/ticket/9658 +Patch2: xbmc-10-dvdread.patch + +# and new problem with zlib in cximage +# trac ticket filed: http://trac.xbmc.org/ticket/9659 +# but patch not attached because it needs work +Patch3: xbmc-10-disable-zlib-in-cximage.patch + +# need to file trac ticket, this patch just forces external hdhomerun +# functionality, needs to be able fallback internal version +Patch4: xbmc-10-hdhomerun.patch + +# fix "@#" in Makefile which seem to screw things up no trac filed +# yet, don't know why this isn't a problem on other Linux systems +Patch5: xbmc-10-Makefile.patch + +# add patch from upstream trac http://trac.xbmc.org/ticket/9584 +# to find Python 2.7 (needed for F-14+) +Patch6: xbmc-10-python2.7.patch ExcludeArch: ppc64 Buildroot: %{_tmppath}/%{name}-%{version} @@ -141,8 +114,17 @@ BuildRequires: libdca-devel BuildRequires: libass-devel >= 0.9.7 BuildRequires: hdhomerun-devel -# add following BR in next release of XBMC to get support for crystalhd devices -#BuildRequires: libcrystalhd-devel +BuildRequires: libcrystalhd-devel +BuildRequires: libmodplug-devel +BuildRequires: libmicrohttpd-devel +BuildRequires: expat-devel +%if 0%{?fedora} >= 14 +BuildRequires: gettext-autopoint +%else +BuildRequires: gettext +%endif +BuildRequires: zip + %description XBMC media center is a free cross-platform media-player jukebox and @@ -152,35 +134,14 @@ %prep -%setup -q -n %{name}-%{version} +%setup -q -n %{name}-%{DIRVERSION} -%patch1 -p1 -b .dtsdca -%patch2 -p1 -b .dvdlibs -%patch3 -p1 -b .cdio -%patch4 -p0 -b .makefilein -%patch5 -p1 -b .makefileincl -%patch6 -p1 -b .xbmcsh -%patch7 -p1 -%patch8 -p1 -b .rand -%patch9 -p1 -b .remlibass -%patch10 -p1 -b .gccwarning -%patch11 -p0 -b .removegoahead -%patch12 -p1 -b .zlib -%patch13 -p1 -b .goom -%patch14 -p1 -b .rsxs -%patch15 -p1 -b .weather -%patch16 -p1 -b .projectm -%patch17 -p1 -b .cflags -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 -%patch22 -p1 -%patch23 -p1 -%patch24 -p1 -%patch25 -p1 -%patch26 -p1 -b .hdhomerun -%patch27 -p0 +%patch1 -p0 +%patch2 -p0 +%patch3 -p0 +%patch4 -p1 +%patch5 -p0 +%patch6 -p0 # Prevent rerunning the autotools. touch -r xbmc/screensavers/rsxs-0.9/aclocal.m4 \ @@ -196,10 +157,12 @@ --prefix=%{_prefix} --bindir=%{_bindir} --includedir=%{_includedir} \ --libdir=%{_libdir} --datadir=%{_datadir} \ --with-lirc-device=/var/run/lirc/lircd \ ---enable-external-libraries --enable-goom \ +--enable-goom \ +--enable-external-ffmpeg --enable-external-python \ +--disable-libdts --disable-liba52 \ +--disable-dvdcss \ --disable-optimizations --disable-debug \ ---disable-webserver \ -SVN_REV=26017 \ +SVN_REV=%{SVNVERSION} \ CPPFLAGS="-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" \ @@ -207,22 +170,18 @@ LIBS="-L%{_libdir}/mysql -lhdhomerun $LIBS" \ ASFLAGS=-fPIC +# disable the following: +# --enable-external-libraries +# enumerate all the external libraries because the libdts/liba52 detection +# is broken upstream: http://trac.xbmc.org/ticket/9277 + make %{?_smp_mflags} VERBOSE=1 %install rm -rf $RPM_BUILD_ROOT make DESTDIR=$RPM_BUILD_ROOT install -# remove the doc files from libdir, they should be put in the docdir -rm $RPM_BUILD_ROOT/%{_libdir}/xbmc/copying.txt $RPM_BUILD_ROOT/%{_libdir}/xbmc/keymapping.txt $RPM_BUILD_ROOT/%{_libdir}/xbmc/LICENSE.GPL $RPM_BUILD_ROOT/%{_libdir}/xbmc/README.linux -# remove bogus header file -rm -f $RPM_BUILD_ROOT%{_libdir}/xbmc/visualisations/xbmc_vis.h - -# make Python files executable to keep rpmlint quiet -# (spyce to be dropped from next xbmc release, so this can be dropped then) -for i in run_spyceCGI.py run_spyceCmd.py run_spyceModpy.py spyceCGI.py spyceCmd.py spyce.py verchk.py -do - chmod +x $RPM_BUILD_ROOT%{_libdir}/xbmc/system/python/spyce/$i -done +# remove the doc files from unversioned /usr/share/doc/xbmc, they should be in versioned docdir +rm -r $RPM_BUILD_ROOT/%{_datadir}/doc/ desktop-file-install \ --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \ @@ -237,22 +196,61 @@ %{_bindir}/xbmc %{_bindir}/xbmc-standalone %{_libdir}/xbmc +%{_datadir}/xbmc %{_datadir}/xsessions/XBMC.desktop %{_datadir}/applications/xbmc.desktop -%{_datadir}/pixmaps/xbmc.png +%{_datadir}/icons/hicolor/*/*/*.png %changelog -* Mon Aug 30 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-21 -- Fix python 2.7 patch +* Wed Sep 1 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.9-0.11.Dharma_beta1 +- Drop libmodplug/microhttpd patch, no longer needed + +* Wed Sep 1 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.9-0.10.Dharma_beta1 +- Rebase to Dharma beta1 release -* Sun Aug 29 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-20 +* Sun Aug 29 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.9.20100820svn32970 - 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 +* Wed Aug 25 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.8.20100820svn32970 - Default to using /var/run/lirc/lircd (#1325) +* Fri Aug 20 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.7.20100820svn32970 +- Rebase patches to r32970 on Dharma branch + +* Thu Jul 29 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.7.20100728svn32266 +- Add patch from upstream trac ticket 9584 to find Python 2.7 + (needed for F-14+) +- Add BuildRequires: zip + +* Thu Jul 29 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.6.20100728svn32266 +- Need to conditionally enable gettext-autopoint in BuildRequires + for F-14+ and gettext otherwise + +* Thu Jul 29 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.5.20100728svn32266 +- Add gettext-devel to BuildRequires for autopoint + +* Wed Jul 28 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.4.20100728svn32266 +- Sync with latest Dharma branch (r32266) + +* Mon Jul 19 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.3.20100719svn31991 +- Remove 24 patches which have been applied upstream, yay! +- Rebased 2 patches: libdvd patch and hdhomerun patch for Dharma +- Add some new patches, some of which have upstream trac tickets, + others need to +- Renumber patches + +* Mon Jul 19 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.2.20100719svn31991 +- Sync with Dharma branch + +* Mon Jul 19 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 10.5-0.1.20100719svn31977 +- Major overhaul for 10.x version of XBMC +- Fix file section for better FHS-compliance +- Drop a lot of patches that have been upstreamed, and rebase others + +* Fri May 21 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-19 +- Add new BR for libmodplug-devel, expat-devel, libmicrohttpd-devel + in preparation for 10.x + * Fri Mar 26 2010 Alex Lancaster <alexlan[AT]fedoraproject org> - 9.11-18 - Exclude ppc64 (not available for F-13+ in any case) --- xbmc-9.11-Makefile.include.in.diff DELETED --- --- xbmc-9.11-RandomNumberGenerators.hpp.diff DELETED --- --- xbmc-9.11-Weather.diff DELETED --- --- xbmc-9.11-XBMCProjectM-cmake.diff DELETED --- --- xbmc-9.11-b1-dvdlibs-external.patch DELETED --- --- xbmc-9.11-cflags.patch DELETED --- --- xbmc-9.11-changeset-26191.diff DELETED --- --- xbmc-9.11-configure.patch DELETED --- --- xbmc-9.11-external-zlib.diff DELETED --- --- xbmc-9.11-fix-Makefile.in.patch DELETED --- --- xbmc-9.11-goom-missing.diff DELETED --- --- xbmc-9.11-gymcodec.patch DELETED --- --- xbmc-9.11-hdhomerun.patch DELETED --- --- xbmc-9.11-libdca.patch DELETED --- --- xbmc-9.11-libid3tag.patch DELETED --- --- xbmc-9.11-librtv.patch DELETED --- --- xbmc-9.11-macdll.patch DELETED --- --- xbmc-9.11-maclib.patch DELETED --- --- xbmc-9.11-python2.7.patch DELETED --- --- xbmc-9.11-remlibass.patch DELETED --- --- xbmc-9.11-remove-goahead.patch DELETED --- --- xbmc-9.11-rsxs-0.9.diff DELETED --- --- xbmc-9.11-spyce.diff DELETED --- --- xbmc-9.11-swscale.diff DELETED --- --- xbmc-9.11-use_cdio_system_headers_on_non_win32.patch DELETED --- --- xbmc-9.11-xbmc.sh.diff DELETED --- --- xbmc-9.11-xext.diff DELETED ---