See bug #24119. glide and autotools-related fixes.

4 files changed, 45 insertions, 5 deletions

diff --git a/media-video/vlc/ChangeLog b/media-video/vlc/ChangeLog
index 4991093901c3..06acfdb71ee4 100644
--- a/media-video/vlc/ChangeLog
+++ b/media-video/vlc/ChangeLog
@@ -1,6 +1,11 @@
 # 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.31 2003/08/16 01:56:10 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.32 2003/08/16 08:16:42 g2boojum Exp $
+
+  16 Aug 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.2.ebuild,
+  files/glide.patch:
+  Glide works now possibly.  See bug #24119.  Also added the touch stuff
+  from the videolan cvs ebuild.
 
   15 Aug 2003; Nick Hadaway <raker@gentoo.org> vlc-0.6.2.ebuild:
   Stripping -fomit-frame-pointer if gcc-major-version -eq 2.  See bug
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index 05c93509a442..749c9b632732 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -3,13 +3,14 @@ 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 a5994af185866ec6d5c18275392a0958 vlc-0.6.2.ebuild 6104
+MD5 bceaac43ffe8949c547c705155bd45e9 vlc-0.6.2.ebuild 6337
 MD5 ecee6eaca98dfa911be0126c0c9fe3ec vlc-0.4.5.ebuild 3850
 MD5 9d740a9c8110a843c5f12f6685e17d4f vlc-0.6.1.ebuild 6167
-MD5 3f9c6fcc21888cdc4754aefaa3dce761 ChangeLog 6686
+MD5 9e76129d67016d5b5964e7a635786ddc ChangeLog 6878
 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
+MD5 c5c0f3cdd6b2afd05a3090dfc55074e0 files/glide.patch 744
 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/glide.patch b/media-video/vlc/files/glide.patch
new file mode 100644
index 000000000000..21140f701208
--- /dev/null
+++ b/media-video/vlc/files/glide.patch
@@ -0,0 +1,23 @@
+--- glide.c	2003-08-16 02:49:23.000000000 -0400
++++ glide.c-modified	2003-08-16 02:46:13.000000000 -0400
+@@ -243,20 +243,11 @@
+ 
+ static int OpenDisplay( vout_thread_t *p_vout )
+ {
+-    static char version[80];
+-    GrHwConfiguration hwconfig;
+     GrScreenResolution_t resolution = GR_RESOLUTION_800x600;
+     GrLfbInfo_t p_front_buffer_info;                    /* front buffer info */
+ 
+-    grGlideGetVersion( version );
+     grGlideInit();
+ 
+-    if( !grSstQueryHardware(&hwconfig) )
+-    {
+-        msg_Err( p_vout, "cannot get 3dfx hardware config" );
+-        return( 1 );
+-    }
+-
+     grSstSelect( 0 );
+     if( !grSstWinOpen( 0, resolution, GR_REFRESH_60Hz,
+                        GR_COLORFORMAT_ABGR, GR_ORIGIN_UPPER_LEFT, 2, 1 ) )
diff --git a/media-video/vlc/vlc-0.6.2.ebuild b/media-video/vlc/vlc-0.6.2.ebuild
index 1c628dac8cb8..7262b70fc8e1 100644
--- a/media-video/vlc/vlc-0.6.2.ebuild
+++ b/media-video/vlc/vlc-0.6.2.ebuild
@@ -1,6 +1,6 @@
 # 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.2.ebuild,v 1.2 2003/08/16 01:56:10 g2boojum Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-0.6.2.ebuild,v 1.3 2003/08/16 08:16:42 g2boojum Exp $
 
 # Missing support for...
 #	tarkin - package not in portage yet - experimental
@@ -50,6 +50,7 @@ DEPEND="X? ( virtual/x11 )
 	wxwindows? ( >=x11-libs/wxGTK-2.4.1 )
 	xosd? ( >=x11-libs/xosd-2.0 )
 	xvid? ( >=media-libs/xvid-0.9.1 )
+	3dfx? ( media-libs/glide-v3 )
 	>=media-libs/a52dec-0.7.4
 	>=media-libs/flac-1.1.0
 	>=media-libs/libdv-0.98
@@ -88,9 +89,19 @@ src_unpack() {
 	fi
 	)
 
-	# Change the location where glide headers are installed
+	# We only have glide v3 in portage
 	cd ${S}
 	sed -i -e "s:/usr/include/glide:/usr/include/glide3:" configure
+	sed -i -e "s:glide2x:glide3:" configure
+	cd ${S}/modules/video_output
+	epatch ${FILESDIR}/glide.patch
+	cd ${S}
+		
+	touch configure.ac
+	touch aclocal.m4
+	touch configure
+	touch config.h.in
+	touch `find . -name Makefile.in`
 }
 
 src_compile(){