xbmc 10.0 version bump

4 files changed, 205 insertions, 1 deletions

diff --git a/media-tv/xbmc/ChangeLog b/media-tv/xbmc/ChangeLog
index d236ffd..9cb801d 100644
--- a/media-tv/xbmc/ChangeLog
+++ b/media-tv/xbmc/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/media-tv/xbmc/ChangeLog,v 1.64 2010/08/14 17:56:24 vapier Exp $
 
+*xbmc-10.0 (19 Dec 2010)
+
+  19 Dec 2010; Domen Kozar <domen@dev.si> +xbmc-10.0.ebuild,
+  +files/xbmc-10.0-httpd_disable-ipv6.patch:
+  10.0 version bump
+
   17 Sep 2010; Domen Kožar <domen@dev.si> +xbmc-9999.ebuild:
   Add trunk ebuild
 
diff --git a/media-tv/xbmc/Manifest b/media-tv/xbmc/Manifest
index 2a54511..bba89b9 100644
--- a/media-tv/xbmc/Manifest
+++ b/media-tv/xbmc/Manifest
@@ -1,3 +1,4 @@
+AUX xbmc-10.0-httpd_disable-ipv6.patch 747 RMD160 6665021e15c32854a05a9de3bceb4429a0d4afba SHA1 47f2611861cc57500665b53d7f32dde10f24a1c6 SHA256 dde2a8a1b2c50d1c0d92165b43956459b19d1c4118e1b0ed01c4960cba638fd6
 AUX xbmc-9.11-TexturePacker-parallel-build.patch 357 RMD160 37802ec3ce31d10d58802acf267aaf568d3ef8d0 SHA1 5909a4a61e1dbac3f51c6a8c393f1d4cfd7a38ca SHA256 a9b990cdd5473e72cc83cda36cc9faaf67e97649cec45af9c529455464b12d43
 AUX xbmc-9.11-jpeg-speedup.patch 804 RMD160 2aff1749ee8f4b85ce9199a78fcfb779c373d086 SHA1 ecef76650156b7fcba60f909496e43ae83bafd20 SHA256 3115b8668b60e307536a9314fc02c837d4f94f89571d403761b614a22447e2d8
 AUX xbmc-9.11-libpng14.patch 4263 RMD160 90a82d1783f2237416c0932c968347394f303bf9 SHA1 69407df931476df7fd20b30ddc42142d11602d8f SHA256 0516a466f2646867478781251d665e87f6f0697fcd9ce29b91c87194fafc7da6
@@ -5,7 +6,9 @@ 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-9.11.tar.gz 141420517 RMD160 0d0890ba373e05af95a66360aed8871b384849f2 SHA1 71956ed8630d46662e49de9d96304308078f10b5 SHA256 e810aaaf1c380bbe923d9e30e2e472577081b7b893e12a7ef4bb70a911c3db87
+DIST xbmc-Dharma_beta3.tar.gz 129068154 RMD160 3a03bb282ed38e456c40693dbef02a7c229d1b97 SHA1 1c6126449e304836ff4e358b06008241d3eda3a9 SHA256 12c3e5a771f535f86c7b60f8d8523eb932ba1e5c8e1b846ba0b9cc803e5d715f
+EBUILD xbmc-10.0.ebuild 4553 RMD160 03bc42dd4d051426d7dc06d2f14051aafd96ec34 SHA1 00167dbd6242cdd80bd6e34b0bb81f3bf961bb1d SHA256 6a16ecd21f72c40729f727cfcedbc66792ea64c7c9dd7c0db9c47b86443e70df
 EBUILD xbmc-9.11-r5.ebuild 5824 RMD160 36c46814ddc15ed664517433cd6e87e222242f3d SHA1 ef4bfd04a2e8dd148d911aff25eb91a8afc8fbc3 SHA256 30440e4d97b31df01bb739aad196f9a8e35d8a3292235f5c6144a8489961f928
 EBUILD xbmc-9999.ebuild 5139 RMD160 127cd5c05f12a6c396e186554a0c94165a72faa2 SHA1 4c653349dd69262e4aec90390f5d7ac55e14fd03 SHA256 43a3dcaa247ced130f1bbd78aee8c5d0d1af9fe06b78de4df96ce38ba7440f5b
-MISC ChangeLog 11209 RMD160 5e292c52465767b598856171c7c2375f0a73bcae SHA1 a69bf88037b297f3d156fc53fc69b7d26de2facb SHA256 734d4710ab37cda8af299e845f0d162e30441d0182296f909504edef2c68664a
+MISC ChangeLog 11362 RMD160 1d70de3bffa2afe6486d2846476c9de83e38ff4e SHA1 311db703c0f2a8c7b3334dd51977e28748221c74 SHA256 34a381ec981dacbe4e08e19e5f14e54a4685264cc5221f9fd10b7e498929bf05
 MISC metadata.xml 579 RMD160 cf1a05346b2c33147e752be840dfb562726b42dd SHA1 0fabb20c84367962605b88b9030fabf6acf3045d SHA256 f61dd5617b99b9fa5505269e6633d317f90a2c6903108bdcc84370cfb8858afb
diff --git a/media-tv/xbmc/files/xbmc-10.0-httpd_disable-ipv6.patch b/media-tv/xbmc/files/xbmc-10.0-httpd_disable-ipv6.patch
new file mode 100644
index 0000000..6dbb0f9
--- /dev/null
+++ b/media-tv/xbmc/files/xbmc-10.0-httpd_disable-ipv6.patch
@@ -0,0 +1,12 @@
+diff -urN Dharma_beta2/xbmc/utils/WebServer.cpp Dharma_beta2-patched/xbmc/utils/WebServer.cpp
+--- Dharma_beta2/xbmc/utils/WebServer.cpp	2010-09-14 14:30:12.000000000 +0930
++++ Dharma_beta2-patched/xbmc/utils/WebServer.cpp	2010-09-16 22:47:02.000000000 +0930
+@@ -357,7 +357,7 @@
+     // MHD_USE_THREAD_PER_CONNECTION = one thread per connection
+     // MHD_USE_SELECT_INTERNALLY = use main thread for each connection, can only handle one request at a time [unless you set the thread pool size]
+ 
+-    m_daemon = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY | MHD_USE_IPv6,
++    m_daemon = MHD_start_daemon(MHD_USE_SELECT_INTERNALLY,
+                                 port,
+                                 NULL,
+                                 NULL,
diff --git a/media-tv/xbmc/xbmc-10.0.ebuild b/media-tv/xbmc/xbmc-10.0.ebuild
new file mode 100644
index 0000000..65e5655
--- /dev/null
+++ b/media-tv/xbmc/xbmc-10.0.ebuild
@@ -0,0 +1,183 @@
+EAPI="2"
+
+inherit autotools eutils python flag-o-matic
+
+SRC_URI="http://xbmc.svn.sourceforge.net/viewvc/xbmc/tags/Dharma_beta3/?view=tar -> ${PN}-Dharma_beta3.tar.gz"
+KEYWORDS="~amd64 ~x86"
+S=${WORKDIR}/Dharma_beta3
+
+DESCRIPTION="XBMC is a free and open source media-player and entertainment hub"
+HOMEPAGE="http://xbmc.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="aac alsa altivec avahi bluray css debug hal httpd joystick midi profile pulseaudio sse sse2 vdpau xrandr"
+
+RDEPEND="virtual/opengl
+	app-arch/bzip2
+	app-arch/unrar
+	app-arch/unzip
+	app-arch/zip
+	app-i18n/enca
+	dev-libs/boost
+	dev-libs/fribidi
+	dev-libs/libcdio[-minimal]
+	dev-libs/libpcre
+	dev-libs/lzo
+	>=dev-python/pysqlite-2
+	media-libs/a52dec
+	media-libs/alsa-lib
+	aac? ( media-libs/faac )
+	media-libs/faad2
+	media-libs/flac
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/glew
+	media-libs/jasper
+	media-libs/jbigkit
+	virtual/jpeg:0
+	>=media-libs/libass-0.9.7
+	bluray? ( media-libs/libbluray )
+	media-libs/libdca
+	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
+	media-video/rtmpdump
+	avahi? ( net-dns/avahi )
+	httpd? ( 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
+	vdpau? (
+		|| ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 )
+		media-video/ffmpeg[vdpau]
+	)
+	x11-libs/libXinerama
+	xrandr? ( x11-libs/libXrandr )
+	x11-libs/libXrender"
+DEPEND="${RDEPEND}
+	x11-proto/xineramaproto
+	dev-util/cmake
+	x86? ( dev-lang/nasm )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix IPv6 for webserver (trac.xbmc.org/ticket/9052)
+	if use httpd; then
+		epatch "${FILESDIR}/xbmc-10.0-httpd_disable-ipv6.patch" || die
+	fi
+
+	# Fix case sensitivity
+	mv media/Fonts/{a,A}rial.ttf || die
+	mv media/{S,s}plash.png || die
+}
+
+src_prepare() {
+	# some dirs ship generated autotools, some dont
+	local d
+	for d in . xbmc/cores/dvdplayer/Codecs/libbdnav \
+			xbmc/cores/dvdplayer/Codecs/libdvd/libdvdcss \
+			lib/cpluff; do
+		[[ -d ${d} ]] || continue
+		[[ -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=33778
+
+	# Avoid lsb-release dependency
+	sed -i \
+		-e 's:/usr/bin/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
+
+	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 \
+		--disable-ccache \
+		--disable-optimizations \
+		--enable-external-libraries \
+		--disable-external-python \
+		--enable-goom \
+		$(use_enable avahi) \
+		$(use_enable bluray libbluray) \
+		$(use_enable css dvdcss) \
+		$(use_enable debug) \
+		$(use_enable aac faac) \
+		$(use_enable hal) \
+		$(use_enable httpd webserver) \
+		$(use_enable joystick) \
+		$(use_enable midi mid) \
+		$(use_enable profile profiling) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable vdpau) \
+		$(use_enable xrandr)
+}
+
+src_install() {
+	einstall || die "Install failed!"
+
+	insinto /usr/share/applications
+	doins tools/Linux/xbmc.desktop
+	doicon tools/Linux/xbmc-48x48.png
+
+	dodoc {README.linux,LICENSE.GPL,*.txt}
+
+	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
+
+	rm ${D}/usr/share/icons/hicolor/icon-theme.cache
+}
+
+pkg_postinst() {
+	elog "Visit http://xbmc.org/wiki/?title=XBMC_Online_Manual"
+}