Qt3 support as well now

6 files changed, 49 insertions, 76 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 32134d4c9d79..95034adc5f57 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,15 @@
 # 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.4 2002/05/24 09:43:37 seemant Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.5 2002/06/18 03:46:41 seemant Exp $
+
+*vlc-0.4.0 (17 Jun 2002)
+
+  17 Jun 2002; Seemant Kulleen <seemant@gentoo.org> vlc-0.4.0-r1.ebuild
+  files/digest-vlc-0.4.0-r1 :
+
+  This now works with Qt2 and Qt3, depending on which is reflected in
+  $QTDIR.  Thanks to BradPritt@gmx.de (Markus Mohr) in bug #3678 for
+  providing this fix.
 
 *vlc-0.4.0 (24 May 2002)
 
diff --git a/media-video/vlc/files/digest-vlc-0.3.1 b/media-video/vlc/files/digest-vlc-0.3.1
deleted file mode 100644
index b2b7ad689e53..000000000000
--- a/media-video/vlc/files/digest-vlc-0.3.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd679a84b0b29e7e87b43f4f901af5d1 vlc-0.3.1.tar.gz 1172172
diff --git a/media-video/vlc/files/digest-vlc-0.3.1-r1 b/media-video/vlc/files/digest-vlc-0.3.1-r1
deleted file mode 100644
index b2b7ad689e53..000000000000
--- a/media-video/vlc/files/digest-vlc-0.3.1-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bd679a84b0b29e7e87b43f4f901af5d1 vlc-0.3.1.tar.gz 1172172
diff --git a/media-video/vlc/files/digest-vlc-0.4.0-r1 b/media-video/vlc/files/digest-vlc-0.4.0-r1
new file mode 100644
index 000000000000..af924ff42be9
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.4.0-r1
@@ -0,0 +1 @@
+MD5 009431f48f8cd0b100b398ce2b877062 vlc-0.4.0.tar.gz 1320185
diff --git a/media-video/vlc/vlc-0.3.1.ebuild b/media-video/vlc/vlc-0.3.1.ebuild
deleted file mode 100644
index 77629800b7c8..000000000000
--- a/media-video/vlc/vlc-0.3.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Distributed under the terms of the GNU General Public License, v2 or later
-# Author: Nathaniel Hirsch <nh2@njit.edu> 
-# Author: Achim Gottinger <achim@gentoo.org>
-# Author: Karl Trygve Kalleberg <karltk@gentoo.org>
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.3.1.ebuild,v 1.2 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
-	>=media-libs/libdvdcss-1.1.1
-	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 myc
-
-	use fbdev && myc="$myc --enable-fb"  || myc="$myc --disable-fb"
-	use mmx && myc="$myc --enable-mmx" || myc="$myc --disable-mmx"
-	use esd && myc="$myc --enable-esd" || myc="$myc --disable-esd"
-	use ggi && myc="$myc --with-ggi" || myc="$myc --without-ggi"	
-
-	if [ "`use qt`" ] ; then
-		export QTDIR=/usr/qt/2
-		myc="$myc --enable-qt"
-	fi
-
-	#use kde && myc="$myc --enable-kde" || myc="$myc --disable-kde"
-	use gnome && myc="$myc --enable-gnome" || myc="$myc --disable-gnome"
-	use gtk && myc="$myc --enable-gtk" || myc="$myc --disable-gtk"
-	use X && myc="$myc --enable-xvideo" || myc="$myc --disable-x11"
-
-#    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=""
-    
-
-	# Why are we requiring SDL here ? -- karltk
-	./configure \
-		--prefix=/usr \
-		$myconf \
-		--with-sdl \
-		--disable-alsa \
-		--enable-release || die
-	make || die
-}
-
-src_install() {
-	dodir /usr/{bin,lib}
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS ChangeLog COPYING FAQ INSTALL README TODO
-}
-
diff --git a/media-video/vlc/vlc-0.3.1-r1.ebuild b/media-video/vlc/vlc-0.4.0-r1.ebuild
index 3408487638b2..b137c7b612f5 100644
--- a/media-video/vlc/vlc-0.3.1-r1.ebuild
+++ b/media-video/vlc/vlc-0.4.0-r1.ebuild
@@ -1,7 +1,6 @@
 # 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.3.1-r1.ebuild,v 1.2 2002/05/21 18:14:11 danarmak Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.4.0-r1.ebuild,v 1.1 2002/06/18 03:46:41 seemant Exp $
 
 S=${WORKDIR}/${P}
 DESCRIPTION="VideoLAN Client - DVD/video player"
@@ -9,7 +8,7 @@ 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* )
+	qt? ( x11-libs/qt )
 	dvd? ( media-libs/libdvdread
 		media-libs/libdvdcss )
 	>=media-libs/libsdl-1.1.8-r1
@@ -20,11 +19,44 @@ DEPEND="X? ( virtual/x11 )
 	arts? ( kde-base/kdelibs )
 	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )
 	ncurses? ( sys-libs/ncurses )
-	oggvorbis? ( >=media-libs/libvorbis )
+	oggvorbis? ( media-libs/libvorbis )
 	alsa? ( >=media-libs/alsa-lib-0.9_rc1 )"
 
 RDEPEND="nls? ( sys-devel/gettext )"
 
+SLOT=""
+LICENSE="GPL-2"
+
+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:\(-L${KDEDIR}/lib\) -lkfile:\1:" \
+			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 \
@@ -110,5 +142,6 @@ src_install() {
 	dodir /usr/{bin,lib}
 	make DESTDIR=${D} install || die
 
-}
+	dodoc AUTHORS COPYING ChangeLog FAQ INSTALL* README* MODULES TODO
 
+}