Version bump #358473 by BT.

Package-Manager: portage-2.2.0_alpha26/cvs/Linux x86_64

3 files changed, 214 insertions, 7 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index e429c2d31e30..204d6aad7653 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-tv/xbmc
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.85 2011/03/01 02:46:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.86 2011/03/12 08:33:47 vapier Exp $
+
+*xbmc-10.1 (12 Mar 2011)
+
+  12 Mar 2011; Mike Frysinger <vapier@gentoo.org> +xbmc-10.1.ebuild:
+  Version bump #358473 by BT.
 
   01 Mar 2011; Mike Frysinger <vapier@gentoo.org> xbmc-9999.ebuild:
   Dont force a52/dts disabling since the pkg no longer offers the options at
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index ed891c5eb186..3a0c752f6c8d 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -11,16 +11,16 @@ AUX xbmc-9.11-shader-upscalers.patch 29024 RMD160 d100a35684cad2a6dea0c6eeb9bfbc
 AUX xbmc-9.11-use-cdio-system-headers-on-non-win32.patch 3623 RMD160 d8b6d48a07265238bc1bd6425c53e7a52a679751 SHA1 1d4d41d00973c4199f866a7988a709a188683403 SHA256 ceb6952025c8baf5bb4eed18380c9bf6022893407f22a3e587eebd657863ab83
 AUX xbmc-9.11-wavpack.patch 2637 RMD160 35a7f5446aaef27ff563da4a8200616fffb66e00 SHA1 0f9a2845a5b9d0b554569f1379af0557b071ef69 SHA256 b09e9072f0a2d4451588c40b0b300611944ba7d4cefbae0c400389ed9f8485dc
 DIST xbmc-10.0.tar.gz 130239951 RMD160 dcb94d89c0cb35e8a4cb021a19f6dec23dd59fb6 SHA1 8752c0c26e872b408b3575d2744fdd812d5775ac SHA256 06fa5332f4f448f4f68bf705e0e159591a866b1cace52840c78ea4f5925a404a
-DIST xbmc-9.11.tar.gz 141420517 RMD160 0d0890ba373e05af95a66360aed8871b384849f2 SHA1 71956ed8630d46662e49de9d96304308078f10b5 SHA256 e810aaaf1c380bbe923d9e30e2e472577081b7b893e12a7ef4bb70a911c3db87
+DIST xbmc-10.1.tar.gz 130187822 RMD160 a4ddb06b396b8ae437bf30bea5b44396b54ebc5b SHA1 7a9f4e2c18a23d687ecfc744f2e051e4f88ef01a SHA256 3403195b7eb1d076523f2394793b7f050df00743892b031f6fea86b998559d8a
 EBUILD xbmc-10.0.ebuild 5206 RMD160 d963ead4cfd3a4e7cbcf14e3dd3bca54a643be8f SHA1 3da1820b4482ce83e71ef5ddb6fbf13a7ef0427f SHA256 32067920e3d72d6800ca8fa825e668732d29e403e140f1429be439825385a8f2
-EBUILD xbmc-9.11-r5.ebuild 5779 RMD160 1a265ae46513752f49c6dde799243cb6f4362b2f SHA1 eae50379a60e5e21019052d765909161901dcf94 SHA256 049b2ac830aef3709d2c1eea5198ad8b6fd5573d9779ee6d005de26e6fe835c6
+EBUILD xbmc-10.1.ebuild 5211 RMD160 cf972924ae08873ce5397255a9b8cbb841a4bc6e SHA1 e3bbcf2415aca386def922110001eb247ed2b441 SHA256 4669c25c118fb63160b6013cf4481791d78cb1631c3f157f573287eb49ea571e
 EBUILD xbmc-9999.ebuild 4915 RMD160 d1b44b1e3cc59f24b239742f73a458aaff260e06 SHA1 0eb223531f3039e2a105c743cfb36c461c48e828 SHA256 acf4ff84f777434043bc70178c04b6e5bc9f9e5b45965a13237e07e39e38fc4c
-MISC ChangeLog 13736 RMD160 bd74f45e62ad4237bcd16426058bdce977b3200c SHA1 30e12697fb10ac5ab407d119311e5658280dbca2 SHA256 ad82e49ab206c302a93eb2989089d7bcafafd705322706419c09f13d89be63c1
+MISC ChangeLog 13862 RMD160 cbfe59f955dc25e98f9b7b38101e34ca0eeb98a6 SHA1 a03d8009074ef1303368a924f9beb2dd50f868a8 SHA256 3b86e51e77cd74ca0c8707d504f9d4a604df2a055e432e3d069efbb18c72232f
 MISC metadata.xml 646 RMD160 e94131de5980a6f435c16f40ae772938d0844db1 SHA1 b1ef02535947638e70e01bb6fa91915f28e2795b SHA256 9bbbd6928abe328028892131aeb27b4ad3db7822236209e0110aa31dca7554b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk1sXckACgkQaC/OocHi7Ja+LwD+J/ZmrHm/xHXEPo8CLaDOjyek
-H1Xz6zN4I52R1TxPL7EA/RqQkIE+OISNg8YJey9gQdt7LQ5BcHCAblmRfLpt1DPB
-=w/iN
+iF4EAREIAAYFAk17L/AACgkQaC/OocHi7JaY4AD8C3RtleOwGKNGStKFCiRvWy8c
++XP8laD11uwZ3FH4BYMA/0DOxgCOmXtfCVh3ecHvCT2IaReeTpscl1g9x+EFWt61
+=PMV4
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xbmc/xbmc-10.1.ebuild b/media-tv/xbmc/xbmc-10.1.ebuild
new file mode 100644
index 000000000000..6930ee631731
--- /dev/null
+++ b/media-tv/xbmc/xbmc-10.1.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/xbmc-10.1.ebuild,v 1.1 2011/03/12 08:33:47 vapier Exp $
+
+EAPI="2"
+
+inherit eutils python
+
+# Use XBMC_ESVN_REPO_URI to track a different branch
+ESVN_REPO_URI=${XBMC_ESVN_REPO_URI:-http://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk}
+ESVN_PROJECT=${ESVN_REPO_URI##*/svnroot/}
+ESVN_PROJECT=${ESVN_PROJECT%/*}
+if [[ ${PV} == "9999" ]] ; then
+	inherit subversion autotools
+	KEYWORDS=""
+else
+	inherit autotools
+	SRC_URI="http://mirrors.xbmc.org/releases/source/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
+HOMEPAGE="http://xbmc.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="alsa altivec avahi css debug hal joystick midi profile pulseaudio rtmp sse sse2 vaapi vdpau webserver +xrandr"
+
+RDEPEND="virtual/opengl
+	app-arch/bzip2
+	app-arch/unzip
+	app-arch/zip
+	app-i18n/enca
+	dev-libs/boost
+	dev-libs/fribidi
+	dev-libs/libcdio[-minimal]
+	dev-libs/libpcre[cxx]
+	dev-libs/lzo
+	>=dev-python/pysqlite-2
+	media-libs/alsa-lib
+	media-libs/faad2
+	media-libs/flac
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/glew
+	media-libs/jasper
+	media-libs/jbigkit
+	virtual/jpeg
+	>=media-libs/libass-0.9.7
+	css? ( media-libs/libdvdcss )
+	media-libs/libmad
+	media-libs/libmms
+	media-libs/libmodplug
+	media-libs/libmpeg2
+	media-libs/libogg
+	media-libs/libsamplerate
+	media-libs/libsdl[audio,opengl,video,X]
+	alsa? ( media-libs/libsdl[alsa] )
+	media-libs/libvorbis
+	media-libs/sdl-gfx
+	media-libs/sdl-image[gif,jpeg,png]
+	media-libs/sdl-mixer
+	media-libs/sdl-sound
+	media-libs/tiff
+	pulseaudio? ( media-sound/pulseaudio )
+	media-sound/wavpack
+	>=media-video/ffmpeg-0.6
+	rtmp? ( media-video/rtmpdump )
+	avahi? ( net-dns/avahi )
+	webserver? ( net-libs/libmicrohttpd )
+	net-misc/curl
+	|| ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.3 )
+	sys-apps/dbus
+	hal? ( sys-apps/hal )
+	sys-libs/zlib
+	virtual/mysql
+	x11-apps/xdpyinfo
+	x11-apps/mesa-progs
+	vaapi? ( x11-libs/libva )
+	vdpau? (
+		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
+		media-video/ffmpeg[vdpau]
+	)
+	x11-libs/libXinerama
+	xrandr? ( x11-libs/libXrandr )
+	x11-libs/libXrender"
+# The cpluff bundled addon uses gettext which needs CVS ...
+DEPEND="${RDEPEND}
+	dev-util/gperf
+	dev-vcs/cvs
+	x11-proto/xineramaproto
+	dev-util/cmake
+	x86? ( dev-lang/nasm )"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		subversion_src_unpack
+		cd "${S}"
+		rm -f configure
+	else
+		unpack ${A}
+		cd "${S}"
+	fi
+
+	# Fix case sensitivity
+	mv media/Fonts/{a,A}rial.ttf || die
+	mv media/{S,s}plash.png || die
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-10.0-python-2.7.patch #350098
+
+	# some dirs ship generated autotools, some dont
+	local d
+	for d in . xbmc/cores/dvdplayer/Codecs/{libdts,libdvd/lib*/} lib/cpluff ; do
+		[[ -e ${d}/configure ]] && continue
+		pushd ${d} >/dev/null
+		einfo "Generating autotools in ${d}"
+		eautoreconf
+		popd >/dev/null
+	done
+
+	local squish #290564
+	use altivec && squish="-DSQUISH_USE_ALTIVEC=1 -maltivec"
+	use sse && squish="-DSQUISH_USE_SSE=1 -msse"
+	use sse2 && squish="-DSQUISH_USE_SSE=2 -msse2"
+	sed -i \
+		-e '/^CXXFLAGS/{s:-D[^=]*=.::;s:-m[[:alnum:]]*::}' \
+		-e "1iCXXFLAGS += ${squish}" \
+		xbmc/lib/libsquish/Makefile.in || die
+
+	# Fix XBMC's final version string showing as "exported"
+	# instead of the SVN revision number.
+	export SVN_REV=${ESVN_WC_REVISION:-exported}
+
+	# Avoid lsb-release dependency
+	sed -i \
+		-e 's:lsb_release -d:cat /etc/gentoo-release:' \
+		xbmc/utils/SystemInfo.cpp
+
+	# Do not use termcap #262822
+	sed -i 's:-ltermcap::' xbmc/lib/libPython/Python/configure
+
+	# avoid long delays when powerkit isn't running #348580
+	sed -i \
+		-e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+		xbmc/linux/*.cpp || die
+
+	epatch_user #293109
+
+	# Tweak autotool timestamps to avoid regeneration
+	find . -type f -print0 | xargs -0 touch -r configure
+}
+
+src_configure() {
+	# Disable documentation generation
+	export ac_cv_path_LATEX=no
+	# Avoid help2man
+	export HELP2MAN=$(type -P help2man || echo true)
+
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		--disable-ccache \
+		--disable-optimizations \
+		--enable-external-libraries \
+		--disable-external-python \
+		--enable-goom \
+		--enable-gl \
+		--disable-liba52 \
+		--disable-libdts \
+		$(use_enable avahi) \
+		$(use_enable css dvdcss) \
+		$(use_enable debug) \
+		$(use_enable hal) \
+		$(use_enable joystick) \
+		$(use_enable midi mid) \
+		$(use_enable profile profiling) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable rtmp) \
+		$(use_enable vaapi) \
+		$(use_enable vdpau) \
+		$(use_enable webserver) \
+		$(use_enable xrandr)
+}
+
+src_install() {
+	emake install DESTDIR="${D}" || die
+	dodoc keymapping.txt README.linux
+	rm "${D}"/usr/share/doc/${PF}/{copying.txt,LICENSE.GPL} || die
+
+#	insinto /usr/share/applications
+#	doins tools/Linux/xbmc.desktop
+#	doicon tools/Linux/xbmc.png
+
+	insinto "$(python_get_sitedir)" #309885
+	doins tools/EventClients/lib/python/xbmcclient.py || die
+	newbin "tools/EventClients/Clients/XBMC Send/xbmc-send.py" xbmc-send || die
+}
+
+pkg_postinst() {
+	elog "Visit http://wiki.xbmc.org/?title=XBMC_Online_Manual"
+}