Version bump. Added the altivec use variable. Removed 0.6.1 hacks.

4 files changed, 213 insertions, 3 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 78fb63d64d6b..4304944876e9 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.29 2003/08/01 08:46:29 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.30 2003/08/14 02:49:11 g2boojum Exp $
+
+*vlc-0.6.2 (13 Aug 2003)
+
+  13 Aug 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.2.ebuild:
+  Version bump.  Removed 0.6.1 related workarounds.  Added support
+  for the altivec USE variable.  Up to 34 USE variables now. :)
 
 *vlc-0.6.1 (01 Aug 2003)
 
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index fb1ad53ef2e5..c29992dd21f0 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -3,10 +3,10 @@ MD5 f3a6a89a4c30d44bcce0f76ac71b0256 vlc-0.4.4.ebuild 3851
 MD5 185be9f9dcdfa12776bd5295a1e23570 vlc-0.5.2.ebuild 3876
 MD5 6c597e964cfd0c0e082ffbcb64ef7b2d vlc-0.6.0.ebuild 5100
 MD5 f38f55232741d4faeb8946546ad42a39 vlc-0.5.2-r1.ebuild 4481
-MD5 6cf805e2096211a613b4b797d40c6ec6 vlc-0.6.2.ebuild 6015
+MD5 c5a5268be3d56b1dc9c9a23fda67f52f vlc-0.6.2.ebuild 5999
 MD5 ecee6eaca98dfa911be0126c0c9fe3ec vlc-0.4.5.ebuild 3850
 MD5 9d740a9c8110a843c5f12f6685e17d4f vlc-0.6.1.ebuild 6167
-MD5 91596cfd8faa611510802fa42bd98d75 ChangeLog 6499
+MD5 5c974e37d88a7c842981ef18f540d1ef ChangeLog 6540
 MD5 6d7dd1d8477d38f85cc4d4ed59489b4f files/digest-vlc-0.5.2-r1 63
 MD5 5f5a12e2d124384eb5d129e60879202d files/digest-vlc-0.6.0-r1 63
 MD5 5cf5ab60ab2619db091501d7acc50284 files/mozplugin.patch 5995
diff --git a/media-video/vlc/files/digest-vlc-0.6.2 b/media-video/vlc/files/digest-vlc-0.6.2
new file mode 100644
index 000000000000..2affdd7a9dc3
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.6.2
@@ -0,0 +1 @@
+MD5 54d554dd61e2bac8c9c3fbd0b5eba0c1 vlc-0.6.2.tar.bz2 2982103
diff --git a/media-video/vlc/vlc-0.6.2.ebuild b/media-video/vlc/vlc-0.6.2.ebuild
new file mode 100644
index 000000000000..2b7a3ba84123
--- /dev/null
+++ b/media-video/vlc/vlc-0.6.2.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2.ebuild,v 1.1 2003/08/14 02:49:11 g2boojum Exp $
+
+# 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 qt ncurses dvd gtk nls 3dfx svga fbcon esd kde X alsa ggi
+      oggvorbis gnome xv oss sdl aalib slp truetype v4l xvid lirc
+      wxwindows imlib mozilla dvb debug faad xosd matroska altivec"
+
+DESCRIPTION="VideoLAN Client - DVD/video player and more"
+SRC_URI="http://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
+HOMEPAGE="http://www.videolan.org/vlc"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa"
+
+DEPEND="X? ( virtual/x11 )
+	aalib? ( >=media-libs/aalib-1.4_rc4-r2 )
+	alsa? ( >=media-libs/alsa-lib-0.9_rc2 )
+	arts? ( kde-base/kdelibs )
+	dvb? ( media-libs/libdvb
+		media-tv/linuxtv-dvb )
+	dvd? ( >=media-libs/libdvdread-0.9.3
+		>=media-libs/libdvdcss-1.2.8
+		>=media-libs/libdvdplay-1.0.1 )
+	esd? ( >=media-sound/esound-0.2.22 )
+	faad? ( >=media-libs/faad2-1.1 )
+	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 )
+	kde? ( kde-base/kdelibs )
+	lirc? ( app-misc/lirc )
+	mad? ( >=media-sound/mad-0.14.2b )
+	matroska? ( >=media-libs/libmatroska-0.4.4 )
+	mozilla? ( >=net-www/mozilla-1.4 )
+	ncurses? ( sys-libs/ncurses )
+	nls? ( sys-devel/gettext )
+	oggvorbis? ( >=media-libs/libvorbis-1.0 >=media-libs/libogg-1.0 )
+	qt? ( x11-libs/qt )
+	sdl? ( >=media-libs/libsdl-1.2.5 )
+	slp? ( >=net-libs/openslp-1.0.10 )
+	truetype? ( >=media-libs/freetype-2.1.4 )
+	wxwindows? ( >=x11-libs/wxGTK-2.4.1 )
+	xosd? ( >=x11-libs/xosd-2.0 )
+	xvid? ( >=media-libs/xvid-0.9.1 )
+	>=media-libs/a52dec-0.7.4
+	>=media-libs/flac-1.1.0
+	>=media-libs/libdv-0.98
+        >=media-libs/libdvbpsi-0.1.3
+	=media-video/ffmpeg-0.4.7*
+	>media-libs/libmpeg2-0.3.1
+	>=media-video/mplayer-0.90"
+
+# mplayer is a required dependancy until the libpostproc code becomes
+# a separate packages or until ffmpeg gets support for installing
+# the library.
+
+# get kde and arts paths
+if [ -n "`use kde`" -o -n "`use arts`" ]; then
+    inherit kde-functions
+    set-kdedir 3
+    # $KDEDIR is now set to arts/kdelibs location
+fi
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# if qt3 is installed, patch vlc to work with it instead of qt2
+	( use qt || use kde ) && ( \
+	if [ ${QTDIR} = "/usr/qt/3" ]
+	then
+		sed -i -e "s:-lkfile::" configure
+
+		cd ${S}/modules/gui/kde
+		sed -i -e "s:\(#include <kmainwindow.h>\):\1\n#include <kstatusbar.h>:" interface.h
+
+		sed -i -e 's:\("vlc preferences", true, false, \)\("Save\):\1(KGuiItem)\2:' preferences.cpp
+	fi
+	)
+
+	# Change the location where glide headers are installed
+	cd ${S}
+	sed -i -e "s:/usr/include/glide:/usr/include/glide3:" configure
+}
+
+src_compile(){
+	local myconf
+	myconf="--disable-mga --enable-flac --with-gnu-ld"
+
+	#--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 disabled)
+	#--disable-optimizations disable compiler optimizations (default enabled)
+	#--enable-testsuite      build test modules (default disabled)
+	#--disable-plugins       make all plugins built-in (default plugins enabled)
+
+	use nls || myconf="${myconf} --disable-nls"
+
+	use debug && myconf="${myconf} --enable-debug" \
+		|| myconf="${myconf} --enable-release"
+
+	use dvd \
+		&& myconf="${myconf} --enable-dvdread" \
+		|| myconf="${myconf} \
+			--disable-dvd \
+			--disable-dvdread \
+			--disable-dvdplay \
+			--disable-vcd"
+
+	use v4l && myconf="${myconf} --enable-v4l"
+
+	use dvb && myconf="${myconf} --enable-satellite --enable-pvr"
+
+	use oggvorbis || myconf="${myconf} --disable-vorbis --disable-ogg"
+
+	use matroska || myconf="${myconf} --disable-mkv"
+
+	use mad && myconf="${myconf} --enable-mad"
+
+	use faad && myconf="${myconf} --enable-faad"
+
+	use xvid && myconf="${myconf} --enable-xvid"
+
+	use X || myconf="${myconf} --disable-x11"
+
+	use xv || myconf="${myconf} --disable-xvideo"
+
+	use sdl || myconf="${myconf} --disable-sdl"
+
+	use truetype && myconf="${myconf} --enable-freetype"
+
+        use fbcon || myconf="${myconf} --disable-fb"
+
+        use svga && myconf="${myconf} --enable-svgalib"
+
+	use ggi && myconf="${myconf} --enable-ggi"
+
+        use 3dfx && myconf="${myconf} --enable-glide"
+
+        use aalib && myconf="${myconf} --enable-aa"
+
+        use oss || myconf="${myconf} --disable-oss"
+
+	use esd && myconf="${myconf} --enable-esd"
+
+	use arts && myconf="${myconf} --enable-arts"
+
+	use alsa && myconf="${myconf} --enable-alsa"
+
+	(use imlib && use wxwindows) && myconf="${myconf} --enable-skins"
+
+	use gtk || myconf="${myconf} --disable-gtk"
+
+	use gnome && myconf="${myconf} --enable-gnome"
+
+	use qt && myconf="${myconf} --enable-qt"
+
+	use kde && myconf="${myconf} --enable-kde"
+
+	use ncurses && myconf="${myconf} --enable-ncurses"
+
+	use xosd && myconf="${myconf} --enable-xosd"
+
+	use slp || myconf="${myconf} --disable-slp"
+
+	use lirc && myconf="${myconf} --enable-lirc"
+
+	use joystick && myconf="${myconf} --enable-joystick"
+
+	use mozilla && \ 
+		myconf="${myconf} --enable-mozilla \
+		MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config \
+		XPIDL=/usr/bin/xpidl"
+
+	use altivec || myconf="${myconf} --disable-altivec"
+
+	export CXXFLAGS=""
+	export CFLAGS=""
+	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOMAKE_1_6=1
+
+	econf ${myconf} || die "configure of VLC failed"
+
+	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-*
+}