Attachment #258551 for bug #350098

Lines 901-907 fi Link Here

(-)a/configure.in (-2 / +8 lines)
901		901
902	# External Python	902	# External Python
903	if test "$use_external_python" = "yes"; then	903	if test "$use_external_python" = "yes"; then
904	AC_CHECK_LIB([python2.6], [main],	904	AC_CHECK_LIB([python2.7], [main],
		905	[AC_DEFINE([HAVE_LIBPYTHON2_7], [1],
		906	[Define to 1 if you have the 'python2.7' library.])
		907	USE_PYTHON2_7=1],
		908	[AC_CHECK_LIB([python2.6], [main],
905	[AC_DEFINE([HAVE_LIBPYTHON2_6], [1],	909	[AC_DEFINE([HAVE_LIBPYTHON2_6], [1],
906	[Define to 1 if you have the 'python2.6' library.])	910	[Define to 1 if you have the 'python2.6' library.])
907	USE_PYTHON2_6=1],	911	USE_PYTHON2_6=1],
Lines 913-921 if test "$use_external_python" = "yes"; then Link Here
913	[AC_DEFINE([HAVE_LIBPYTHON2_4], [1],	917	[AC_DEFINE([HAVE_LIBPYTHON2_4], [1],
914	[Define to 1 if you have the 'python2.4' library.])	918	[Define to 1 if you have the 'python2.4' library.])
915	USE_PYTHON2_4=1],	919	USE_PYTHON2_4=1],
916	[AC_MSG_ERROR($missing_library)] )] )] )	920	[AC_MSG_ERROR($missing_library)] )] )] )] )
917		921
918	AC_MSG_NOTICE($external_python_enabled)	922	AC_MSG_NOTICE($external_python_enabled)
		923	test "$USE_PYTHON2_7" && AC_MSG_NOTICE([Using Python 2.7])
919	test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6])	924	test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6])
920	test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5])	925	test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5])
921	test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4])	926	test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4])
Lines 1471-1476 AC_SUBST(USE_INTERNAL_LIBDTS) Link Here
1471	AC_SUBST(USE_EXTERNAL_LIBMPEG2)	1476	AC_SUBST(USE_EXTERNAL_LIBMPEG2)
1472	AC_SUBST(USE_EXTERNAL_LIBWAVPACK)	1477	AC_SUBST(USE_EXTERNAL_LIBWAVPACK)
1473	AC_SUBST(USE_EXTERNAL_PYTHON)	1478	AC_SUBST(USE_EXTERNAL_PYTHON)
		1479	AC_SUBST(USE_PYTHON2_7)
1474	AC_SUBST(USE_PYTHON2_6)	1480	AC_SUBST(USE_PYTHON2_6)
1475	AC_SUBST(USE_PYTHON2_5)	1481	AC_SUBST(USE_PYTHON2_5)
1476	AC_SUBST(USE_PYTHON2_4)	1482	AC_SUBST(USE_PYTHON2_4)

Lines 24-30 Link Here

(-)a/xbmc/lib/libPython/XBPyThread.cpp (-1 / +4 lines)
24	#include "config.h"	24	#include "config.h"
25	#endif	25	#endif
26	#if (defined USE_EXTERNAL_PYTHON)	26	#if (defined USE_EXTERNAL_PYTHON)
27	#if (defined HAVE_LIBPYTHON2_6)	27	#if (defined HAVE_LIBPYTHON2_7)
		28	#include <python2.7/Python.h>
		29	#include <python2.7/osdefs.h>
		30	#elif (defined HAVE_LIBPYTHON2_6)
28	#include <python2.6/Python.h>	31	#include <python2.6/Python.h>
29	#include <python2.6/osdefs.h>	32	#include <python2.6/osdefs.h>
30	#elif (defined HAVE_LIBPYTHON2_5)	33	#elif (defined HAVE_LIBPYTHON2_5)

Lines 26-32 Link Here

(-)a/xbmc/lib/libPython/XBPyThread.h (-1 / +3 lines)
26	#include "config.h"	26	#include "config.h"
27	#endif	27	#endif
28	#if (defined USE_EXTERNAL_PYTHON)	28	#if (defined USE_EXTERNAL_PYTHON)
29	#if (defined HAVE_LIBPYTHON2_6)	29	#if (defined HAVE_LIBPYTHON2_7)
		30	#include <python2.7/Python.h>
		31	#elif (defined HAVE_LIBPYTHON2_6)
30	#include <python2.6/Python.h>	32	#include <python2.6/Python.h>
31	#elif (defined HAVE_LIBPYTHON2_5)	33	#elif (defined HAVE_LIBPYTHON2_5)
32	#include <python2.5/Python.h>	34	#include <python2.5/Python.h>

Lines 24-30 Link Here

(-)a/xbmc/lib/libPython/XBPython.cpp (-6 / +18 lines)
24	#include "config.h"	24	#include "config.h"
25	#endif	25	#endif
26	#if (defined USE_EXTERNAL_PYTHON)	26	#if (defined USE_EXTERNAL_PYTHON)
27	#if (defined HAVE_LIBPYTHON2_6)	27	#if (defined HAVE_LIBPYTHON2_7)
		28	#include <python2.7/Python.h>
		29	#elif (defined HAVE_LIBPYTHON2_6)
28	#include <python2.6/Python.h>	30	#include <python2.6/Python.h>
29	#elif (defined HAVE_LIBPYTHON2_5)	31	#elif (defined HAVE_LIBPYTHON2_5)
30	#include <python2.5/Python.h>	32	#include <python2.5/Python.h>
Lines 61-67 XBPython g_pythonParser; Link Here
61	#define PYTHON_DLL "special://xbmcbin/system/python/python24-x86-osx.so"	63	#define PYTHON_DLL "special://xbmcbin/system/python/python24-x86-osx.so"
62	#endif	64	#endif
63	#elif defined(__x86_64__)	65	#elif defined(__x86_64__)
64	#if (defined HAVE_LIBPYTHON2_6)	66	#if (defined HAVE_LIBPYTHON2_7)
		67	#define PYTHON_DLL "special://xbmcbin/system/python/python27-x86_64-linux.so"
		68	#elif (defined HAVE_LIBPYTHON2_6)
65	#define PYTHON_DLL "special://xbmcbin/system/python/python26-x86_64-linux.so"	69	#define PYTHON_DLL "special://xbmcbin/system/python/python26-x86_64-linux.so"
66	#elif (defined HAVE_LIBPYTHON2_5)	70	#elif (defined HAVE_LIBPYTHON2_5)
67	#define PYTHON_DLL "special://xbmcbin/system/python/python25-x86_64-linux.so"	71	#define PYTHON_DLL "special://xbmcbin/system/python/python25-x86_64-linux.so"
Lines 69-75 XBPython g_pythonParser; Link Here
69	#define PYTHON_DLL "special://xbmcbin/system/python/python24-x86_64-linux.so"	73	#define PYTHON_DLL "special://xbmcbin/system/python/python24-x86_64-linux.so"
70	#endif	74	#endif
71	#elif defined(_POWERPC)	75	#elif defined(_POWERPC)
72	#if (defined HAVE_LIBPYTHON2_6)	76	#if (defined HAVE_LIBPYTHON2_7)
		77	#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc-linux.so"
		78	#elif (defined HAVE_LIBPYTHON2_6)
73	#define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc-linux.so"	79	#define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc-linux.so"
74	#elif (defined HAVE_LIBPYTHON2_5)	80	#elif (defined HAVE_LIBPYTHON2_5)
75	#define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc-linux.so"	81	#define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc-linux.so"
Lines 77-83 XBPython g_pythonParser; Link Here
77	#define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc-linux.so"	83	#define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc-linux.so"
78	#endif	84	#endif
79	#elif defined(_POWERPC64)	85	#elif defined(_POWERPC64)
80	#if (defined HAVE_LIBPYTHON2_6)	86	#if (defined HAVE_LIBPYTHON2_7)
		87	#define PYTHON_DLL "special://xbmcbin/system/python/python27-powerpc64-linux.so"
		88	#elif (defined HAVE_LIBPYTHON2_6)
81	#define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc64-linux.so"	89	#define PYTHON_DLL "special://xbmcbin/system/python/python26-powerpc64-linux.so"
82	#elif (defined HAVE_LIBPYTHON2_5)	90	#elif (defined HAVE_LIBPYTHON2_5)
83	#define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc64-linux.so"	91	#define PYTHON_DLL "special://xbmcbin/system/python/python25-powerpc64-linux.so"
Lines 85-91 XBPython g_pythonParser; Link Here
85	#define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc64-linux.so"	93	#define PYTHON_DLL "special://xbmcbin/system/python/python24-powerpc64-linux.so"
86	#endif	94	#endif
87	#elif defined(_ARMEL)	95	#elif defined(_ARMEL)
88	#if (defined HAVE_LIBPYTHON2_6)	96	#if (defined HAVE_LIBPYTHON2_7)
		97	#define PYTHON_DLL "special://xbmc/system/python/python27-arm.so"
		98	#elif (defined HAVE_LIBPYTHON2_6)
89	#define PYTHON_DLL "special://xbmc/system/python/python26-arm.so"	99	#define PYTHON_DLL "special://xbmc/system/python/python26-arm.so"
90	#elif (defined HAVE_LIBPYTHON2_5)	100	#elif (defined HAVE_LIBPYTHON2_5)
91	#define PYTHON_DLL "special://xbmc/system/python/python25-arm.so"	101	#define PYTHON_DLL "special://xbmc/system/python/python25-arm.so"
Lines 93-99 XBPython g_pythonParser; Link Here
93	#define PYTHON_DLL "special://xbmc/system/python/python24-arm.so"	103	#define PYTHON_DLL "special://xbmc/system/python/python24-arm.so"
94	#endif	104	#endif
95	#else /* !__x86_64__ && !__powerpc__ */	105	#else /* !__x86_64__ && !__powerpc__ */
96	#if (defined HAVE_LIBPYTHON2_6)	106	#if (defined HAVE_LIBPYTHON2_7)
		107	#define PYTHON_DLL "special://xbmcbin/system/python/python27-i486-linux.so"
		108	#elif (defined HAVE_LIBPYTHON2_6)
97	#define PYTHON_DLL "special://xbmcbin/system/python/python26-i486-linux.so"	109	#define PYTHON_DLL "special://xbmcbin/system/python/python26-i486-linux.so"
98	#elif (defined HAVE_LIBPYTHON2_5)	110	#elif (defined HAVE_LIBPYTHON2_5)
99	#define PYTHON_DLL "special://xbmcbin/system/python/python25-i486-linux.so"	111	#define PYTHON_DLL "special://xbmcbin/system/python/python25-i486-linux.so"

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/XBPythonDll.cpp (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/pyconfig.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/pyconfig.h>	29	#include <python2.6/pyconfig.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/pyconfig.h>	31	#include <python2.5/pyconfig.h>

Lines 2-8 Link Here

(-)a/xbmc/lib/libPython/XBPythonDllFuncs.S (-1 / +3 lines)
2	#include "config.h"	2	#include "config.h"
3	#endif	3	#endif
4	#if (defined USE_EXTERNAL_PYTHON)	4	#if (defined USE_EXTERNAL_PYTHON)
5	#if (defined HAVE_LIBPYTHON2_6)	5	#if (defined HAVE_LIBPYTHON2_7)
		6	#include <python2.7/pyconfig.h>
		7	#elif (defined HAVE_LIBPYTHON2_6)
6	#include <python2.6/pyconfig.h>	8	#include <python2.6/pyconfig.h>
7	#elif (defined HAVE_LIBPYTHON2_5)	9	#elif (defined HAVE_LIBPYTHON2_5)
8	#include <python2.5/pyconfig.h>	10	#include <python2.5/pyconfig.h>

Lines 5-11 LDFLAGS=@LDFLAGS@ Link Here

(-)a/xbmc/lib/libPython/linux/Makefile.in (-1 / +4 lines)
5	SHELL=/bin/bash	5	SHELL=/bin/bash
6	SYSDIR=../../../../system/python	6	SYSDIR=../../../../system/python
7		7
8	ifeq (@USE_PYTHON2_6@,1)	8	ifeq (@USE_PYTHON2_7@,1)
		9	PYVERSION=python2.7
		10	SO=python27-$(ARCH).so
		11	else ifeq (@USE_PYTHON2_6@,1)
9	PYVERSION=python2.6	12	PYVERSION=python2.6
10	SO=python26-$(ARCH).so	13	SO=python26-$(ARCH).so
11	else ifeq (@USE_PYTHON2_5@,1)	14	else ifeq (@USE_PYTHON2_5@,1)

Lines 26-32 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h (-1 / +3 lines)
26	#include "config.h"	26	#include "config.h"
27	#endif	27	#endif
28	#if (defined USE_EXTERNAL_PYTHON)	28	#if (defined USE_EXTERNAL_PYTHON)
29	#if (defined HAVE_LIBPYTHON2_6)	29	#if (defined HAVE_LIBPYTHON2_7)
		30	#include <python2.7/Python.h>
		31	#elif (defined HAVE_LIBPYTHON2_6)
30	#include <python2.6/Python.h>	32	#include <python2.6/Python.h>
31	#elif (defined HAVE_LIBPYTHON2_5)	33	#elif (defined HAVE_LIBPYTHON2_5)
32	#include <python2.5/Python.h>	34	#include <python2.5/Python.h>

Lines 25-31 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/PythonAddon.h (-1 / +3 lines)
25	#include "config.h"	25	#include "config.h"
26	#endif	26	#endif
27	#if (defined USE_EXTERNAL_PYTHON)	27	#if (defined USE_EXTERNAL_PYTHON)
28	#if (defined HAVE_LIBPYTHON2_6)	28	#if (defined HAVE_LIBPYTHON2_7)
		29	#include <python2.7/Python.h>
		30	#elif (defined HAVE_LIBPYTHON2_6)
29	#include <python2.6/Python.h>	31	#include <python2.6/Python.h>
30	#elif (defined HAVE_LIBPYTHON2_5)	32	#elif (defined HAVE_LIBPYTHON2_5)
31	#include <python2.5/Python.h>	33	#include <python2.5/Python.h>

Lines 25-31 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h (-1 / +3 lines)
25	#include "config.h"	25	#include "config.h"
26	#endif	26	#endif
27	#if (defined USE_EXTERNAL_PYTHON)	27	#if (defined USE_EXTERNAL_PYTHON)
28	#if (defined HAVE_LIBPYTHON2_6)	28	#if (defined HAVE_LIBPYTHON2_7)
		29	#include <python2.7/Python.h>
		30	#elif (defined HAVE_LIBPYTHON2_6)
29	#include <python2.6/Python.h>	31	#include <python2.6/Python.h>
30	#elif (defined HAVE_LIBPYTHON2_5)	32	#elif (defined HAVE_LIBPYTHON2_5)
31	#include <python2.5/Python.h>	33	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/action.h (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/control.h (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/controlimage.cpp (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/controllabel.cpp (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/controllist.cpp (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/controlslider.cpp (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/controlspin.cpp (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 24-30 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/dialog.cpp (-1 / +3 lines)
24	#endif	24	#endif
25	#include "dialog.h"	25	#include "dialog.h"
26	#if (defined USE_EXTERNAL_PYTHON)	26	#if (defined USE_EXTERNAL_PYTHON)
27	#if (defined HAVE_LIBPYTHON2_6)	27	#if (defined HAVE_LIBPYTHON2_7)
		28	#include <python2.7/Python.h>
		29	#elif (defined HAVE_LIBPYTHON2_6)
28	#include <python2.6/Python.h>	30	#include <python2.6/Python.h>
29	#elif (defined HAVE_LIBPYTHON2_5)	31	#elif (defined HAVE_LIBPYTHON2_5)
30	#include <python2.5/Python.h>	32	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/dialog.h (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/infotagmusic.h (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/infotagvideo.h (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/keyboard.h (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/listitem.cpp (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 25-31 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/listitem.h (-1 / +3 lines)
25	#include "config.h"	25	#include "config.h"
26	#endif	26	#endif
27	#if (defined USE_EXTERNAL_PYTHON)	27	#if (defined USE_EXTERNAL_PYTHON)
28	#if (defined HAVE_LIBPYTHON2_6)	28	#if (defined HAVE_LIBPYTHON2_7)
		29	#include <python2.7/Python.h>
		30	#elif (defined HAVE_LIBPYTHON2_6)
29	#include <python2.6/Python.h>	31	#include <python2.6/Python.h>
30	#elif (defined HAVE_LIBPYTHON2_5)	32	#elif (defined HAVE_LIBPYTHON2_5)
31	#include <python2.5/Python.h>	33	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/player.h (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 26-32 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp (-1 / +3 lines)
26	#include "Util.h"	26	#include "Util.h"
27	#include "pyplaylist.h"	27	#include "pyplaylist.h"
28	#if (defined USE_EXTERNAL_PYTHON)	28	#if (defined USE_EXTERNAL_PYTHON)
29	#if (defined HAVE_LIBPYTHON2_6)	29	#if (defined HAVE_LIBPYTHON2_7)
		30	#include <python2.7/Python.h>
		31	#elif (defined HAVE_LIBPYTHON2_6)
30	#include <python2.6/Python.h>	32	#include <python2.6/Python.h>
31	#elif (defined HAVE_LIBPYTHON2_5)	33	#elif (defined HAVE_LIBPYTHON2_5)
32	#include <python2.5/Python.h>	34	#include <python2.5/Python.h>

Lines 25-31 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/pyplaylist.h (-1 / +3 lines)
25	#include "config.h"	25	#include "config.h"
26	#endif	26	#endif
27	#if (defined USE_EXTERNAL_PYTHON)	27	#if (defined USE_EXTERNAL_PYTHON)
28	#if (defined HAVE_LIBPYTHON2_6)	28	#if (defined HAVE_LIBPYTHON2_7)
		29	#include <python2.7/Python.h>
		30	#elif (defined HAVE_LIBPYTHON2_6)
29	#include <python2.6/Python.h>	31	#include <python2.6/Python.h>
30	#elif (defined HAVE_LIBPYTHON2_5)	32	#elif (defined HAVE_LIBPYTHON2_5)
31	#include <python2.5/Python.h>	33	#include <python2.5/Python.h>

Lines 25-31 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/pyutil.h (-1 / +3 lines)
25	#include "config.h"	25	#include "config.h"
26	#endif	26	#endif
27	#if (defined USE_EXTERNAL_PYTHON)	27	#if (defined USE_EXTERNAL_PYTHON)
28	#if (defined HAVE_LIBPYTHON2_6)	28	#if (defined HAVE_LIBPYTHON2_7)
		29	#include <python2.7/Python.h>
		30	#elif (defined HAVE_LIBPYTHON2_6)
29	#include <python2.6/Python.h>	31	#include <python2.6/Python.h>
30	#elif (defined HAVE_LIBPYTHON2_5)	32	#elif (defined HAVE_LIBPYTHON2_5)
31	#include <python2.5/Python.h>	33	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/window.h (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 24-30 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/winxml.cpp (-1 / +3 lines)
24	#endif	24	#endif
25	#include "winxml.h"	25	#include "winxml.h"
26	#if (defined USE_EXTERNAL_PYTHON)	26	#if (defined USE_EXTERNAL_PYTHON)
27	#if (defined HAVE_LIBPYTHON2_6)	27	#if (defined HAVE_LIBPYTHON2_7)
		28	#include <python2.7/Python.h>
		29	#elif (defined HAVE_LIBPYTHON2_6)
28	#include <python2.6/Python.h>	30	#include <python2.6/Python.h>
29	#elif (defined HAVE_LIBPYTHON2_5)	31	#elif (defined HAVE_LIBPYTHON2_5)
30	#include <python2.5/Python.h>	32	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/winxml.h (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 24-30 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp (-1 / +3 lines)
24	#endif	24	#endif
25	#include "winxml.h"	25	#include "winxml.h"
26	#if (defined USE_EXTERNAL_PYTHON)	26	#if (defined USE_EXTERNAL_PYTHON)
27	#if (defined HAVE_LIBPYTHON2_6)	27	#if (defined HAVE_LIBPYTHON2_7)
		28	#include <python2.7/Python.h>
		29	#elif (defined HAVE_LIBPYTHON2_6)
28	#include <python2.6/Python.h>	30	#include <python2.6/Python.h>
29	#elif (defined HAVE_LIBPYTHON2_5)	31	#elif (defined HAVE_LIBPYTHON2_5)
30	#include <python2.5/Python.h>	32	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp (-1 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp (-1 / +4 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#include <python2.7/structmember.h>
		29	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	30	#include <python2.6/Python.h>
28	#include <python2.6/structmember.h>	31	#include <python2.6/structmember.h>
29	#elif (defined HAVE_LIBPYTHON2_5)	32	#elif (defined HAVE_LIBPYTHON2_5)

Lines 23-29 Link Here

(-)a/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp (-2 / +3 lines)
23	#include "config.h"	23	#include "config.h"
24	#endif	24	#endif
25	#if (defined USE_EXTERNAL_PYTHON)	25	#if (defined USE_EXTERNAL_PYTHON)
26	#if (defined HAVE_LIBPYTHON2_6)	26	#if (defined HAVE_LIBPYTHON2_7)
		27	#include <python2.7/Python.h>
		28	#elif (defined HAVE_LIBPYTHON2_6)
27	#include <python2.6/Python.h>	29	#include <python2.6/Python.h>
28	#elif (defined HAVE_LIBPYTHON2_5)	30	#elif (defined HAVE_LIBPYTHON2_5)
29	#include <python2.5/Python.h>	31	#include <python2.5/Python.h>
30	-

Return to bug 350098