Attachment #113810 for bug #155403

View | Details | Raw Unified | Return to bug 155403
Collapse All | Expand All





PORTNAME=	xbmc
PORTVERSION=	10.0
PORTREVISION=	5
CATEGORIES=	multimedia
MASTER_SITES=	http://mirrors.xbmc.org/releases/source/


USE_GL=		glu
USE_SDL=	image mixer sdl
USE_MYSQL=	yes
USE_PYTHON=	2.5-2.7
MAKE_JOBS_SAFE=	yes
NOPRECIOUSMAKEVARS=	yes
INSTALLS_ICONS=	yes

		LIBBLURAY	"Enable libbluray support"		on \
		FAAC		"Enable FAAC support"			off \
		HAL		"Enable HAL support"			on \
		LIRC		"Enable lirc support"			off \
		MMS		"Enable mms:// & mmsh:// support"	on \
		NONFREE		"Enable non-free components (rar, ccx, ffmpeg)"	off \
		PULSE		"Enable PulseAudio support"		off \

CONFIGURE_ARGS+=	--disable-hal
.endif

.if defined(WITH_LIRC)
RUN_DEPENDS+=	lirc_client.2:${PORTSDIR}/comms/lirc
.endif

.if !defined(WITHOUT_MMS)
CONFIGURE_ARGS+=	--enable-libmms
LIB_DEPENDS+=	mms.0:${PORTSDIR}/net/libmms

.endif

post-patch:
	@${REINPLACE_CMD} -e 's|#!/bin/bash|#!/bin/sh|' ${WRKSRC}/XBMC.xcodeproj/project.pbxproj
	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
		${WRKSRC}/configure.in \
		${WRKSRC}/lib/enca/configure \

		${WRKSRC}/xbmc/screensavers/rsxs-0.9/configure \
		${WRKSRC}/xbmc/visualizations/Goom/goom2k4-0/configure \
		${WRKSRC}/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure
	@${REINPLACE_CMD} -e "s;python2\.6;${PYTHON_VERSION};" \
		-e "s;HAVE_LIBPYTHON2_6;HAVE_LIB${PYTHON_VERSION:U:S/./_/g};" \
		${WRKSRC}/xbmc/lib/libPython/XBPyThread.cpp \
		${WRKSRC}/xbmc/lib/libPython/XBPyThread.h \
		${WRKSRC}/xbmc/lib/libPython/XBPythonDll.cpp \
		${WRKSRC}/xbmc/lib/libPython/XBPythonDllFuncs.S \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/PythonAddon.h \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/action.h \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/control.h \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlimage.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controllabel.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controllist.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlslider.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlspin.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/dialog.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/dialog.h \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/infotagmusic.h \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/infotagvideo.h \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/keyboard.h \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/listitem.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/listitem.h \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/player.h \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/pyplaylist.h \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/pyutil.h \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/window.h \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/winxml.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/winxml.h \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp \
		${WRKSRC}/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp

pre-configure:
	cd ${WRKSRC} && ./bootstrap

Lines 1-5 Link Here

(-)xbmc/files/patch-configure.in (-21 / +55 lines)
1	--- configure.in.orig 2010-12-17 07:17:41.000000000 +0100	1	--- configure.in.orig 2010-12-17 07:17:41.000000000 +0100
2	+++ configure.in 2011-02-23 21:51:33.000000000 +0100	2	+++ configure.in 2011-03-08 15:10:52.000000000 +0100
3	@@ -19,10 +19,10 @@	3	@@ -19,10 +19,10 @@
4	[	4	[
5	if [[ "$host_vendor" != "apple" ]]; then	5	if [[ "$host_vendor" != "apple" ]]; then
Lines 45-51 Link Here
45	i386-apple-darwin*)	45	i386-apple-darwin*)
46	ARCH="x86-osx"	46	ARCH="x86-osx"
47	# define i386 or x86_64, cannot use $HOSTTYPE as it reports x86_64 on 10.6 regardless of kernel flavor	47	# define i386 or x86_64, cannot use $HOSTTYPE as it reports x86_64 on 10.6 regardless of kernel flavor
48	@@ -543,7 +561,11 @@	48	@@ -507,6 +525,8 @@
		49	# Add top source directory for all builds so we can use config.h
		50	INCLUDES="$INCLUDES -I\$(abs_top_srcdir)"
		51
		52	+AC_CHECK_HEADER([sys/inotify.h], AC_DEFINE([HAVE_INOTIFY],[1],[""]),)
		53	+
		54	# Checks for boost headers using CXX instead of CC
		55	AC_LANG_PUSH([C++])
		56	AC_CHECK_HEADER([boost/shared_ptr.hpp],, AC_MSG_ERROR($missing_library))
		57	@@ -543,7 +563,11 @@
49	AC_CHECK_LIB([ass], [ass_set_message_cb],,use_external_libass="no")	58	AC_CHECK_LIB([ass], [ass_set_message_cb],,use_external_libass="no")
50	AC_CHECK_LIB([bz2], [main],, AC_MSG_ERROR($missing_library))	59	AC_CHECK_LIB([bz2], [main],, AC_MSG_ERROR($missing_library))
51	AC_CHECK_LIB([jpeg], [main],, AC_MSG_ERROR($missing_library)) # check for cximage	60	AC_CHECK_LIB([jpeg], [main],, AC_MSG_ERROR($missing_library)) # check for cximage
Lines 57-63 Link Here
57	AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($missing_library))	66	AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($missing_library))
58	AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library))	67	AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library))
59	AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library))	68	AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library))
60	@@ -581,9 +603,6 @@	69	@@ -581,9 +605,6 @@
61	PKG_CHECK_MODULES([SAMPLERATE], [samplerate],	70	PKG_CHECK_MODULES([SAMPLERATE], [samplerate],
62	[INCLUDES="$INCLUDES $SAMPLERATE_CFLAGS"; LIBS="$LIBS $SAMPLERATE_LIBS"],	71	[INCLUDES="$INCLUDES $SAMPLERATE_CFLAGS"; LIBS="$LIBS $SAMPLERATE_LIBS"],
63	AC_MSG_ERROR($missing_library))	72	AC_MSG_ERROR($missing_library))
Lines 67-73 Link Here
67	PKG_CHECK_MODULES([FREETYPE2], [freetype2],	76	PKG_CHECK_MODULES([FREETYPE2], [freetype2],
68	[INCLUDES="$INCLUDES $FREETYPE2_CFLAGS"; LIBS="$LIBS $FREETYPE2_LIBS"],	77	[INCLUDES="$INCLUDES $FREETYPE2_CFLAGS"; LIBS="$LIBS $FREETYPE2_LIBS"],
69	AC_MSG_ERROR($missing_library))	78	AC_MSG_ERROR($missing_library))
70	@@ -620,6 +639,29 @@	79	@@ -620,6 +641,29 @@
71	]	80	]
72	)	81	)
73		82
Lines 97-116 Link Here
97	# platform dependent libraries	106	# platform dependent libraries
98	if test "$host_vendor" = "apple" ; then	107	if test "$host_vendor" = "apple" ; then
99	AC_CHECK_LIB([iconv], [main],, AC_MSG_ERROR($missing_library))	108	AC_CHECK_LIB([iconv], [main],, AC_MSG_ERROR($missing_library))
100	@@ -644,8 +686,10 @@	109	@@ -644,8 +688,10 @@
101	AC_CHECK_HEADER([FLAC/stream_decoder.h],, AC_MSG_ERROR($missing_library))	110	AC_CHECK_HEADER([FLAC/stream_decoder.h],, AC_MSG_ERROR($missing_library))
102	AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library))	111	AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library))
103	AC_CHECK_LIB([SDL_mixer], [main],, AC_MSG_ERROR($missing_library))	112	AC_CHECK_LIB([SDL_mixer], [main],, AC_MSG_ERROR($missing_library))
104	- AC_CHECK_LIB([dl], [main],, AC_MSG_ERROR($missing_library))
105	- AC_CHECK_LIB([resolv], [main],, AC_MSG_ERROR($missing_library))
106	+ if echo "$ARCH" \| grep -vq freebsd; then	113	+ if echo "$ARCH" \| grep -vq freebsd; then
107	+ AC_CHECK_LIB([dl], [main],, AC_MSG_ERROR($missing_library))	114	AC_CHECK_LIB([dl], [main],, AC_MSG_ERROR($missing_library))
108	+ AC_CHECK_LIB([resolv], [main],, AC_MSG_ERROR($missing_library))	115	AC_CHECK_LIB([resolv], [main],, AC_MSG_ERROR($missing_library))
109	+ fi	116	+ fi
110	AC_CHECK_LIB([jasper], [main],, AC_MSG_ERROR($missing_library)) # check for cximage	117	AC_CHECK_LIB([jasper], [main],, AC_MSG_ERROR($missing_library)) # check for cximage
111	AC_CHECK_LIB([tiff], [main],, AC_MSG_ERROR($missing_library))	118	AC_CHECK_LIB([tiff], [main],, AC_MSG_ERROR($missing_library))
112	AC_CHECK_LIB([rt], [clock_gettime],, AC_MSG_ERROR($missing_library))	119	AC_CHECK_LIB([rt], [clock_gettime],, AC_MSG_ERROR($missing_library))
113	@@ -740,8 +784,8 @@	120	@@ -740,8 +786,8 @@
114	AC_MSG_RESULT($faac_disabled)	121	AC_MSG_RESULT($faac_disabled)
115	else	122	else
116	if test "$use_faac" = "yes"; then	123	if test "$use_faac" = "yes"; then
Lines 121-127 Link Here
121	else	128	else
122	AC_MSG_RESULT($faac_disabled)	129	AC_MSG_RESULT($faac_disabled)
123	fi	130	fi
124	@@ -1211,6 +1255,12 @@	131	@@ -919,7 +965,11 @@
		132
		133	# External Python
		134	if test "$use_external_python" = "yes"; then
		135	- AC_CHECK_LIB([python2.6], [main],
		136	+ AC_CHECK_LIB([python2.7], [main],
		137	+ [AC_DEFINE([HAVE_LIBPYTHON2_7], [1],
		138	+ [Define to 1 if you have the 'python2.7' library.])
		139	+ USE_PYTHON2_7=1],
		140	+ [AC_CHECK_LIB([python2.6], [main],
		141	[AC_DEFINE([HAVE_LIBPYTHON2_6], [1],
		142	[Define to 1 if you have the 'python2.6' library.])
		143	USE_PYTHON2_6=1],
		144	@@ -931,9 +981,10 @@
		145	[AC_DEFINE([HAVE_LIBPYTHON2_4], [1],
		146	[Define to 1 if you have the 'python2.4' library.])
		147	USE_PYTHON2_4=1],
		148	- [AC_MSG_ERROR($missing_library)] )] )] )
		149	+ [AC_MSG_ERROR($missing_library)] )] )] )] )
		150
		151	AC_MSG_NOTICE($external_python_enabled)
		152	+ test "$USE_PYTHON2_7" && AC_MSG_NOTICE([Using Python 2.7])
		153	test "$USE_PYTHON2_6" && AC_MSG_NOTICE([Using Python 2.6])
		154	test "$USE_PYTHON2_5" && AC_MSG_NOTICE([Using Python 2.5])
		155	test "$USE_PYTHON2_4" && AC_MSG_NOTICE([Using Python 2.4])
		156	@@ -1211,6 +1262,12 @@
125	final_message="$final_message\n Bluray:\tNo"	157	final_message="$final_message\n Bluray:\tNo"
126	fi	158	fi
127		159
Lines 134-140 Link Here
134	if test "$use_mid" = "yes"; then	166	if test "$use_mid" = "yes"; then
135	final_message="$final_message\n MID Support:\tYes"	167	final_message="$final_message\n MID Support:\tYes"
136	SDL_DEFINES="$SDL_DEFINES -DMID"	168	SDL_DEFINES="$SDL_DEFINES -DMID"
137	@@ -1418,7 +1468,6 @@	169	@@ -1418,7 +1475,6 @@
138	xbmc/cores/paplayer/NSFCodec/Makefile \	170	xbmc/cores/paplayer/NSFCodec/Makefile \
139	xbmc/cores/paplayer/SIDCodec/Makefile \	171	xbmc/cores/paplayer/SIDCodec/Makefile \
140	xbmc/cores/paplayer/vgmstream/Makefile \	172	xbmc/cores/paplayer/vgmstream/Makefile \
Lines 142-148 Link Here
142	xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile \	174	xbmc/cores/paplayer/YMCodec/StSoundLibrary/Makefile \
143	xbmc/cores/playercorefactory/Makefile \	175	xbmc/cores/playercorefactory/Makefile \
144	xbmc/karaoke/Makefile \	176	xbmc/karaoke/Makefile \
145	@@ -1735,7 +1784,7 @@	177	@@ -1491,6 +1547,7 @@
		178	AC_SUBST(USE_EXTERNAL_LIBMPEG2)
		179	AC_SUBST(USE_EXTERNAL_LIBWAVPACK)
		180	AC_SUBST(USE_EXTERNAL_PYTHON)
		181	+AC_SUBST(USE_PYTHON2_7)
		182	AC_SUBST(USE_PYTHON2_6)
		183	AC_SUBST(USE_PYTHON2_5)
		184	AC_SUBST(USE_PYTHON2_4)
		185	@@ -1735,7 +1792,7 @@
146	--enable-static \	186	--enable-static \
147	--disable-shared \	187	--disable-shared \
148	--cc="$CC" &&	188	--cc="$CC" &&
Lines 151-163 Link Here
151	mkdir -p `pwd`/../includes/dvdread	191	mkdir -p `pwd`/../includes/dvdread
152	cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread	192	cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
153	else	193	else
154	@@ -1744,13 +1793,14 @@	194	@@ -1749,8 +1806,9 @@
155	--prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}" --datadir="${datadir}" \
156	--host=$host_alias \
157	--build=$build_alias \
158	- --target=$target_alias \
159	+ --target=$target_alias \
160	--enable-static \
161	--disable-shared \	195	--disable-shared \
162	--disable-strip \	196	--disable-strip \
163	--disable-opts \	197	--disable-opts \
Lines 168-174 Link Here
168	mkdir -p `pwd`/../includes/dvdread	202	mkdir -p `pwd`/../includes/dvdread
169	cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread	203	cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
170	fi	204	fi
171	@@ -1766,6 +1816,17 @@	205	@@ -1766,6 +1824,17 @@
172	--enable-static \	206	--enable-static \
173	--disable-shared \	207	--disable-shared \
174	--cc="$CC"	208	--cc="$CC"




--- guilib/common/LIRC.cpp.orig	2011-03-07 14:16:12.000000000 +0100
+++ guilib/common/LIRC.cpp	2011-03-07 14:11:31.000000000 +0100
@@ -19,11 +19,14 @@
 *
 */
 
+#include "config.h"
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#ifdef HAVE_INOTIFY
 #include <sys/inotify.h>
+#endif
 #include <limits.h>
 #include <unistd.h>
 #include "LIRC.h"
@@ -92,12 +95,14 @@
       close(m_fd);
     m_fd = -1;
     m_file = NULL;
+#ifdef HAVE_INOTIFY
     if (m_inotify_wd >= 0) {
       inotify_rm_watch(m_inotify_fd, m_inotify_wd);
       m_inotify_wd = -1;
     }
     if (m_inotify_fd >= 0)
       close(m_inotify_fd);
+#endif
 
     m_inReply = false;
     m_nrSending = 0;
@@ -148,6 +153,7 @@
         {
           if ((m_file = fdopen(m_fd, "r+")) != NULL)
           {
+#ifdef HAVE_INOTIFY
             // Setup inotify so we can disconnect if lircd is restarted
             if ((m_inotify_fd = inotify_init()) >= 0)
             {
@@ -168,6 +174,10 @@
                 }
               }
             }
+#else
+            m_bInitialized = true;
+            CLog::Log(LOGINFO, "LIRC %s: sucessfully started", __FUNCTION__);
+#endif
           }
           else
             CLog::Log(LOGERROR, "LIRC %s: fdopen failed: %s", __FUNCTION__, strerror(errno));
@@ -206,6 +216,7 @@
 }
 
 bool CRemoteControl::CheckDevice() {
+#ifdef HAVE_INOTIFY
   if (m_inotify_fd < 0 || m_inotify_wd < 0)
     return true; // inotify wasn't setup for some reason, assume all is well
   int bufsize = sizeof(struct inotify_event) + PATH_MAX;
@@ -220,6 +231,7 @@
     }
     i += sizeof(struct inotify_event)+e->len;
   }
+#endif
   return true;
 }
 

Lines 1-11 Link Here

(-)xbmc/files/patch-guilib__common__Makefile.in (-11 lines)
1	--- ./guilib/common/Makefile.in.orig 2009-09-01 04:57:16.000000000 +0200
2	+++ ./guilib/common/Makefile.in 2010-12-01 12:17:34.308286578 +0100
3	@@ -4,6 +4,8 @@
4
5	ifeq ($(findstring osx,$(ARCH)), osx)
6	SRCS=SDLJoystick.cpp
7	+else ifeq ($(findstring bsd,$(ARCH)), bsd)
8	+SRCS=SDLJoystick.cpp
9	else
10	SRCS=SDLJoystick.cpp LIRC.cpp
11	endif




 
 /**********************
  * Non-free Components
@@ -134,7 +136,9 @@
 #define HAS_GLX
 #define HAS_LINUX_NETWORK
 #define HAS_SDL_AUDIO
+#if !defined(__FreeBSD__)
 #define HAS_LIRC
+#endif
 #define HAS_SDL_WIN_EVENTS
 #ifdef HAVE_LIBPULSE
 #define HAS_PULSEAUDIO

Lines 1-12 Link Here

(-)xbmc/files/patch-xbmc__lib__libPython__XBPython.cpp (-6 / +21 lines)
1	--- ./xbmc/lib/libPython/XBPython.cpp.orig 2010-10-09 15:00:44.000000000 +0200	1	--- xbmc/lib/libPython/XBPython.cpp.orig 2010-12-17 07:17:41.000000000 +0100
2	+++ ./xbmc/lib/libPython/XBPython.cpp 2010-12-01 12:17:34.246845365 +0100	2	+++ xbmc/lib/libPython/XBPython.cpp 2011-03-07 15:00:17.000000000 +0100
3	@@ -60,6 +60,24 @@	3	@@ -24,7 +24,9 @@
		4	#include "config.h"
		5	#endif
		6	#if (defined USE_EXTERNAL_PYTHON)
		7	- #if (defined HAVE_LIBPYTHON2_6)
		8	+ #if (defined HAVE_LIBPYTHON2_7)
		9	+ #include <python2.7/Python.h>
		10	+ #elif (defined HAVE_LIBPYTHON2_6)
		11	#include <python2.6/Python.h>
		12	#elif (defined HAVE_LIBPYTHON2_5)
		13	#include <python2.5/Python.h>
		14	@@ -60,6 +62,28 @@
4	#else	15	#else
5	#define PYTHON_DLL "special://xbmcbin/system/python/python24-x86-osx.so"	16	#define PYTHON_DLL "special://xbmcbin/system/python/python24-x86-osx.so"
6	#endif	17	#endif
7	+#elif defined(__FreeBSD__)	18	+#elif defined(__FreeBSD__)
8	+#if defined(__x86_64__)	19	+#if defined(__x86_64__)
9	+#if defined(HAVE_LIBPYTHON2_6)	20	+#if defined(HAVE_LIBPYTHON2_7)
		21	+#define PYTHON_DLL "special://xbmcbin/system/python/python27-x86_64-freebsd.so"
		22	+#elif defined(HAVE_LIBPYTHON2_6)
10	+#define PYTHON_DLL "special://xbmcbin/system/python/python26-x86_64-freebsd.so"	23	+#define PYTHON_DLL "special://xbmcbin/system/python/python26-x86_64-freebsd.so"
11	+#elif defined(HAVE_LIBPYTHON2_5)	24	+#elif defined(HAVE_LIBPYTHON2_5)
12	+#define PYTHON_DLL "special://xbmcbin/system/python/python25-x86_64-freebsd.so"	25	+#define PYTHON_DLL "special://xbmcbin/system/python/python25-x86_64-freebsd.so"
Lines 14-20 Link Here
14	+#define PYTHON_DLL "special://xbmcbin/system/python/python24-x86_64-freebsd.so"	27	+#define PYTHON_DLL "special://xbmcbin/system/python/python24-x86_64-freebsd.so"
15	+#endif	28	+#endif
16	+#else /* !__x86_64__ */	29	+#else /* !__x86_64__ */
17	+#if defined(HAVE_LIBPYTHON2_6)	30	+#if defined(HAVE_LIBPYTHON2_7)
		31	+#define PYTHON_DLL "special://xbmcbin/system/python/python27-x86-freebsd.so"
		32	+#elif defined(HAVE_LIBPYTHON2_6)
18	+#define PYTHON_DLL "special://xbmcbin/system/python/python26-x86-freebsd.so"	33	+#define PYTHON_DLL "special://xbmcbin/system/python/python26-x86-freebsd.so"
19	+#elif defined(HAVE_LIBPYTHON2_5)	34	+#elif defined(HAVE_LIBPYTHON2_5)
20	+#define PYTHON_DLL "special://xbmcbin/system/python/python25-x86-freebsd.so"	35	+#define PYTHON_DLL "special://xbmcbin/system/python/python25-x86-freebsd.so"
Lines 25-31 Link Here
25	#elif defined(__x86_64__)	40	#elif defined(__x86_64__)
26	#if (defined HAVE_LIBPYTHON2_6)	41	#if (defined HAVE_LIBPYTHON2_6)
27	#define PYTHON_DLL "special://xbmcbin/system/python/python26-x86_64-linux.so"	42	#define PYTHON_DLL "special://xbmcbin/system/python/python26-x86_64-linux.so"
28	@@ -443,7 +461,7 @@	43	@@ -443,7 +467,7 @@
29		44
30	// first free all dlls loaded by python, after that python24.dll (this is done by UnloadPythonDlls	45	// first free all dlls loaded by python, after that python24.dll (this is done by UnloadPythonDlls
31	DllLoaderContainer::UnloadPythonDlls();	46	DllLoaderContainer::UnloadPythonDlls();




--- xbmc/lib/libPython/linux/Makefile.in.orig	2010-12-17 07:17:41.000000000 +0100
+++ xbmc/lib/libPython/linux/Makefile.in	2011-03-07 14:55:55.000000000 +0100
@@ -2,10 +2,13 @@
 CC=@CC@
 CFLAGS=@CFLAGS@
 LDFLAGS=@LDFLAGS@

+SHELL=/bin/sh
 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)

Return to bug 155403

Lines 7-13 Link Here

(-)xbmc/Makefile (-3 / +48 lines)
7		7
8	PORTNAME= xbmc	8	PORTNAME= xbmc
9	PORTVERSION= 10.0	9	PORTVERSION= 10.0
10	PORTREVISION= 4	10	PORTREVISION= 5
11	CATEGORIES= multimedia	11	CATEGORIES= multimedia
12	MASTER_SITES= http://mirrors.xbmc.org/releases/source/	12	MASTER_SITES= http://mirrors.xbmc.org/releases/source/
13		13
Lines 69-75 Link Here
69	USE_GL= glu	69	USE_GL= glu
70	USE_SDL= image mixer sdl	70	USE_SDL= image mixer sdl
71	USE_MYSQL= yes	71	USE_MYSQL= yes
72	USE_PYTHON= 2.5-2.6	72	USE_PYTHON= 2.5-2.7
73	MAKE_JOBS_SAFE= yes	73	MAKE_JOBS_SAFE= yes
74	NOPRECIOUSMAKEVARS= yes	74	NOPRECIOUSMAKEVARS= yes
75	INSTALLS_ICONS= yes	75	INSTALLS_ICONS= yes
Lines 85-90 Link Here
85	LIBBLURAY "Enable libbluray support" on \	85	LIBBLURAY "Enable libbluray support" on \
86	FAAC "Enable FAAC support" off \	86	FAAC "Enable FAAC support" off \
87	HAL "Enable HAL support" on \	87	HAL "Enable HAL support" on \
		88	LIRC "Enable lirc support" off \
88	MMS "Enable mms:// & mmsh:// support" on \	89	MMS "Enable mms:// & mmsh:// support" on \
89	NONFREE "Enable non-free components (rar, ccx, ffmpeg)" off \	90	NONFREE "Enable non-free components (rar, ccx, ffmpeg)" off \
90	PULSE "Enable PulseAudio support" off \	91	PULSE "Enable PulseAudio support" off \
Lines 146-151 Link Here
146	CONFIGURE_ARGS+= --disable-hal	147	CONFIGURE_ARGS+= --disable-hal
147	.endif	148	.endif
148		149
		150	.if defined(WITH_LIRC)
		151	RUN_DEPENDS+= lirc_client.2:${PORTSDIR}/comms/lirc
		152	.endif
		153
149	.if !defined(WITHOUT_MMS)	154	.if !defined(WITHOUT_MMS)
150	CONFIGURE_ARGS+= --enable-libmms	155	CONFIGURE_ARGS+= --enable-libmms
151	LIB_DEPENDS+= mms.0:${PORTSDIR}/net/libmms	156	LIB_DEPENDS+= mms.0:${PORTSDIR}/net/libmms
Lines 192-198 Link Here
192	.endif	197	.endif
193		198
194	post-patch:	199	post-patch:
195	@${REINPLACE_CMD} -e 's\|#!/bin/bash\|#!/bin/sh\|' ${WRKSRC}/XBMC.xcodeproj/project.pbxproj
196	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \	200	@${REINPLACE_CMD} -e 's\|/usr/local\|${LOCALBASE}\|g' \
197	${WRKSRC}/configure.in \	201	${WRKSRC}/configure.in \
198	${WRKSRC}/lib/enca/configure \	202	${WRKSRC}/lib/enca/configure \
Lines 252-257 Link Here
252	${WRKSRC}/xbmc/screensavers/rsxs-0.9/configure \	256	${WRKSRC}/xbmc/screensavers/rsxs-0.9/configure \
253	${WRKSRC}/xbmc/visualizations/Goom/goom2k4-0/configure \	257	${WRKSRC}/xbmc/visualizations/Goom/goom2k4-0/configure \
254	${WRKSRC}/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure	258	${WRKSRC}/xbmc/visualizations/Goom/goom2k4-0/gtk-gui-devel/configure
		259	@${REINPLACE_CMD} -e "s;python2\.6;${PYTHON_VERSION};" \
		260	-e "s;HAVE_LIBPYTHON2_6;HAVE_LIB${PYTHON_VERSION:U:S/./_/g};" \
		261	${WRKSRC}/xbmc/lib/libPython/XBPyThread.cpp \
		262	${WRKSRC}/xbmc/lib/libPython/XBPyThread.h \
		263	${WRKSRC}/xbmc/lib/libPython/XBPythonDll.cpp \
		264	${WRKSRC}/xbmc/lib/libPython/XBPythonDllFuncs.S \
		265	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/GUIPythonWindow.h \
		266	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/PythonAddon.h \
		267	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/PythonPlayer.h \
		268	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/action.h \
		269	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/control.h \
		270	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlbutton.cpp \
		271	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlcheckmark.cpp \
		272	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlfadelabel.cpp \
		273	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlgroup.cpp \
		274	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlimage.cpp \
		275	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controllabel.cpp \
		276	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controllist.cpp \
		277	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlprogress.cpp \
		278	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlradiobutton.cpp \
		279	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlslider.cpp \
		280	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controlspin.cpp \
		281	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/controltextbox.cpp \
		282	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/dialog.cpp \
		283	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/dialog.h \
		284	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/infotagmusic.h \
		285	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/infotagvideo.h \
		286	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/keyboard.h \
		287	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/listitem.cpp \
		288	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/listitem.h \
		289	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/player.h \
		290	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/pyplaylist.cpp \
		291	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/pyplaylist.h \
		292	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/pyutil.h \
		293	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/window.h \
		294	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/winxml.cpp \
		295	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/winxml.h \
		296	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/winxmldialog.cpp \
		297	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/xbmcaddonmodule.cpp \
		298	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/xbmcguimodule.cpp \
		299	${WRKSRC}/xbmc/lib/libPython/xbmcmodule/xbmcmodule.cpp
255		300
256	pre-configure:	301	pre-configure:
257	cd ${WRKSRC} && ./bootstrap	302	cd ${WRKSRC} && ./bootstrap

Line 0 Link Here

(-)xbmc/files/patch-guilib__common__LIRC.cpp (+67 lines)
		1	--- guilib/common/LIRC.cpp.orig 2011-03-07 14:16:12.000000000 +0100
		2	+++ guilib/common/LIRC.cpp 2011-03-07 14:11:31.000000000 +0100
		3	@@ -19,11 +19,14 @@
		4	*
		5	*/
		6
		7	+#include "config.h"
		8	#include <sys/time.h>
		9	#include <sys/types.h>
		10	#include <sys/socket.h>
		11	#include <sys/un.h>
		12	+#ifdef HAVE_INOTIFY
		13	#include <sys/inotify.h>
		14	+#endif
		15	#include <limits.h>
		16	#include <unistd.h>
		17	#include "LIRC.h"
		18	@@ -92,12 +95,14 @@
		19	close(m_fd);
		20	m_fd = -1;
		21	m_file = NULL;
		22	+#ifdef HAVE_INOTIFY
		23	if (m_inotify_wd >= 0) {
		24	inotify_rm_watch(m_inotify_fd, m_inotify_wd);
		25	m_inotify_wd = -1;
		26	}
		27	if (m_inotify_fd >= 0)
		28	close(m_inotify_fd);
		29	+#endif
		30
		31	m_inReply = false;
		32	m_nrSending = 0;
		33	@@ -148,6 +153,7 @@
		34	{
		35	if ((m_file = fdopen(m_fd, "r+")) != NULL)
		36	{
		37	+#ifdef HAVE_INOTIFY
		38	// Setup inotify so we can disconnect if lircd is restarted
		39	if ((m_inotify_fd = inotify_init()) >= 0)
		40	{
		41	@@ -168,6 +174,10 @@
		42	}
		43	}
		44	}
		45	+#else
		46	+ m_bInitialized = true;
		47	+ CLog::Log(LOGINFO, "LIRC %s: sucessfully started", __FUNCTION__);
		48	+#endif
		49	}
		50	else
		51	CLog::Log(LOGERROR, "LIRC %s: fdopen failed: %s", __FUNCTION__, strerror(errno));
		52	@@ -206,6 +216,7 @@
		53	}
		54
		55	bool CRemoteControl::CheckDevice() {
		56	+#ifdef HAVE_INOTIFY
		57	if (m_inotify_fd < 0 \|\| m_inotify_wd < 0)
		58	return true; // inotify wasn't setup for some reason, assume all is well
		59	int bufsize = sizeof(struct inotify_event) + PATH_MAX;
		60	@@ -220,6 +231,7 @@
		61	}
		62	i += sizeof(struct inotify_event)+e->len;
		63	}
		64	+#endif
65	return true;
66	}
67

Lines 10-22 Link Here

(-)xbmc/files/patch-guilib__system.h (-10 lines)
10		10
11	/**********************	11	/**********************
12	* Non-free Components	12	* Non-free Components
13	@@ -134,7 +136,9 @@
14	#define HAS_GLX
15	#define HAS_LINUX_NETWORK
16	#define HAS_SDL_AUDIO
17	+#if !defined(__FreeBSD__)
18	#define HAS_LIRC
19	+#endif
20	#define HAS_SDL_WIN_EVENTS
21	#ifdef HAVE_LIBPULSE
22	#define HAS_PULSEAUDIO

Lines 1-6 Link Here

(-)xbmc/files/patch-xbmc__lib__libPython__linux__Makefile.in (-4 / +11 lines)
1	--- ./xbmc/lib/libPython/linux/Makefile.in.orig 2010-07-11 23:22:04.000000000 +0200	1	--- xbmc/lib/libPython/linux/Makefile.in.orig 2010-12-17 07:17:41.000000000 +0100
2	+++ ./xbmc/lib/libPython/linux/Makefile.in 2010-12-01 12:17:34.245845263 +0100	2	+++ xbmc/lib/libPython/linux/Makefile.in 2011-03-07 14:55:55.000000000 +0100
3	@@ -2,7 +2,7 @@	3	@@ -2,10 +2,13 @@
4	CC=@CC@	4	CC=@CC@
5	CFLAGS=@CFLAGS@	5	CFLAGS=@CFLAGS@
6	LDFLAGS=@LDFLAGS@	6	LDFLAGS=@LDFLAGS@
Lines 8-11 Link Here
8	+SHELL=/bin/sh	8	+SHELL=/bin/sh
9	SYSDIR=../../../../system/python	9	SYSDIR=../../../../system/python
10		10
11	ifeq (@USE_PYTHON2_6@,1)	11	-ifeq (@USE_PYTHON2_6@,1)
		12	+ifeq (@USE_PYTHON2_7@,1)
		13	+ PYVERSION=python2.7
		14	+ SO=python27-$(ARCH).so
		15	+else ifeq (@USE_PYTHON2_6@,1)
		16	PYVERSION=python2.6
		17	SO=python26-$(ARCH).so
		18	else ifeq (@USE_PYTHON2_5@,1)