New patchset with a patch to build against libcddb 1.2 finally. This allows to remove cddb and libcdio from unmask.

Package-Manager: portage-2.1_pre5-r1

4 files changed, 274 insertions, 7 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index ae1d24480ac6..5ceaf25d6355 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.142 2006/02/28 17:17:54 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.143 2006/03/01 17:33:24 flameeyes Exp $
+
+*vlc-0.8.4a-r1 (01 Mar 2006)
+
+  01 Mar 2006; Diego Pettenò <flameeyes@gentoo.org> +vlc-0.8.4a-r1.ebuild:
+  New patchset with a patch to build against libcddb 1.2 finally. This allows
+  to remove cddb and libcdio from unmask.
 
   28 Feb 2006; Diego Pettenò <flameeyes@gentoo.org> vlc-0.8.4a.ebuild:
   Enable streamout support when vlm is enabled also if stream is not. Thanks
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index a78550594f41..1a16232786c5 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 50f2680609d924075d8d467cce526163 ChangeLog 28237
-RMD160 43ff0e725d3a01120f87fd990a33c068f740cdcc ChangeLog 28237
-SHA256 842d8df1b70c670c335f59fc96194c46ed454c5e65111b94863aa0f09b37f50a ChangeLog 28237
+MD5 ae7cf7224dabaff6117ccf6df2aad13e ChangeLog 28464
+RMD160 39c4ca74244106edf85c341fc2c4a7aa99bd6b31 ChangeLog 28464
+SHA256 9d2c35376869a3dc50c6881127955357eda8dcd305e77d7252ee116127bdd2ac ChangeLog 28464
 MD5 74246bab222d2b95ef62223ce754e6f6 files/digest-vlc-0.8.1-r1 127
 RMD160 5f9576b5ac77c3eb86228d9246b7d1e45db20e25 files/digest-vlc-0.8.1-r1 127
 SHA256 62acf5be95fea3c68450279d0a4fb55461d7841e9b4f28ed4c28f9e6cba23250 files/digest-vlc-0.8.1-r1 127
@@ -16,6 +16,9 @@ SHA256 6761f2ddb180cff04248c38dd2ceb9a6d5de595e561b78755c1374f080e67d17 files/di
 MD5 846990f93776c355395f44ca186ecfef files/digest-vlc-0.8.4a 129
 RMD160 6bc25a516e65913a266391eb4fade564f0445ccc files/digest-vlc-0.8.4a 129
 SHA256 ab2229dc184b78578ec7eb733023f5bef05b0cfe859da5ed004c62d2f110848d files/digest-vlc-0.8.4a 129
+MD5 9f616007753da1191a91a92b5aecd1bf files/digest-vlc-0.8.4a-r1 479
+RMD160 9de1d111e377f5253ca1da8a431acfc05b700f92 files/digest-vlc-0.8.4a-r1 479
+SHA256 84c3204ff42dcf282e060e1f8eaa6c3bc680143fd4ad5fa3bce9c85aadccb033 files/digest-vlc-0.8.4a-r1 479
 MD5 3f1662be15aab3fab1e7d11145f8f043 metadata.xml 249
 RMD160 bccf7e953ea1336e9ec1e722af1592e5f7cbd732 metadata.xml 249
 SHA256 c88de03d7b2aa4afd88762ce6d56e5bb25db4699fad09c6e3e3323fb42a150c0 metadata.xml 249
@@ -28,13 +31,16 @@ SHA256 59a59227b488dfb08f5e15b38e8e44425de132cb7e54d64c6fd26fb9f98f4fc2 vlc-0.8.
 MD5 4aeb6a10d5f238b092298f749c650bad vlc-0.8.4.ebuild 6925
 RMD160 b0ffe8628ef37c210add15b2220cc4b49247ff01 vlc-0.8.4.ebuild 6925
 SHA256 b817fcc456cbc74cc9cb9885b6441848797b7e3f275827fb7cddb369aafc8e1a vlc-0.8.4.ebuild 6925
+MD5 7ccfc00742bede003efc9098286848c2 vlc-0.8.4a-r1.ebuild 7489
+RMD160 fa3b16a5c2f9727976880686f4c8ef0059eeb1f5 vlc-0.8.4a-r1.ebuild 7489
+SHA256 b01e8f320682d9db8e0280172c74351827d240f2914f7907e0944bf96a83698e vlc-0.8.4a-r1.ebuild 7489
 MD5 3f26100e41806ecaa7a06990dfbf7584 vlc-0.8.4a.ebuild 7486
 RMD160 8285f960b4e322d1604d845c16cef6da2c4b552b vlc-0.8.4a.ebuild 7486
 SHA256 4d974ed365cc626439657289f4c87f0a581179bab56d08090a8b74a159fa85bf vlc-0.8.4a.ebuild 7486
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2.1 (GNU/Linux)
 
-iD8DBQFEBIXPAiZjviIA2XgRAmOXAJ94d5zq+0xehpFSPBCiB869uz3PQACeIH2Q
-T5meZyxJJOHQrcBfjww3uPI=
-=+Xz1
+iD8DBQFEBdq8AiZjviIA2XgRAk9nAKCkgvGNd6Zp53+sNaSAeKd297Z4ZgCgnxjg
+MMPNgF6uuo3QnB2/JcaOa18=
+=R+YQ
 -----END PGP SIGNATURE-----
diff --git a/media-video/vlc/files/digest-vlc-0.8.4a-r1 b/media-video/vlc/files/digest-vlc-0.8.4a-r1
new file mode 100644
index 000000000000..815f5bb0ec4a
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.8.4a-r1
@@ -0,0 +1,6 @@
+MD5 944329bc288ef815e678745e07f1999e vlc-0.8.4a.tar.bz2 7191539
+RMD160 50ea307c1aa70d7189a8c7cd09bf5e1d60e4856b vlc-0.8.4a.tar.bz2 7191539
+SHA256 003b6bb71255af006ac3a36ff0184e0cb9d5e08589b2d500f73b3c8052d6adf9 vlc-0.8.4a.tar.bz2 7191539
+MD5 ccd7d7f82d7b25b9ff900e279cf26d53 vlc-patches-14.tar.bz2 9402
+RMD160 aba49b6313d3dd2c64478f91f33e09ca241b52dd vlc-patches-14.tar.bz2 9402
+SHA256 763f8b7faa74afcf9ac1a20d5812d26bd5252873a7f7fc8c68b7e47be5cbc208 vlc-patches-14.tar.bz2 9402
diff --git a/media-video/vlc/vlc-0.8.4a-r1.ebuild b/media-video/vlc/vlc-0.8.4a-r1.ebuild
new file mode 100644
index 000000000000..aa05dd969ac6
--- /dev/null
+++ b/media-video/vlc/vlc-0.8.4a-r1.ebuild
@@ -0,0 +1,249 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.8.4a-r1.ebuild,v 1.1 2006/03/01 17:33:24 flameeyes Exp $
+
+inherit eutils wxwidgets flag-o-matic nsplugins multilib autotools toolchain-funcs
+
+MY_P="${P/_beta/-test}"
+
+PATCHLEVEL="14"
+DESCRIPTION="VLC media player - Video player and streamer"
+HOMEPAGE="http://www.videolan.org/vlc/"
+
+[[ ${MY_P} != "${P}" ]] && \
+	SRC_URI="http://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.bz2" \
+	|| SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
+
+SRC_URI="${SRC_URI}
+	mirror://gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE="a52 3dfx nls debug altivec httpd vlm gnutls live v4l cdda ogg matroska
+dvb dvd vcd ffmpeg aac dts flac mpeg vorbis theora X opengl truetype svg fbcon svga
+oss aalib ggi libcaca esd arts alsa wxwindows ncurses xosd lirc joystick stream
+mp3 xv bidi sdl png xml2 samba daap corba screen mod speex nsplugin shout real
+win32codecs skins hal avahi xinerama cddb"
+
+RDEPEND="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 )
+		ogg? ( media-libs/libogg )
+		matroska? (
+			>=dev-libs/libebml-0.7.6
+			>=media-libs/libmatroska-0.7.5 )
+		mp3? ( media-libs/libmad )
+		ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050226-r1 )
+		a52? ( >=media-libs/a52dec-0.7.4-r3 )
+		dts? ( >=media-libs/libdts-0.0.2-r3 )
+		flac? ( media-libs/flac )
+		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.2-r1 )
+		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.0.17 )
+		sys-libs/zlib
+		png? ( media-libs/libpng )
+		media-libs/libdvbpsi
+		aac? ( >=media-libs/faad2-2.0-r2 )
+		sdl? ( >=media-libs/libsdl-1.2.8 )
+		xml2? ( 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 )
+		v4l? ( sys-kernel/linux-headers )
+		dvb? ( sys-kernel/linux-headers )
+		joystick? ( sys-kernel/linux-headers )
+		mod? ( media-libs/libmodplug )
+		speex? ( media-libs/speex )
+		svg? ( >=gnome-base/librsvg-2.5.0 )
+		nsplugin? ( >=net-libs/gecko-sdk-1.7.8 )
+		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 )
+			) virtual/x11 )
+			opengl? ( || ( media-libs/mesa virtual/opengl ) )
+			xinerama? ( || ( x11-libs/libXinerama virtual/x11 ) )
+		)"
+
+DEPEND="${RDEPEND}
+	X? ( || ( ( x11-proto/xproto
+		x11-proto/xextproto
+		x11-base/xorg-server
+		) virtual/x11 )
+		xinerama? ( || ( x11-proto/xineramaproto virtual/x11 ) )
+	)
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if use wxwindows; then
+		WX_GTK_VER="2.6"
+		need-wxwidgets unicode || die "You need to install wxGTK with unicode support."
+		# Does not play fine with --as-needed...
+		filter-ldflags -Wl,--as-needed --as-needed
+	fi
+
+	if use skins && ! use truetype; then
+		eerror "Trying to build with skins support but without truetype."
+		die "You have to use 'truetype' to use 'skins'"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
+	AT_M4DIR="m4" eautoreconf
+}
+
+src_compile () {
+	use nsplugin && myconf="${myconf} --with-mozilla-sdk-path=/usr/$(get_libdir)/gecko-sdk"
+
+	use wxwindows && \
+		myconf="${myconf} --with-wx-config=$(basename ${WX_CONFIG}) --with-wx-config-path=$(dirname ${WX_CONFIG})"
+
+	if use ffmpeg; then
+		myconf="${myconf} --enable-ffmpeg"
+
+		built_with_use media-video/ffmpeg aac \
+			&& myconf="${myconf} --with-ffmpeg-aac"
+
+		built_with_use media-video/ffmpeg dts \
+			&& myconf="${myconf} --with-ffmpeg-dts"
+
+		built_with_use media-video/ffmpeg zlib \
+			&& myconf="${myconf} --with-ffmpeg-zlib"
+
+		built_with_use media-video/ffmpeg encode \
+			&& myconf="${myconf} --with-ffmpeg-mp3lame"
+
+	else
+		myconf="${myconf} --disable-ffmpeg"
+	fi
+
+	use vlm && \
+		myconf="${myconf} --enable-vlm --enable-sout" || \
+		myconf="${myconf} --disable-vlm"
+
+	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 truetype freetype) \
+		$(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 wxwindows wxwidgets) \
+		$(use_enable ncurses) \
+		$(use_enable xosd) \
+		$(use_enable lirc) \
+		$(use_enable joystick) \
+		$(use_enable live livedotcom) $(use_with live livedotcom-tree /usr/lib/live) \
+		$(use_enable mp3 mad) \
+		$(use_enable aac faad) \
+		$(use_enable a52) \
+		$(use_enable dts) \
+		$(use_enable mpeg libmpeg2) \
+		$(use_enable ggi) \
+		$(use_enable 3dfx glide) \
+		$(use_enable sdl) \
+		$(use_enable png) \
+		$(use_enable xml2 libxml2) \
+		$(use_enable samba smb) \
+		$(use_enable daap) \
+		$(use_enable corba) \
+		$(use_enable mod) \
+		$(use_enable speex) \
+		$(use_enable nsplugin mozilla) \
+		$(use_enable shout) \
+		$(use_enable real) $(use_enable real realrtsp) \
+		$(use_enable win32codecs loader) \
+		$(use_enable skins skins2) \
+		$(use_enable hal) \
+		$(use_enable avahi bonjour) \
+		--disable-pth \
+		--disable-portaudio \
+		--disable-slp \
+		--disable-x264 \
+		--enable-utf8 \
+		${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() {
+	make DESTDIR="${D}" plugindir="/usr/$(get_libdir)/${PLUGINS_DIR}" install || die "Installation failed!"
+
+	dodoc AUTHORS MAINTAINERS HACKING THANKS TODO NEWS README \
+		doc/fortunes.txt doc/intf-cdda.txt doc/intf-vcd.txt
+
+	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 && domenu "${S}/debian/vlc.desktop"
+}