Add dts use flag, update dependancy version requirements to more closely match

  official requirements, integrate some ebuild changes from ebuild included in
  the source tree, fix default font file location.

6 files changed, 217 insertions, 8 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index d11d494d3347..a714e72bb374 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.53 2004/06/25 21:11:36 kanaka Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.54 2004/07/28 20:03:44 kanaka Exp $
+
+  01 Jul 2004; Joel Martin <kanaka@gentoo.org> :
+  Add dts use flag, update dependancy version requirements to more closely match
+  official requirements, integrate some ebuild changes from ebuild included in
+  the source tree, fix default font file location.
 
   25 Jun 2004; Joel Martin <kanaka@gentoo.org> vlc-0.7.2.ebuild:
   Add depend on automake 1.7.9 to close bug 54498. No version bump necessary,
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 7e0012b518c7..7f14858545e7 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,15 +1,17 @@
-MD5 b1e3a21849a12b9916248681298357c3 vlc-0.7.1-r1.ebuild 5978
+MD5 fcd14dd61ea3c39c4520c96fdf60ec15 vlc-0.7.1-r1.ebuild 5973
 MD5 455853c508aea8cd6096de365a0bf417 vlc-0.6.0-r1.ebuild 5637
 MD5 1c3b1d2b37e13362061c1b2c0ddcb286 vlc-0.7.1.ebuild 6769
 MD5 52cc3aeaba8a9ec8f23804361038a824 vlc-0.6.2.ebuild 5547
 MD5 14cd606f4ab9526863d2a98240df803e vlc-0.6.2-r1.ebuild 6508
-MD5 cbe4a9459c08b45c06990e1e705003ad vlc-0.7.2.ebuild 6008
+MD5 666689d2aebaf76cd0d1e7a298557736 vlc-0.7.2.ebuild 6003
+MD5 e90be3e122a97d4338d57eb28930a9f9 vlc-0.7.2-r1.ebuild 6384
 MD5 91872f800783fd6e01dc0eb628b6f8a2 vlc-0.6.1.ebuild 6116
-MD5 8a7e5951eb92f38a7577bf44c03ecb8f ChangeLog 10803
+MD5 9781cdf497f94e7bb0f8ff8945f0d784 ChangeLog 11064
 MD5 06579cc387999571bc69fadac7f077fa metadata.xml 263
 MD5 5f5a12e2d124384eb5d129e60879202d files/digest-vlc-0.6.0-r1 63
 MD5 cc5d4fb953ad7bd0ee3e14076811a1d4 files/digest-vlc-0.6.2-r1 202
 MD5 f031efc738d255e8b7b893aaeb5ca30c files/digest-vlc-0.7.1-r1 63
+MD5 ed198b2a917f7be36174f7b05dcad8a3 files/digest-vlc-0.7.2-r1 63
 MD5 5cf5ab60ab2619db091501d7acc50284 files/mozplugin.patch 5995
 MD5 c5c0f3cdd6b2afd05a3090dfc55074e0 files/glide.patch 744
 MD5 20de936c17c2ab1c4767bcbce0d2e972 files/live-gcc3-3.patch 828
diff --git a/media-video/vlc/files/digest-vlc-0.7.2-r1 b/media-video/vlc/files/digest-vlc-0.7.2-r1
new file mode 100644
index 000000000000..2fabdc869b72
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.7.2-r1
@@ -0,0 +1 @@
+MD5 3749fb3a0aed1372d4975a5b962e72cc vlc-0.7.2.tar.bz2 4516835
diff --git a/media-video/vlc/vlc-0.7.1-r1.ebuild b/media-video/vlc/vlc-0.7.1-r1.ebuild
index 5d413d36cedb..85de22dc12d2 100644
--- a/media-video/vlc/vlc-0.7.1-r1.ebuild
+++ b/media-video/vlc/vlc-0.7.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.1-r1.ebuild,v 1.7 2004/07/14 22:26:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.1-r1.ebuild,v 1.8 2004/07/28 20:03:44 kanaka Exp $
 
 inherit libtool gcc eutils
 
@@ -61,7 +61,7 @@ RDEPEND="X? ( virtual/x11 )
 	>=media-libs/a52dec-0.7.4
 	>=media-libs/libmpeg2-0.4.0
 	>=media-video/ffmpeg-0.4.8.20040222
-	>=media-plugins/live-2004.03.05
+	=media-plugins/live-2004.03*
 	>=media-libs/flac-1.1.0"
 
 DEPEND="$RDEPEND >=sys-devel/autoconf-2.5.8"
diff --git a/media-video/vlc/vlc-0.7.2-r1.ebuild b/media-video/vlc/vlc-0.7.2-r1.ebuild
new file mode 100644
index 000000000000..ce99e04efede
--- /dev/null
+++ b/media-video/vlc/vlc-0.7.2-r1.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2-r1.ebuild,v 1.1 2004/07/28 20:03:44 kanaka Exp $
+
+inherit libtool gcc eutils
+
+# Missing support for...
+#	tarkin - package not in portage yet - experimental
+#	theora - package not in portage yet - experimental
+#	tremor - package not in portage yet - experimental
+
+IUSE="arts ncurses dvd gtk nls 3dfx svga fbcon esd X alsa ggi speex
+	oggvorbis gnome xv oss sdl aalib slp bidi truetype v4l lirc
+	wxwindows imlib matroska dvb mozilla debug faad
+	xosd altivec png dts"
+
+DESCRIPTION="VLC media player - Video player and streamer"
+SRC_URI="http://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.bz2"
+
+HOMEPAGE="http://www.videolan.org/vlc"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~amd64"
+
+RDEPEND="X? ( virtual/x11 )
+	aalib? ( >=media-libs/aalib-1.4_rc4-r2
+			>=media-libs/libcaca-0.9 )
+	alsa? ( >=media-libs/alsa-lib-0.9_rc2 )
+	dvb? ( media-libs/libdvb
+		media-tv/linuxtv-dvb )
+	dvd? ( >=media-libs/libdvdread-0.9.4
+		>=media-libs/libdvdcss-1.2.8
+		>=media-libs/libdvdnav-0.1.9
+		>=media-libs/libdvdplay-1.0.1 )
+	esd? ( >=media-sound/esound-0.2.22 )
+	faad? ( >=media-libs/faad2-2.0_rc3 )
+	ggi? ( >=media-libs/libggi-2.0_beta3 )
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
+	gtk? ( =x11-libs/gtk+-1.2* )
+	imlib? ( >=media-libs/imlib2-1.0.6 )
+	lirc? ( app-misc/lirc )
+	mad? ( media-libs/libmad
+		media-libs/libid3tag )
+	matroska? ( >=media-libs/libmatroska-0.7 )
+	mozilla? ( >=net-www/mozilla-1.5 )
+	ncurses? ( sys-libs/ncurses )
+	nls? ( >=sys-devel/gettext-0.12.1 )
+	oggvorbis? ( >=media-libs/libvorbis-1.0.1
+		>=media-libs/libogg-1.1 )
+	sdl? ( >=media-libs/libsdl-1.2.5 )
+	slp? ( >=net-libs/openslp-1.0.11 )
+	bidi? ( >=dev-libs/fribidi-0.10.4 )
+	truetype? ( >=media-libs/freetype-2.1.4 )
+	wxwindows? ( >=x11-libs/wxGTK-2.4.2 )
+	xosd? ( >=x11-libs/xosd-2.0 )
+	3dfx? ( !amd64? ( media-libs/glide-v3 ) )
+	png? ( >=media-libs/libpng-1.2.5 )
+	speex? ( >=media-libs/speex-1.1.5 )
+	dts? ( >=media-libs/libdts-0.0.2 )
+	svga? ( media-libs/svgalib )
+	>=media-sound/lame-3.96
+	>=media-libs/libdvbpsi-0.1.4
+	>=media-libs/a52dec-0.7.4
+	>=media-libs/libmpeg2-0.4.0
+	>=media-video/ffmpeg-0.4.8.20040222
+	=media-plugins/live-2004.03*
+	>=media-libs/flac-1.1.0"
+
+DEPEND="$RDEPEND >=sys-devel/autoconf-2.5.8
+	>=sys-devel/automake-1.7.9"
+
+src_unpack() {
+	unpack ${A}
+
+	# We only have glide v3 in portage
+	cd ${S}
+	sed -i \
+		-e "s:/usr/include/glide:/usr/include/glide3:" \
+		-e "s:glide2x:glide3:" \
+		configure
+
+	# Fix the default font
+	sed -i -e "s:/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf:/usr/X11R6/lib/X11/fonts/truetype/timesbd.ttf:" modules/misc/freetype.c
+
+	cd ${S}/modules/video_output
+	epatch ${FILESDIR}/glide.patch
+	cd ${S}
+
+}
+
+src_compile() {
+	# Configure and build VLC
+	cd ${S}
+	local myconf
+	myconf="--disable-mga --enable-flac --with-gnu-ld \
+			--enable-a52 --enable-dvbpsi --enable-libmpeg2 \
+			--disable-qt --disable-kde --disable-gnome --disable-gtk \
+			--disable-libcdio --disable-libcddb --disable-vcdx \
+			--enable-ffmpeg --with-ffmpeg-mp3lame \
+			--enable-livedotcom --with-livedotcom-tree=/usr/lib/live"
+
+	# qt, kde, gnome and gtk interfaces are deprecated and in a bad condition
+	# the same for mga video, libdv and xvid decoders 
+	# cddax and vcdx (which depend on libcdio and libcddb) are not ready yet
+
+	#--enable-pth				GNU Pth support (default disabled)
+	#--enable-st				State Threads (default disabled)
+	#--enable-gprof				gprof profiling (default disabled)
+	#--enable-cprof				cprof profiling (default disabled)
+	#--enable-mostly-builtin	most modules will be built-in (default enabled)
+	#--disable-optimizations	disable compiler optimizations (default disabled)
+	#--enable-testsuite			build test modules (default disabled)
+	#--disable-plugins			make all plugins built-in (default plugins enabled)
+
+	use debug && myconf="${myconf} --enable-debug" \
+		|| myconf="${myconf} --enable-release"
+
+	(use imlib && use wxwindows) && myconf="${myconf} --enable-skins --enable-skins2"
+
+	use mozilla \
+		&& myconf="${myconf} --enable-mozilla \
+		MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config \
+		XPIDL=/usr/bin/xpidl"
+
+	if [ "${ARCH}" = "ppc" ]; then
+		# Please post a bugreport on the next version bump
+		# to have a ppc dev test if AltiVec has been fixed!
+		ewarn "AltiVec is broken in this version of VLC"
+		myconf="${myconf} --disable-altivec"
+	fi
+
+	# vlc uses its own ultraoptimizaed CXXFLAGS
+	# and forcing custom ones generally fails building
+	export CXXFLAGS=""
+	export CFLAGS=""
+	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOMAKE_1_6=1
+
+	# Avoid timestamp skews with autotools
+	touch configure.ac
+	touch aclocal.m4
+	touch configure
+	touch config.h.in
+	touch $(find . -name Makefile.in)
+
+#		$(use_enable dvb satellite) \
+#		$(use_enable altivec) \
+	econf \
+		$(use_enable nls) \
+		$(use_enable slp) \
+		$(use_enable xosd) \
+		$(use_enable ncurses) \
+		$(use_enable alsa) \
+		$(use_enable esd) \
+		$(use_enable oss) \
+		$(use_enable ggi) \
+		$(use_enable sdl) \
+		$(use_enable mad) \
+		$(use_enable faad) \
+		$(use_enable v4l) \
+		$(use_enable dvd) \
+		$(use_enable dvd vcd) \
+		$(use_enable dvd dvdread) \
+		$(use_enable dvd dvdplay) \
+		$(use_enable dvd dvdnav) \
+		$(use_enable dvb) \
+		$(use_enable dvb pvr) \
+		$(use_enable joystick) $(use_enable lirc) \
+		$(use_enable arts) \
+		$(use_enable oggvorbis ogg) $(use_enable oggvorbis vorbis) \
+		$(use_enable speex) \
+		$(use_enable matroska mkv) \
+		$(use_enable truetype freetype) \
+		$(use_enable bidi fribidi) \
+		$(use_enable svga svgalib) \
+		$(use_enable fbcon fb) \
+		$(use_enable aalib aa) $(use_enable aalib caca) \
+		$(use_enable xv xvideo) \
+		$(use_enable X x11) \
+		$(use_enable 3dfx glide) \
+		$(use_enable dts) \
+		${myconf} || die "configure of VLC failed"
+
+	if [[ $(gcc-major-version) == 2 ]]; then
+		sed -i -e s:"-fomit-frame-pointer":: vlc-config || die "-fomit-frame-pointer patching failed"
+	fi
+
+	# parallel make doesn't work with our complicated makefile
+	# this is also the reason as why you shouldn't run autoconf
+	# or automake yourself. (or bootstrap for that matter)
+	MAKEOPTS="${MAKEOPTS} -j1"
+	emake || die "make of VLC failed"
+}
+
+src_install() {
+	einstall || die "make install failed"
+
+	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING INSTALL* \
+	MAINTAINERS NEWS README* THANKS doc/ChangeLog-*
+}
diff --git a/media-video/vlc/vlc-0.7.2.ebuild b/media-video/vlc/vlc-0.7.2.ebuild
index 90e9f65ee227..0a9e3e2bb059 100644
--- a/media-video/vlc/vlc-0.7.2.ebuild
+++ b/media-video/vlc/vlc-0.7.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2.ebuild,v 1.5 2004/07/14 22:26:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.7.2.ebuild,v 1.6 2004/07/28 20:03:44 kanaka Exp $
 
 inherit libtool gcc eutils
 
@@ -61,7 +61,7 @@ RDEPEND="X? ( virtual/x11 )
 	>=media-libs/a52dec-0.7.4
 	>=media-libs/libmpeg2-0.4.0
 	>=media-video/ffmpeg-0.4.8.20040222
-	>=media-plugins/live-2004.03.05
+	=media-plugins/live-2004.03*
 	>=media-libs/flac-1.1.0"
 
 DEPEND="$RDEPEND >=sys-devel/autoconf-2.5.8