- Update to 11.0b1

- Add fix to build fine with CLANG
- Remove USE_LDCONFIG because xbmc uses hardcoded paths

PR:		ports/163796
Submitted by:	Mickael Maillot <mickael.maillot@gmail.com> (maintainer)

1 files changed, 18 insertions, 133 deletions

diff --git a/multimedia/xbmc/Makefile b/multimedia/xbmc/Makefile
index cf0fa457478b..5cd68283ddb6 100644
--- a/multimedia/xbmc/Makefile
+++ b/multimedia/xbmc/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	xbmc
-PORTVERSION=	10.1
-PORTREVISION=	4
+PORTVERSION=	11.0.b1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://mirrors.xbmc.org/releases/source/
+DISTNAME=	${PORTNAME}-11.0-Eden_beta1
 
 MAINTAINER=	mickael.maillot@gmail.com
 COMMENT=	XBMC is an award winning media center application
@@ -23,9 +23,11 @@ BUILD_DEPENDS=	enca:${PORTSDIR}/converters/enca \
 		zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		nasm:${PORTSDIR}/devel/nasm \
-		dvdread-config:${PORTSDIR}/multimedia/libdvdread
+		dvdread-config:${PORTSDIR}/multimedia/libdvdread \
+		gtk-update-icon-cache:${PORTSDIR}/x11-toolkits/gtk20
 
-LIB_DEPENDS=	asound.2:${PORTSDIR}/audio/alsa-lib	\
+LIB_DEPENDS=	asound.2:${PORTSDIR}/audio/alsa-lib \
+		ass.5:${PORTSDIR}/multimedia/libass \
 		boost_thread.4:${PORTSDIR}/devel/boost-libs \
 		cdio.12:${PORTSDIR}/sysutils/libcdio	\
 		curl.6:${PORTSDIR}/ftp/curl \
@@ -33,24 +35,25 @@ LIB_DEPENDS=	asound.2:${PORTSDIR}/audio/alsa-lib	\
 		enca.5:${PORTSDIR}/converters/enca \
 		GLEW.1:${PORTSDIR}/graphics/glew \
 		avcodec.1:${PORTSDIR}/multimedia/ffmpeg	\
+		FLAC.10:${PORTSDIR}/audio/flac \
 		fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \
 		freetype.9:${PORTSDIR}/print/freetype2 \
 		fribidi.3:${PORTSDIR}/converters/fribidi \
 		lzo2.2:${PORTSDIR}/archivers/lzo2 \
 		jasper.4:${PORTSDIR}/graphics/jasper \
 		jpeg.11:${PORTSDIR}/graphics/jpeg \
-		faad.2:${PORTSDIR}/audio/faad \
 		mad:${PORTSDIR}/audio/libmad \
 		modplug:${PORTSDIR}/audio/libmodplug \
 		mpeg2:${PORTSDIR}/multimedia/libmpeg2 \
 		ogg.7:${PORTSDIR}/audio/libogg \
 		pcre.0:${PORTSDIR}/devel/pcre \
+		plist.1:${PORTSDIR}/devel/libplist \
 		png.6:${PORTSDIR}/graphics/png \
 		samplerate.1:${PORTSDIR}/audio/libsamplerate \
 		smbclient.0:${PORTSDIR}/net/samba-libsmbclient	\
 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
 		vorbis.4:${PORTSDIR}/audio/libvorbis \
-		wavpack.2:${PORTSDIR}/audio/wavpack
+		yajl:${PORTSDIR}/devel/yajl
 
 RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins \
 		${PYTHON_SITELIBDIR}/_sqlite3.so:${PORTSDIR}/databases/py-sqlite3 \
@@ -63,28 +66,22 @@ USE_GMAKE=	yes
 USE_GNOME=	pkgconfig
 USE_AUTOTOOLS=	autoconf libtool automake libltdl
 GNU_CONFIGURE=	yes
-USE_XORG=	xinerama xt xmu xrandr xtst
+USE_XORG=	xt xmu xrandr xtst
 USE_GL=		glu
 USE_SDL=	image mixer sdl
 USE_MYSQL=	yes
-USE_PYTHON=	2.5-2.7
+USE_PYTHON=	2.5+
 MAKE_JOBS_SAFE=	yes
 NOPRECIOUSMAKEVARS=	yes
 INSTALLS_ICONS=	yes
 ONLY_FOR_ARCHS=	i386 amd64
-USE_LDCONFIG=	${PREFIX}/lib/xbmc/system \
-		${PREFIX}/lib/xbmc/system/players/dvdplayer \
-		${PREFIX}/lib/xbmc/system/players/paplayer
 
-USE_DOS2UNIX=	xbmc/lib/libid3tag/libid3tag/compat.gperf
 PLIST_SUB+=	PYVER="${PYTHON_VERSION:S/python//:S/.//g}"
 
 OPTIONS=	AVAHI		"Enable Avahi support"			on \
 		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 \
 		RTMP		"RTMP support via librtmp"		off \
@@ -99,10 +96,7 @@ DESKTOP_ENTRIES="XBMC" \
 		"AudioVideo;Video;" \
 		true
 
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
-
-CONFIGURE_ARGS+=	--enable-external-libraries
+CONFIGURE_ARGS+=	--disable-nfs
 
 .include <bsd.port.pre.mk>
 
@@ -132,13 +126,6 @@ LIB_DEPENDS+=	bluray.0:${PORTSDIR}/multimedia/libbluray
 CONFIGURE_ARGS+=	--disable-libbluray
 .endif
 
-.if defined(WITH_FAAC)
-CONFIGURE_ARGS+=	--enable-faac
-LIB_DEPENDS+=	faac.0:${PORTSDIR}/audio/faac
-.else
-CONFIGURE_ARGS+=	--disable-faac
-.endif
-
 .if !defined(WITHOUT_HAL)
 CONFIGURE_ARGS+=	--enable-hal
 LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
@@ -150,13 +137,6 @@ CONFIGURE_ARGS+=	--disable-hal
 RUN_DEPENDS+=	lircd:${PORTSDIR}/comms/lirc
 .endif
 
-.if !defined(WITHOUT_MMS)
-CONFIGURE_ARGS+=	--enable-libmms
-LIB_DEPENDS+=	mms.0:${PORTSDIR}/net/libmms
-.else
-CONFIGURE_ARGS+=	--disable-libmms
-.endif
-
 .if defined(WITH_NONFREE)
 CONFIGURE_ARGS+=	--enable-non-free
 NO_CDROM=	Restricted binary distribution
@@ -202,107 +182,12 @@ CONFIGURE_ARGS+=	--disable-webserver
 PLIST_SUB+=	HTTPD="@comment "
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \
-		${WRKSRC}/configure.in \
-		${WRKSRC}/lib/enca/configure \
-		${WRKSRC}/lib/freetype/builds/unix/configure \
-		${WRKSRC}/lib/fribidi/configure \
-		${WRKSRC}/lib/libcdio/configure \
-		${WRKSRC}/lib/libcdio/libcdio.pc \
-		${WRKSRC}/lib/libcdio/libcdio_cdda.pc \
-		${WRKSRC}/lib/libcdio/libiso9660.pc \
-		${WRKSRC}/lib/libiconv/Makefile.in \
-		${WRKSRC}/lib/libiconv/configure \
-		${WRKSRC}/lib/libiconv/lib/Makefile.in \
-		${WRKSRC}/lib/libiconv/libcharset/Makefile.in \
-		${WRKSRC}/lib/libiconv/libcharset/configure \
-		${WRKSRC}/lib/libiconv/libcharset/lib/Makefile.in \
-		${WRKSRC}/lib/libiconv/man/Makefile.in \
-		${WRKSRC}/lib/libiconv/preload/Makefile.in \
-		${WRKSRC}/lib/libiconv/preload/configure \
-		${WRKSRC}/lib/libiconv/src/Makefile.in \
-		${WRKSRC}/lib/liblame/configure \
-		${WRKSRC}/lib/libmicrohttpd/configure \
-		${WRKSRC}/lib/libmodplug/configure \
-		${WRKSRC}/lib/libmodplug/src/load_pat.cpp \
-		${WRKSRC}/lib/pcre/configure \
-		${WRKSRC}/xbmc/cores/dvdplayer/Codecs/ffmpeg/configure \
-		${WRKSRC}/xbmc/cores/dvdplayer/Codecs/liba52/configure \
-		${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libdts/configure \
-		${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/configure.ac \
-		${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/configure2 \
-		${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdnav/doc/doxy.conf \
-		${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/configure.ac \
-		${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libdvd/libdvdread/configure2 \
-		${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libfaad2/configure \
-		${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libmad/configure \
-		${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libmpeg2/configure \
-		${WRKSRC}/xbmc/cores/dvdplayer/Codecs/libmpeg2/test/compile \
-		${WRKSRC}/xbmc/cores/paplayer/FLACCodec/flac-1.2.1/configure \
-		${WRKSRC}/xbmc/cores/paplayer/SIDCodec/libsidplay/unix/libsidplay2.pc \
-		${WRKSRC}/xbmc/cores/paplayer/asap/Makefile.in \
-		${WRKSRC}/xbmc/cores/paplayer/timidity/configure.in \
-		${WRKSRC}/xbmc/cores/paplayer/vorbisfile/libvorbis/configure \
-		${WRKSRC}/xbmc/cores/paplayer/vorbisfile/ogg/configure \
-		${WRKSRC}/xbmc/lib/UnrarXLib/pathfn.cpp \
-		${WRKSRC}/xbmc/lib/cximage-6.0/zlib/Makefile.in \
-		${WRKSRC}/xbmc/lib/cximage-6.0/zlib/configure \
-		${WRKSRC}/xbmc/lib/libPython/Python/configure.in \
-		${WRKSRC}/xbmc/lib/libPython/Python/setup.py \
-		${WRKSRC}/xbmc/lib/libUPnP/Neptune/ThirdParty/axTLS/config/config.h \
-		${WRKSRC}/xbmc/lib/libapetag/configure \
-		${WRKSRC}/xbmc/lib/libid3tag/libid3tag/configure \
-		${WRKSRC}/xbmc/lib/libid3tag/zlib/Makefile \
-		${WRKSRC}/xbmc/lib/libid3tag/zlib/Makefile.in \
-		${WRKSRC}/xbmc/lib/libid3tag/zlib/configure \
-		${WRKSRC}/xbmc/lib/libmms/glib-2.20.4/glib/gutils.c \
-		${WRKSRC}/xbmc/lib/libsamplerate/configure \
-		${WRKSRC}/xbmc/lib/libsquish/config \
-		${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
+.if ${CC} == "clang" || ${CXX} == "clang++"
+CONFIGURE_ARGS+=	--disable-rsxs
+PLIST_SUB+=	RSXS="@comment "
+.else
+PLIST_SUB+=	RSXS=""
+.endif
 
 pre-configure:
 	cd ${WRKSRC} && ./bootstrap