version bump

5 files changed, 123 insertions, 85 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index a996b68e005d..32134d4c9d79 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,13 @@
 # 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.3 2002/05/19 10:14:31 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.4 2002/05/24 09:43:37 seemant Exp $
+
+*vlc-0.4.0 (24 May 2002)
+
+  24 May 2002; Seemant Kulleen <seemant@gentoo.org> vlc-0.4.0.ebuild
+  files/digest-vlc-0.4.0 :
+
+  Version bump.
 
 *vlc-0.3.1-r1 (19 May 2002)
 
diff --git a/media-video/vlc/files/digest-vlc-0.2.91 b/media-video/vlc/files/digest-vlc-0.2.91
deleted file mode 100644
index b2de25d002b0..000000000000
--- a/media-video/vlc/files/digest-vlc-0.2.91
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a96a4ef83def70b9ab5a4ec364e43709 vlc-0.2.91.tar.gz 1078617
diff --git a/media-video/vlc/files/digest-vlc-0.4.0 b/media-video/vlc/files/digest-vlc-0.4.0
new file mode 100644
index 000000000000..af924ff42be9
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.4.0
@@ -0,0 +1 @@
+MD5 009431f48f8cd0b100b398ce2b877062 vlc-0.4.0.tar.gz 1320185
diff --git a/media-video/vlc/vlc-0.2.91.ebuild b/media-video/vlc/vlc-0.2.91.ebuild
deleted file mode 100644
index 3de43a70f7c7..000000000000
--- a/media-video/vlc/vlc-0.2.91.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# 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.2.91.ebuild,v 1.5 2002/05/23 06:50:14 seemant Exp $
-
-S=${WORKDIR}/${P}
-DESCRIPTION="DVD / video player"
-SRC_URI="http://www.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz"
-HOMEPAGE="http://www.videolan.org"
-
-DEPEND=">=media-libs/libsdl-1.1.8-r1
-	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
-    esd? ( >=media-sound/esound-0.2.22 )
-    ggi? ( >=media-libs/libggi-2.0_beta3 )
-    qt? ( =x11-libs/qt-2.3* )
-    gtk? ( =x11-libs/gtk+-1.2* )
-    X? ( virtual/x11 )"
-    #alsa? ( >=media-libs/alsa-lib-0.5.10 )
-    #kde? ( >=kde-base/kdelibs-2.1.1 )
-
-src_compile(){
-    local myconf
-	if [ "`use fbdev`" ]
-    then
-      myconf="--enable-fb"
-    fi
-    if [ -z "`use mmx`" ]
-    then
-      myconf="$myconf --disable-mmx"
-    fi
-    if [ "`use esd`" ]
-    then
-      myconf="$myconf --enable-esd"
-    fi
-    if [ "`use ggi`" ]
-    then
-      myconf="$myconf --with-ggi"
-    fi
-    if [ "`use qt`" ]
-    then
-      export QTDIR=/usr/qt/2
-      myconf="$myconf --enable-qt"
-    fi
-    #if [ "`use kde`" ]
-    #then
-    #  myconf="$myconf --enable-kde"
-    #fi
-    if [ "`use gnome`" ]
-    then
-      myconf="$myconf --enable-gnome"
-    fi
-    if [ -z "`use gtk`" ]
-    then
-      myconf="$myconf --disable-gtk"
-    fi
-    if [ "`use X`" ]
-    then
-      myconf="$myconf --enable-xvideo"
-    else
-      myconf="$myconf --disable-x11"
-    fi
-
-#    Currently alsa support in vlc requires Alsa 0.90 (which is unstable).
-#    Until some release of alsa is released which works with vlc don't use it.
-#    if [ "`use alsa`" ]
-#    then
-#      myconf="$myconf --enable-alsa"
-#    fi
-
-    # vlc uses its own ultraoptimizaed CXXFLAGS, and forcing custom ones generally fails building
-    export CXXFLAGS=""
-    export CFLAGS=""
-    
-    ./configure --prefix=/usr $myconf --with-sdl --disable-alsa --enable-release || die
-    make || die
-}
-
-src_install() {
-
-    dodir /usr/{bin,lib}
-    make DESTDIR=${D} install || die
-
-}
-
diff --git a/media-video/vlc/vlc-0.4.0.ebuild b/media-video/vlc/vlc-0.4.0.ebuild
new file mode 100644
index 000000000000..2e46d4f1114d
--- /dev/null
+++ b/media-video/vlc/vlc-0.4.0.ebuild
@@ -0,0 +1,114 @@
+# 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 $
+
+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-2.3* )
+	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_rc1 )"
+
+RDEPEND="nls? ( sys-devel/gettext )"
+
+src_compile(){
+
+	use X \
+		&& myconf="${myconf} --enable-x11 --enable-xvideo" \
+		|| myconf="${myconf} --disable-x11 --disable-x11"
+
+	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=""
+	
+	./configure \
+		--prefix=/usr \
+		--with-sdl \
+		--disable-alsa \
+		--disable-a52 \
+		--enable-release \
+		${myconf} || die
+
+	make || die
+}
+
+src_install() {
+
+	dodir /usr/{bin,lib}
+	make DESTDIR=${D} install || die
+
+}
+