repoman fixes on all ebuilds. version bump as well. updated some

configure options and added libmad (mad) as a dependancy so vlc supports
reading divx files.

5 files changed, 171 insertions, 4 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 95034adc5f57..56f7b2d17d23 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/vlc
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.5 2002/06/18 03:46:41 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.6 2002/07/10 00:14:23 raker Exp $
+
+*vlc-0.4.1 (09 Jul 2002)
+
+  09 Jul 2002; Nick Hadaway <raker@gentoo.org> vlc-0.4.1.ebuild
+  files/digest-vlc-0.4.1
+
+  Version bump.  Added required dependancy for mad (MPEG audio library)
+  which allows vlc to read divx files.  Updated configure options.
+  Special thanks to to the vlc support team for the quick response
+  to my inquiry.
 
 *vlc-0.4.0 (17 Jun 2002)
 
diff --git a/media-video/vlc/files/digest-vlc-0.4.1 b/media-video/vlc/files/digest-vlc-0.4.1
new file mode 100644
index 000000000000..e54e6c661210
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.4.1
@@ -0,0 +1 @@
+MD5 0f095eef220ca292aa9bb5df7e1fb9c4 vlc-0.4.1.tar.gz 1329678
diff --git a/media-video/vlc/vlc-0.4.0-r1.ebuild b/media-video/vlc/vlc-0.4.0-r1.ebuild
index 3d8379f56279..94569367f61b 100644
--- a/media-video/vlc/vlc-0.4.0-r1.ebuild
+++ b/media-video/vlc/vlc-0.4.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.4.0-r1.ebuild,v 1.3 2002/06/18 16:52:30 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.4.0-r1.ebuild,v 1.4 2002/07/10 00:14:24 raker Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="VideoLAN Client - DVD/video player"
@@ -24,8 +24,9 @@ DEPEND="X? ( virtual/x11 )
 
 RDEPEND="nls? ( sys-devel/gettext )"
 
-SLOT=""
+SLOT="0"
 LICENSE="GPL-2"
+KEYWORDS="x86"
 
 src_unpack() {
 
diff --git a/media-video/vlc/vlc-0.4.0.ebuild b/media-video/vlc/vlc-0.4.0.ebuild
index 2e46d4f1114d..58c3156b6ec3 100644
--- a/media-video/vlc/vlc-0.4.0.ebuild
+++ b/media-video/vlc/vlc-0.4.0.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2002 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License, v2 or later
 # Author Nathaniel Hirsch <nh2@njit.edu> Achim Gottinge <achim@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.4.0.ebuild,v 1.1 2002/05/24 09:43:37 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.4.0.ebuild,v 1.2 2002/07/10 00:14:24 raker Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="VideoLAN Client - DVD/video player"
@@ -24,6 +24,9 @@ DEPEND="X? ( virtual/x11 )
 	alsa? ( >=media-libs/alsa-lib-0.9_rc1 )"
 
 RDEPEND="nls? ( sys-devel/gettext )"
+KEYWORDS="x86"
+LICENSE="GPL-2"
+SLOT="0"
 
 src_compile(){
 
diff --git a/media-video/vlc/vlc-0.4.1.ebuild b/media-video/vlc/vlc-0.4.1.ebuild
new file mode 100644
index 000000000000..fed6888c7c55
--- /dev/null
+++ b/media-video/vlc/vlc-0.4.1.ebuild
@@ -0,0 +1,152 @@
+# Copyright 2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.4.1.ebuild,v 1.1 2002/07/10 00:14:24 raker Exp $
+
+S=${WORKDIR}/${P}
+DESCRIPTION="VideoLAN Client - DVD/video player"
+SRC_URI="http://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz"
+HOMEPAGE="http://www.videolan.org"
+
+DEPEND="X? ( virtual/x11 )
+	qt? ( x11-libs/qt )
+	dvd? ( media-libs/libdvdread
+		media-libs/libdvdcss )
+	>=media-libs/libsdl-1.1.8-r1
+	esd? ( >=media-sound/esound-0.2.22 )
+	ggi? ( >=media-libs/libggi-2.0_beta3 )
+	gtk? ( =x11-libs/gtk+-1.2* )
+	kde? ( kde-base/kdelibs )
+	arts? ( kde-base/kdelibs )
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
+	ncurses? ( sys-libs/ncurses )
+	oggvorbis? ( media-libs/libvorbis )
+	alsa? ( >=media-libs/alsa-lib-0.9_rc2 )
+	>=media-sound/mad-0.14.2b"
+
+RDEPEND="nls? ( sys-devel/gettext )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86"
+
+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
+		cp configure.in configure.in.orig
+		sed "s:-lkfile::" \
+			configure.in.orig > configure.in
+
+		cd ${S}/plugins/kde
+		cp kde_interface.h kde_interface.h.orig
+		sed "s:\(#include <kmainwindow.h>\):\1\n#include <kstatusbar.h>:" \
+			kde_interface.h.orig > kde_interface.h
+
+		cp kde_preferences.cpp kde_preferences.cpp.orig
+		sed 's:\("vlc preferences", true, false, \)\("Save\):\1(KGuiItem)\2:' \
+			kde_preferences.cpp.orig > kde_preferences.cpp
+	fi
+	)
+}
+
+src_compile(){
+
+	use X \
+		&& myconf="${myconf} --enable-x11 --enable-xvideo" \
+		|| myconf="${myconf} --disable-x11 --disable-xvideo"
+
+	use qt \
+		&& myconf="${myconf} --enable-qt" \
+		|| myconf="${myconf} --disable-qt"
+	
+	use dvd \
+		&& myconf="${myconf} \
+			--enable-dvd \
+			--enable-dvdread \
+			--enable-vcd" \
+		|| myconf="${myconf} --disable-dvd --disable-dvdread --disable-vcd"
+	
+	use esd \
+		&& myconf="${myconf} --enable-esd" \
+		|| myconf="${myconf} --disable-esd"
+
+	use ggi \
+		&& myconf="${myconf} --enable-ggi" \
+		|| myconf="${myconf} --disable-ggi"
+
+	use gtk \
+		&& myconf="${myconf} --enable-gtk" \
+		|| myconf="${myconf} --disable-gtk"
+
+	use kde \
+		&& myconf="${myconf} --enable-kde" \
+		|| myconf="${myconf} --disable-kde"
+
+	use nls \
+		|| myconf="${myconf} --disable-nls"
+	
+	use 3dfx \
+		&& myconf="${myconf} --enable-glide" \
+		|| myconf="${myconf} --disable-glide"
+
+	use arts \
+		&& myconf="${myconf} --enable-arts" \
+		|| myconf="${myconf} --disable-arts"
+	
+	use gnome \
+		&& myconf="${myconf} --enable-gnome" \
+		|| myconf="${myconf} --disable-gnome"
+	
+	use ncurses \
+		&& myconf="${myconf} --enable-ncurses" \
+		|| myconf="${myconf} --disable-ncurses"
+	
+	use directfb \
+		&& myconf="${myconf} --enable-fb" \
+		|| myconf="${myconf} --disable-fb"
+
+	use oggvorbis \
+		&& myconf="${myconf} --enable-vorbis" \
+		|| myconf="${myconf} --disable-vorbis"
+
+	use alsa \
+		&& myconf="${myconf} --enable-alsa" \
+		|| myconf="${myconf} --disable-alsa"
+
+	# vlc uses its own ultraoptimizaed CXXFLAGS
+	# and forcing custom ones generally fails building
+	export CXXFLAGS=""
+	export CFLAGS=""
+	
+	autoconf || die
+	
+	./configure \
+		--prefix=/usr \
+		--mandir=/usr/share/man \
+		--infodir=/usr/share/info \
+		--sysconfdir=/etc \
+		--host=${CHOST} \
+		--build=${CHOST} \
+		--target=${CHOST} \
+		--localstatedir=/var/state/vlc \
+		--with-sdl \
+		--disable-a52 \
+		--enable-release \
+		--enable-mad \
+		${myconf} || die
+
+	emake || die
+}
+
+src_install() {
+
+	dodir /usr/{bin,lib}
+	make DESTDIR=${D} install || die
+
+	dodoc AUTHORS COPYING ChangeLog FAQ INSTALL* README* MODULES TODO
+
+}