removed matrox use variable

3 files changed, 24 insertions, 11 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 0dc9eddab7e2..2a79a435331a 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,15 @@
 # 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.27 2003/07/20 07:45:01 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.28 2003/07/21 06:37:23 raker Exp $
+
+  21 Jul 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.0-r1.ebuild:
+  Removed the matrox use variable and forced disable-mga as the
+  module is known not to work, slower than other rendering, and will
+  not be updated upstream anymore.
+
+  20 Jul 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.0-r1.ebuild:
+  Added support for the debug USE variable.  Added the matroska
+  local USE variable.
 
   19 Jul 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.0-r1.ebuild:
   Added the dvb USE variable.  Added a comment re: truetype for 0.6.1
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 3ff5a245b2a9..b9c280289276 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -1,10 +1,10 @@
-MD5 7cb3fbcee5d4a4c401986e1b97c2d4c6 vlc-0.6.0-r1.ebuild 5472
+MD5 8f9767673598416b3775e373255d0858 vlc-0.6.0-r1.ebuild 5726
 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 ecee6eaca98dfa911be0126c0c9fe3ec vlc-0.4.5.ebuild 3850
-MD5 a5bf44ba5e132527a649e1e7d7dfb9e0 ChangeLog 4869
+MD5 f5b71aa29def0ddb9029a7b7b52e8a3f ChangeLog 5621
 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/vlc-0.6.0-r1.ebuild b/media-video/vlc/vlc-0.6.0-r1.ebuild
index 59469625532e..247b354a58ff 100644
--- a/media-video/vlc/vlc-0.6.0-r1.ebuild
+++ b/media-video/vlc/vlc-0.6.0-r1.ebuild
@@ -1,18 +1,18 @@
 # 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-r1.ebuild,v 1.2 2003/07/20 07:45:01 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.0-r1.ebuild,v 1.3 2003/07/21 06:37:23 raker Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet
 #	theora - package not in portage yet
 #	tremor - package not in portage yet
-#	matroska - talking with vlc developers
+#	matroska - not working yet
 #	gtk2 - still experimental? - need more info
 
 
-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 dvb"
+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 matroska debug"
 
 S=${WORKDIR}/${P}
 
@@ -99,7 +99,7 @@ src_unpack() {
 
 src_compile(){
 	local myconf
-	myconf="--enable-release --enable-faad --enable-a52 --enable-dvbpsi"
+	myconf="--enable-faad --enable-a52 --enable-dvbpsi --disable-mga"
 
 	use X || myconf="${myconf} --disable-x11"
 
@@ -109,8 +109,6 @@ src_compile(){
 
         use 3dfx && myconf="${myconf} --enable-glide"
 
-        use matrox && myconf="${myconf} --enable-mga"
-
         use svga && myconf="${myconf} --enable-svgalib"
 
 	use sdl || myconf="${myconf} --disable-sdl"
@@ -176,6 +174,12 @@ src_compile(){
 	# Coming in 0.6.1 - For enabling subtitling code
 	# use truetype && myconf="${myconf} --enable-freetype"
 
+	# Matroska support doesn't appear to compile properly yet
+	# use matroska && myconf="${myconf} --enable-mkv"
+
+	use debug && myconf="${myconf} --enable-debug" \
+		|| myconf="${myconf} --enable-release"
+
 	# vlc uses its own ultraoptimized CXXFLAGS
 	# and forcing custom ones generally fails building
 	export CXXFLAGS=""