New ebuild which depends on libmad/libid3tag and fixes the

mozplugin.patch

5 files changed, 215 insertions, 32 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index fba2da281e89..7774fe7af0fc 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,8 +1,13 @@
 # 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.24 2003/07/16 23:38:40 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.25 2003/07/17 14:09:36 raker Exp $
 
-vlc-0.6.0-r1 (16 Jul 2003)
+*vlc-0.6.0-r2 (17 Jul 2003)
+
+  17 Jul 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.0-r2.ebuild:
+  Changed "mad" depends to the new libmad/libid3tag
+
+*vlc-0.6.0-r1 (16 Jul 2003)
 
   16 Jul 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.0-r1.ebuild,
   files/mozplugin.patch:
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 62e5b56fdc50..1dcc21889526 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,13 +1,15 @@
-MD5 76aded654f891bac4c15bacc747adc81 vlc-0.6.0-r1.ebuild 5468
+MD5 7cb3fbcee5d4a4c401986e1b97c2d4c6 vlc-0.6.0-r1.ebuild 5472
 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 b555002d2c34f53da1a6a6b1349755eb vlc-0.6.0-r2.ebuild 5485
 MD5 ecee6eaca98dfa911be0126c0c9fe3ec vlc-0.4.5.ebuild 3850
-MD5 57767091b209acc0cb8cec585683b76f ChangeLog 4629
+MD5 e9bde261e1d16c12f362429600423665 ChangeLog 4772
 MD5 6d7dd1d8477d38f85cc4d4ed59489b4f files/digest-vlc-0.5.2-r1 63
 MD5 5f5a12e2d124384eb5d129e60879202d files/digest-vlc-0.6.0-r1 63
-MD5 2662156d7971370541a6d8ee448bef3e files/mozplugin.patch 7010
+MD5 5f5a12e2d124384eb5d129e60879202d files/digest-vlc-0.6.0-r2 63
+MD5 5cf5ab60ab2619db091501d7acc50284 files/mozplugin.patch 5995
 MD5 70c6a90f7ec8790625d24e0b15cfa6b5 files/digest-vlc-0.4.4 63
 MD5 36b957169001a5ba78c09d813f23b550 files/digest-vlc-0.4.5 63
 MD5 6d7dd1d8477d38f85cc4d4ed59489b4f files/digest-vlc-0.5.2 63
diff --git a/media-video/vlc/files/digest-vlc-0.6.0-r2 b/media-video/vlc/files/digest-vlc-0.6.0-r2
new file mode 100644
index 000000000000..9696a1b88ca9
--- /dev/null
+++ b/media-video/vlc/files/digest-vlc-0.6.0-r2
@@ -0,0 +1 @@
+MD5 5f985a6e94dd411681b0b81e414f11e6 vlc-0.6.0.tar.bz2 2844463
diff --git a/media-video/vlc/files/mozplugin.patch b/media-video/vlc/files/mozplugin.patch
index 20e75a0c6aac..ce6be2d920bb 100644
--- a/media-video/vlc/files/mozplugin.patch
+++ b/media-video/vlc/files/mozplugin.patch
@@ -126,15 +126,6 @@ diff -urN vlc-0.6.0/mozilla/vlc.r vlc-0.6.0-mozfix/mozilla/vlc.r
 diff -urN vlc-0.6.0/mozilla/vlcpeer.cpp vlc-0.6.0-mozfix/mozilla/vlcpeer.cpp
 --- vlc-0.6.0/mozilla/vlcpeer.cpp	2002-10-11 17:32:56.000000000 -0500
 +++ vlc-0.6.0-mozfix/mozilla/vlcpeer.cpp	2003-07-16 16:32:54.000000000 -0500
-@@ -2,7 +2,7 @@
-  * vlcpeer.cpp: scriptable peer descriptor
-  *****************************************************************************
-  * Copyright (C) 2002 VideoLAN
-- * $Id: mozplugin.patch,v 1.1 2003/07/16 23:38:40 raker Exp $
-+ * $Id: mozplugin.patch,v 1.1 2003/07/16 23:38:40 raker Exp $
-  *
-  * Authors: Samuel Hocevar <sam@zoy.org>
-  *
 @@ -26,12 +26,13 @@
   *****************************************************************************/
  #include <vlc/vlc.h>
@@ -155,15 +146,6 @@ diff -urN vlc-0.6.0/mozilla/vlcpeer.cpp vlc-0.6.0-mozfix/mozilla/vlcpeer.cpp
 diff -urN vlc-0.6.0/mozilla/vlcplugin.cpp vlc-0.6.0-mozfix/mozilla/vlcplugin.cpp
 --- vlc-0.6.0/mozilla/vlcplugin.cpp	2003-02-18 07:13:12.000000000 -0600
 +++ vlc-0.6.0-mozfix/mozilla/vlcplugin.cpp	2003-07-16 16:32:54.000000000 -0500
-@@ -2,7 +2,7 @@
-  * vlcplugin.cpp: a VLC plugin for Mozilla
-  *****************************************************************************
-  * Copyright (C) 2002 VideoLAN
-- * $Id: mozplugin.patch,v 1.1 2003/07/16 23:38:40 raker Exp $
-+ * $Id: mozplugin.patch,v 1.1 2003/07/16 23:38:40 raker Exp $
-  *
-  * Authors: Samuel Hocevar <sam@zoy.org>
-  *
 @@ -26,6 +26,8 @@
   *****************************************************************************/
  #include <vlc/vlc.h>
@@ -176,15 +158,6 @@ diff -urN vlc-0.6.0/mozilla/vlcplugin.cpp vlc-0.6.0-mozfix/mozilla/vlcplugin.cpp
 diff -urN vlc-0.6.0/mozilla/vlcshell.cpp vlc-0.6.0-mozfix/mozilla/vlcshell.cpp
 --- vlc-0.6.0/mozilla/vlcshell.cpp	2003-04-09 12:27:51.000000000 -0500
 +++ vlc-0.6.0-mozfix/mozilla/vlcshell.cpp	2003-07-16 16:32:54.000000000 -0500
-@@ -2,7 +2,7 @@
-  * vlcshell.cpp: a VLC plugin for Mozilla
-  *****************************************************************************
-  * Copyright (C) 2002 VideoLAN
-- * $Id: mozplugin.patch,v 1.1 2003/07/16 23:38:40 raker Exp $
-+ * $Id: mozplugin.patch,v 1.1 2003/07/16 23:38:40 raker Exp $
-  *
-  * Authors: Samuel Hocevar <sam@zoy.org>
-  *
 @@ -29,6 +29,7 @@
   *****************************************************************************/
  #include <stdio.h>
diff --git a/media-video/vlc/vlc-0.6.0-r2.ebuild b/media-video/vlc/vlc-0.6.0-r2.ebuild
new file mode 100644
index 000000000000..9b0be49c695a
--- /dev/null
+++ b/media-video/vlc/vlc-0.6.0-r2.ebuild
@@ -0,0 +1,202 @@
+# 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.0-r2.ebuild,v 1.1 2003/07/17 14:09:36 raker Exp $
+
+# NOTE: Some ideas for version specifics, etc...  have been referenced 
+# from the videolan.org ebuild.  Thanks guys!
+
+IUSE="arts qt ncurses dvd gtk nls 3dfx matrox svga fbcon esd kde X alsa ggi oggvorbis gnome xv oss sdl aalib slp truetype v4l xvid lirc wxwindows imlib mozilla"
+
+S=${WORKDIR}/${P}
+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 )
+	dvd? ( >=media-libs/libdvdread-0.9.3
+		>=media-libs/libdvdcss-1.2.6
+		>=media-libs/libdvdplay-1.0.1 )
+	esd? ( >=media-sound/esound-0.2.22 )
+	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-libs/libmad media-libs/libid3tag )
+	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.0 )
+	xvid? ( >=media-libs/xvid-0.9.1 )
+	>=media-libs/a52dec-0.7.4
+	>=media-libs/faad2-1.1
+	>=media-libs/flac-1.1.0
+	>=media-libs/libdv-0.98
+        >=media-libs/libdvbpsi-0.1.2
+	>media-video/ffmpeg-0.4.6
+	>media-libs/libmpeg2-0.3.1"
+
+# vlc requires cvs-pulled builds of ffmpeg and libmpeg2
+# I have added these builds to portage as...
+# ffmpeg-0.4.7_pre20030624 and libmpeg2-0.3.2_pre20030625
+#   -raker@gentoo.org
+#
+# Missing support for...
+#	tarkin
+#	theora
+#	tremor
+
+# 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}
+
+	epatch ${FILESDIR}/mozplugin.patch
+
+	# 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.ac configure.ac.orig
+		sed "s:-lkfile::" \
+			configure.ac.orig > configure.ac
+
+		cd ${S}/modules/gui/kde
+		cp interface.h interface.h.orig
+		sed "s:\(#include <kmainwindow.h>\):\1\n#include <kstatusbar.h>:" \
+			interface.h.orig > interface.h
+
+		cp preferences.cpp preferences.cpp.orig
+		sed 's:\("vlc preferences", true, false, \)\("Save\):\1(KGuiItem)\2:' \
+			preferences.cpp.orig > preferences.cpp
+	fi
+	)
+
+	# Change the location of the glide headers
+	cd ${S}
+	sed -i -e "s:/usr/include/glide:/usr/include/glide3:" configure
+}
+
+src_compile(){
+
+	cd ${S}
+	myconf=""
+
+	use X || myconf="${myconf} --disable-x11"
+
+	use xv || myconf="${myconf} --disable-xvideo"
+
+	use ggi && myconf="${myconf} --enable-ggi"
+
+        use 3dfx && myconf="${myconf} --enable-glide"
+
+        use matrox && myconf="${myconf} --enable-mga"
+
+        use svga && myconf="${myconf} --enable-svgalib"
+
+	use sdl || myconf="${myconf} --disable-sdl"
+
+        use fbcon || myconf="${myconf} --disable-fb"
+
+        use aalib && myconf="${myconf} --enable-aa"
+
+	use dvd \
+		&& myconf="${myconf} --enable-dvdread" \
+		|| myconf="${myconf} \
+			--disable-dvd \
+			--disable-dvdread \
+			--disable-dvdplay \
+			--disable-vcd"
+
+	use alsa && myconf="${myconf} --enable-alsa"
+
+        use oss || myconf="${myconf} --disable-oss"
+
+	use esd && myconf="${myconf} --enable-esd"
+
+	use arts && myconf="${myconf} --enable-arts"
+
+	use nls || myconf="${myconf} --disable-nls"
+
+	use gtk \
+		&& myconf="${myconf} --disable-gtk2" \
+		|| myconf="${myconf} --disable-gtk --disable-gtk2"
+
+	use gnome && myconf="${myconf} --enable-gnome --disable-gnome2"
+
+	use kde && myconf="${myconf} --enable-kde"
+
+	use qt && myconf="${myconf} --enable-qt"
+
+	use ncurses && myconf="${myconf} --enable-ncurses"
+
+	use oggvorbis || myconf="${myconf} --disable-vorbis --disable-ogg"
+
+	use lirc && myconf="${myconf} --enable-lirc"
+
+	use slp || myconf="${myconf} --disable-slp"
+
+	use mad && myconf="${myconf} --enable-mad"
+
+	use v4l && myconf="${myconf} --enable-v4l"
+
+	(use imlib && use wxwindows) && myconf="${myconf} --enable-skins"
+
+	use xvid && myconf="${myconf} --enable-xvid"
+
+	if [ "`use mozilla`" ]; then 
+		myconf="${myconf} --enable-mozilla \
+			MOZILLA_CONFIG=/usr/lib/mozilla/mozilla-config \
+			XPIDL=/usr/bin/xpidl"
+		sed -i -e "s:/usr/share/idl/mozilla:/usr/lib/mozilla/include/idl:g" Makefile.am
+		sed -i -e "s:/usr/share/idl/mozilla:/usr/lib/mozilla/include/idl:g" Makefile.in
+	fi
+
+	# vlc uses its own ultraoptimized CXXFLAGS
+	# and forcing custom ones generally fails building
+	export CXXFLAGS=""
+	export CFLAGS=""
+	export WANT_AUTOCONF_2_5=1
+	export WANT_AUTOMAKE_1_6=1
+
+	myconf="${myconf} \
+		--enable-release \
+		--enable-faad \
+		--enable-a52 \
+		--enable-dvbpsi"
+
+	ewarn ${myconf}
+	econf ${myconf} || die "configure of VLC failed"
+
+	make || die "make of VLC failed"
+}
+
+src_install() {
+	
+	einstall || die "make install failed"
+
+	dodoc ABOUT-NLS AUTHORS COPYING ChangeLog HACKING INSTALL* \
+	MAINTAINERS NEWS README* MODULES THANKS
+
+}