add patches for bug #205299, atighten deps on ffmpeg because it will not work with swscaler

Package-Manager: portage-2.1.4

4 files changed, 332 insertions, 8 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 2e9e6c594adf..0bea976408c4 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.289 2008/01/28 19:35:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.290 2008/01/28 21:17:39 aballier Exp $
+
+*vlc-0.8.6d-r1 (28 Jan 2008)
+
+  28 Jan 2008; Alexis Ballier <aballier@gentoo.org> +vlc-0.8.6d-r1.ebuild:
+  add patches for bug #205299, atighten deps on ffmpeg because it will not
+  work with swscaler
 
   28 Jan 2008; Alexis Ballier <aballier@gentoo.org> -vlc-0.8.6c.ebuild:
   remove old
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 5fc8cfbf34d3..b5af2510c169 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -5,8 +5,13 @@ DIST vlc-0.8.6d.tar.bz2 11170003 RMD160 16c1998dbc30ad96bebdd8792d135b5f7899166e
 DIST vlc-m4-1.tar.bz2 1685 RMD160 14775ca0d23a348d0d2809f8fa0a6b86e2f1623f SHA1 0310423bf9157b402f66107c365dd39abedb0d33 SHA256 6feee6c520c8fcfa45c1bcc07475304c7a68d31985bb1b432b5b7b174a277a54
 DIST vlc-patches-45.tar.bz2 5825 RMD160 5aee3bb6679e8e20b685bfef0d4c86b94f7bee15 SHA1 be5c81838f3d8f71cba9768bbfae46507c02dd0f SHA256 2dccd7baec3f977cc8576610c333b1f5b655cd0f50391c3efc2f9069be70ca39
 DIST vlc-patches-46.tar.bz2 10127 RMD160 954918c1819fda22191432baf5ffd8b6f10dc091 SHA1 4013e8bbd963675427880e8df83b26c57c41cf1a SHA256 ec91abf2354f301029f9f7ac730b760de0c46e4ba5240ac5fc7471c1dcd19030
+DIST vlc-patches-47.tar.bz2 13649 RMD160 bdf985702c9cdec41b704f0719bb0cc40d1f1988 SHA1 d02b1897fadeb7b6b467c441b77467008daeca4d SHA256 53bd5a76140f6058468866ec0b48846723882b9adf547c494d1558532a6123fa
 DIST vlc-snapshot-20080117.tar.bz2 13239256 RMD160 2bf60950a2eaa7f961ff9da50aac95cc9d99fb30 SHA1 0d8a49e416cee15959d58875bf4c32a7553ef8e7 SHA256 93b6ada6939b39cd4960079644fa9ca628c6c06abb0dc8272e637d038a5fd8e9
 DIST vlc-snapshot-20080128.tar.bz2 13338438 RMD160 3afdcc37aeac15850da1244a7e61425f213fc8bb SHA1 285a21e7da0093826ec5641d3323eee084a3ac62 SHA256 1e96a4cb1d3488aeb41431bfdbfc1140da7623a0f8202b10290df3dd8ad0e9bd
+EBUILD vlc-0.8.6d-r1.ebuild 8901 RMD160 ac10b3283899cdbbe18534bfa26eb1489fe680d9 SHA1 e80f864423e69a16478b4d8b449b24d0318d144e SHA256 1e6b47f8a592b3dd1fc8f0216c83db4e40fb68574ed5b833a34c5309bd6b821c
+MD5 3f609611466af09fbc513d91be94177b vlc-0.8.6d-r1.ebuild 8901
+RMD160 ac10b3283899cdbbe18534bfa26eb1489fe680d9 vlc-0.8.6d-r1.ebuild 8901
+SHA256 1e6b47f8a592b3dd1fc8f0216c83db4e40fb68574ed5b833a34c5309bd6b821c vlc-0.8.6d-r1.ebuild 8901
 EBUILD vlc-0.8.6d.ebuild 8851 RMD160 9b22436f67120fc78c435e49451637c47c4ab15c SHA1 7a4b7b8714322c2bd107c03e0d649d6e99a3e534 SHA256 54f835354b41eb609049d027847c9e1c9c257c85ea3c4b26dc38831a6d9259ae
 MD5 feda53baaebafc8c986915cec5b5e9fe vlc-0.8.6d.ebuild 8851
 RMD160 9b22436f67120fc78c435e49451637c47c4ab15c vlc-0.8.6d.ebuild 8851
@@ -19,10 +24,10 @@ EBUILD vlc-0.9.0_alpha20080128.ebuild 10256 RMD160 b733693597e8f47737c0ec1e3a54f
 MD5 8fd62487faef6a07e5896377f858d7ea vlc-0.9.0_alpha20080128.ebuild 10256
 RMD160 b733693597e8f47737c0ec1e3a54f0299034db7d vlc-0.9.0_alpha20080128.ebuild 10256
 SHA256 484d2dc024818cbf90e70574c9dfbe1e8a936490d716e467019499cd564b482f vlc-0.9.0_alpha20080128.ebuild 10256
-MISC ChangeLog 50016 RMD160 e3ec3c4e4947ee5b3a570963b036240ce648e25d SHA1 6fd56f49d9afc2f494c03960b0947bfeaf151425 SHA256 a0757529ee7007037ab1137f562b3e13928859de9d541d50c1f0070d3f0b98ea
-MD5 6e99e945607345c357c851c0b04e9e41 ChangeLog 50016
-RMD160 e3ec3c4e4947ee5b3a570963b036240ce648e25d ChangeLog 50016
-SHA256 a0757529ee7007037ab1137f562b3e13928859de9d541d50c1f0070d3f0b98ea ChangeLog 50016
+MISC ChangeLog 50218 RMD160 3e014f34e2ed6d7525523bbbf3ebbc91b2f6364e SHA1 cf4c041686e93165154b9ca14aa6db63186d0864 SHA256 2c6853bcaec82c0fd039ad5458867d2442ea8721935c3c2923dfc055be16c9e7
+MD5 e199655afa5c72fbb8b44297b8535531 ChangeLog 50218
+RMD160 3e014f34e2ed6d7525523bbbf3ebbc91b2f6364e ChangeLog 50218
+SHA256 2c6853bcaec82c0fd039ad5458867d2442ea8721935c3c2923dfc055be16c9e7 ChangeLog 50218
 MISC metadata.xml 225 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d SHA1 1b8ccc849053361ac907dc9b652796defd1ce906 SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5
 MD5 9ef4af14dad87b03fde8e43f19e08d26 metadata.xml 225
 RMD160 6e3fccd1ae62f02a0cb28d319aa185af0020822d metadata.xml 225
@@ -30,6 +35,9 @@ SHA256 1a7f3e805478b42bc379b2a36944579d34d7e66ba5bf418a651e1cd58ad0a7f5 metadata
 MD5 ce5c49344d894b75857eeccc778b2605 files/digest-vlc-0.8.6d 485
 RMD160 6aafcd8a243585c0f85d47a628e2cf416325a388 files/digest-vlc-0.8.6d 485
 SHA256 8b245936c8e34f554c5512c5235400e60170befa591d53d5fd24cf3b8ad9bf80 files/digest-vlc-0.8.6d 485
+MD5 0a62d9d26be212a9442d619bc2c01726 files/digest-vlc-0.8.6d-r1 485
+RMD160 4ca3bb6ee92e06840914a60065fb240c61f34430 files/digest-vlc-0.8.6d-r1 485
+SHA256 c3e864c6b6f0f6d1334dccff3912dbb9f0da5c1dc6f32d552ade732a80390737 files/digest-vlc-0.8.6d-r1 485
 MD5 02cf05695b99b919a76bf2b4a75d724a files/digest-vlc-0.9.0_alpha20080117 738
 RMD160 8280a8b15cfb1decd7a0e451d25bb86d96d010ae files/digest-vlc-0.9.0_alpha20080117 738
 SHA256 f61ce82687c2f9b65ebe6ca6fac2dd816a9035546a44488308623c19c5a3d0b5 files/digest-vlc-0.9.0_alpha20080117 738
@@ -39,7 +47,7 @@ SHA256 27aa183a7caf96e6c00f578b2f18525302af963b93b56494a0358301318ee10a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFHni6cvFcC4BYPU0oRAmGnAKCbfdlCluHxELY5Y6agJ0HwKSYXjACghsA5
-o1S0QiV/JMCTl81Zc5K5oNI=
-=Eahd
+iD8DBQFHnkaAvFcC4BYPU0oRAsnYAJ4s1k4SJwNrQKU/1hZtM8KXH6gviwCfQ8TR
+idpfuPf0qdxIJhMywUJ5z+g=
+=3mYM
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/digest-vlc-0.8.6d-r1 b/media-video/vlc/files/digest-vlc-0.8.6d-r1
new file mode 100644
index 000000000000..c5fa143111ac
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.8.6d-r1
@@ -0,0 +1,6 @@
+MD5 c11e4c38c3347e74ad9004e41208782e vlc-0.8.6d.tar.bz2 11170003
+RMD160 16c1998dbc30ad96bebdd8792d135b5f7899166e vlc-0.8.6d.tar.bz2 11170003
+SHA256 c608ea08d8c6125897164b752f55cba0f35ed57d72f345eb8275b97359e23205 vlc-0.8.6d.tar.bz2 11170003
+MD5 9adf62dcdb8245e6e641876e9406f918 vlc-patches-47.tar.bz2 13649
+RMD160 bdf985702c9cdec41b704f0719bb0cc40d1f1988 vlc-patches-47.tar.bz2 13649
+SHA256 53bd5a76140f6058468866ec0b48846723882b9adf547c494d1558532a6123fa vlc-patches-47.tar.bz2 13649
diff --git a/media-video/vlc/vlc-0.8.6d-r1.ebuild b/media-video/vlc/vlc-0.8.6d-r1.ebuild
new file mode 100644
index 000000000000..4e4ab0f1baf5
--- /dev/null
+++ b/media-video/vlc/vlc-0.8.6d-r1.ebuild
@@ -0,0 +1,304 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.6d-r1.ebuild,v 1.1 2008/01/28 21:17:39 aballier Exp $
+
+WANT_AUTOMAKE=latest
+WANT_AUTOCONF=latest
+
+inherit eutils wxwidgets multilib autotools toolchain-funcs gnome2 nsplugins
+
+MY_PV="${PV/_/-}"
+MY_PV="${MY_PV/-beta/-test}"
+MY_P="${PN}-${MY_PV}"
+
+PATCHLEVEL="47"
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
+
+if [[ "${P}" == *_p* ]]; then # Snapshots
+	SRC_URI="mirror://gentoo/${P}.tar.bz2"
+	MY_P="${P}"
+elif [[ "${MY_P}" == "${P}" ]]; then
+	SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
+else
+	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2"
+fi
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="a52 3dfx debug altivec httpd vlm gnutls live v4l cdda ogg matroska
+dvb dvd vcd dts flac mpeg vorbis theora X opengl truetype svg fbcon svga
+oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc stream
+mp3 xv bidi sdl sdl-image png xml samba daap corba modplug speex shout rtsp
+win32codecs skins hal avahi xinerama cddb directfb upnp nsplugin seamonkey
+optimisememory libnotify jack musepack x264 dc1394 gnome"
+
+RDEPEND="
+		>=media-video/ffmpeg-0.4.9_p20050226-r1
+		<media-video/ffmpeg-0.4.9_p20070616-r1
+		cdda? ( >=dev-libs/libcdio-0.71
+			cddb? ( >=media-libs/libcddb-1.2.0 ) )
+		live? ( >=media-plugins/live-2005.01.29 )
+		dvd? (	media-libs/libdvdread
+				media-libs/libdvdcss
+				>=media-libs/libdvdnav-0.1.9
+				media-libs/libdvdplay )
+		esd? ( media-sound/esound )
+		gnome? ( gnome-base/gnome-vfs )
+		ogg? ( media-libs/libogg )
+		matroska? (
+			>=dev-libs/libebml-0.7.6
+			>=media-libs/libmatroska-0.8.0 )
+		mp3? ( media-libs/libmad )
+		a52? ( >=media-libs/a52dec-0.7.4-r3 )
+		dts? ( || ( media-libs/libdca >=media-libs/libdts-0.0.2-r3 ) )
+		flac? ( media-libs/libogg
+			>=media-libs/flac-1.1.2 )
+		mpeg? ( >=media-libs/libmpeg2-0.3.2 )
+		vorbis? ( media-libs/libvorbis )
+		theora? ( media-libs/libtheora )
+		truetype? ( media-libs/freetype
+			media-fonts/ttf-bitstream-vera )
+		svga? ( media-libs/svgalib )
+		ggi? ( media-libs/libggi )
+		aalib? ( media-libs/aalib )
+		libcaca? ( media-libs/libcaca )
+		arts? ( kde-base/arts )
+		alsa? ( media-libs/alsa-lib )
+		wxwindows? ( =x11-libs/wxGTK-2.6* )
+		skins? ( =x11-libs/wxGTK-2.6*
+			media-libs/freetype
+			media-fonts/ttf-bitstream-vera )
+		ncurses? ( sys-libs/ncurses )
+		xosd? ( x11-libs/xosd )
+		lirc? ( app-misc/lirc )
+		3dfx? ( media-libs/glide-v3 )
+		bidi? ( >=dev-libs/fribidi-0.10.4 )
+		gnutls? ( >=net-libs/gnutls-1.2.9 )
+		sys-libs/zlib
+		png? ( media-libs/libpng )
+		media-libs/libdvbpsi
+		sdl? ( >=media-libs/libsdl-1.2.8
+			sdl-image? ( media-libs/sdl-image ) )
+		xml? ( dev-libs/libxml2 )
+		samba? ( net-fs/samba )
+		vcd? ( >=dev-libs/libcdio-0.72
+			>=media-video/vcdimager-0.7.21 )
+		daap? ( >=media-libs/libopendaap-0.3.0 )
+		corba? ( >=gnome-base/orbit-2.8.0
+			>=dev-libs/glib-2.3.2 )
+		modplug? ( media-libs/libmodplug )
+		speex? ( media-libs/speex )
+		svg? ( >=gnome-base/librsvg-2.5.0 )
+		shout? ( media-libs/libshout )
+		win32codecs? ( media-libs/win32codecs )
+		hal? ( sys-apps/hal )
+		avahi? ( >=net-dns/avahi-0.6 )
+		X? (
+			x11-libs/libX11
+			x11-libs/libXext
+			xv? ( x11-libs/libXv )
+			xinerama? ( x11-libs/libXinerama )
+			opengl? ( virtual/opengl )
+		)
+		directfb? ( dev-libs/DirectFB )
+		upnp? ( net-libs/libupnp )
+		nsplugin? (
+			!seamonkey? ( www-client/mozilla-firefox )
+			seamonkey? ( www-client/seamonkey )
+		)
+		libnotify? ( x11-libs/libnotify )
+		musepack? ( media-libs/libmpcdec )
+		x264? ( >=media-libs/x264-svn-20061014 )
+		jack? ( >=media-sound/jack-audio-connection-kit-0.99.0-r1 )
+		dc1394? ( sys-libs/libraw1394
+			<media-libs/libdc1394-1.9.99 )"
+
+DEPEND="${RDEPEND}
+	v4l? ( sys-kernel/linux-headers )
+	dvb? ( sys-kernel/linux-headers )
+	X? ( xinerama? ( x11-proto/xineramaproto ) )
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use wxwindows || use skins; then
+		WX_GTK_VER="2.6"
+		need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
+	fi
+
+	if use skins && ! use truetype; then
+		ewarn "Trying to build with skins support but without truetype."
+		ewarn "Enabling truetype."
+	fi
+	if use skins && ! use wxwindows; then
+		ewarn "Trying to build with skins support but without wxwindows."
+		ewarn "Enabling wxwindows."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	has_version '>=dev-libs/libcdio-0.78' || \
+		export EPATCH_EXCLUDE="230_all_libcdio-0.78.2.patch"
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile () {
+	local XPIDL=""
+	local MOZILLA_CONFIG=""
+
+	use vlm && \
+		myconf="${myconf} --enable-vlm --enable-sout" || \
+		myconf="${myconf} --disable-vlm"
+
+	if use nsplugin; then
+		if use seamonkey; then
+			XPIDL=/usr/lib/seamonkey
+			MOZILLA_CONFIG=/usr/lib/seamonkey/seamonkey-config
+		else
+			XPIDL=/usr/lib/mozilla-firefox
+			MOZILLA_CONFIG=/usr/lib/mozilla-firefox/firefox-config
+		fi
+	fi
+
+	if use live && ! has_version '>=media-plugins/live-2006.12.08'; then
+		myconf="${myconf} --enable-live555 --with-live555-tree=/usr/$(get_libdir)/live"
+	else
+		myconf="${myconf} $(use_enable live live555)"
+	fi
+
+	if use truetype || use skins; then
+		myconf="${myconf} --enable-freetype"
+	else
+		myconf="${myconf} --disable-freetype"
+	fi
+
+	if use wxwindows || use skins; then
+		myconf="${myconf} --enable-wxwidgets"
+	else
+		myconf="${myconf} --disable-wxwidgets"
+	fi
+
+	econf \
+		$(use_enable altivec) \
+		$(use_enable stream sout) \
+		$(use_enable httpd) \
+		$(use_enable gnutls) \
+		$(use_enable v4l) \
+		$(use_enable cdda) $(use_enable cdda cddax)\
+		$(use_enable cddb libcddb) \
+		$(use_enable vcd) $(use_enable vcd vcdx) \
+		$(use_enable dvb) $(use_enable dvb pvr) \
+		$(use_enable ogg) \
+		$(use_enable matroska mkv) \
+		$(use_enable flac) \
+		$(use_enable vorbis) \
+		$(use_enable theora) \
+		$(use_enable X x11) \
+		$(use_enable xv xvideo) \
+		$(use_enable xinerama) \
+		$(use_enable opengl glx) $(use_enable opengl) \
+		$(use_enable bidi fribidi) \
+		$(use_enable dvd dvdread) $(use_enable dvd dvdplay) $(use_enable dvd dvdnav) \
+		$(use_enable fbcon fb) \
+		$(use_enable svga svgalib) \
+		$(use_enable 3dfx glide) \
+		$(use_enable aalib aa) \
+		$(use_enable libcaca caca) \
+		$(use_enable oss) \
+		$(use_enable esd) \
+		$(use_enable arts) \
+		$(use_enable alsa) \
+		$(use_enable ncurses) \
+		$(use_enable gnome gnomevfs) \
+		$(use_enable xosd) \
+		$(use_enable lirc) \
+		$(use_enable mp3 mad) \
+		$(use_enable a52) \
+		$(use_enable dts) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable ggi) \
+		$(use_enable 3dfx glide) \
+		$(use_enable sdl) \
+		$(use_enable sdl-image) \
+		$(use_enable png) \
+		$(use_enable xml libxml2) \
+		$(use_enable samba smb) \
+		$(use_enable daap) \
+		$(use_enable corba) \
+		$(use_enable modplug mod) \
+		$(use_enable speex) \
+		$(use_enable shout) \
+		$(use_enable rtsp) $(use_enable rtsp realrtsp) \
+		$(use_enable win32codecs loader) \
+		$(use_enable skins skins2) \
+		$(use_enable hal) \
+		$(use_enable avahi bonjour) \
+		$(use_enable upnp) \
+		$(use_enable optimisememory optimize-memory) \
+		$(use_enable libnotify notify) \
+		$(use_enable jack) \
+		$(use_enable musepack mpc) \
+		$(use_enable x264) \
+		$(use_enable dc1394) \
+		$(use_enable directfb) \
+		--enable-ffmpeg \
+		--disable-faad \
+		--disable-dv \
+		--disable-libvc1 \
+		--disable-snapshot \
+		--disable-growl \
+		--disable-pth \
+		--disable-portaudio \
+		--disable-libtar \
+		--disable-optimizations \
+		--enable-utf8 \
+		--enable-libtool \
+		$(use_enable nsplugin mozilla) \
+		XPIDL="${XPIDL}" MOZILLA_CONFIG="${MOZILLA_CONFIG}" \
+		WX_CONFIG="${WX_CONFIG}" \
+		${myconf} || die "configuration failed"
+
+	if [[ $(gcc-major-version) == 2 ]]; then
+		sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
+	fi
+
+	emake || die "make of VLC failed"
+}
+
+src_install() {
+	# First install the library, to avoid screwups during relinking.select
+	emake -j1 DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS MAINTAINERS HACKING THANKS NEWS README \
+		doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
+
+	if use nsplugin; then
+		dodir "/usr/$(get_libdir)/${PLUGINS_DIR}"
+		mv "${D}"/usr/$(get_libdir)/mozilla/{components,plugins}/* \
+			"${D}/usr/$(get_libdir)/${PLUGINS_DIR}/"
+	fi
+
+	rm -rf "${D}/usr/share/doc/vlc" \
+		"${D}"/usr/share/vlc/vlc{16x16,32x32,48x48,128x128}.{png,xpm,ico}
+
+	use skins || rm -rf "${D}/usr/share/vlc/skins2"
+
+	for res in 16 32 48; do
+		insinto /usr/share/icons/hicolor/${res}x${res}/apps/
+		newins "${S}"/share/vlc${res}x${res}.png vlc.png
+	done
+
+	use wxwindows || use skins || rm "${D}/usr/share/applications/vlc.desktop"
+}