Unmasked mtxdrivers, made mtxdrivers-pro use opengl-update

2 files changed, 44 insertions, 23 deletions

diff --git a/media-video/mtxdrivers-pro/mtxdrivers-pro-1.0_beta4.ebuild b/media-video/mtxdrivers-pro/mtxdrivers-pro-1.0_beta4.ebuild
index 4b3d790a4a48..6a6d97d02d6a 100644
--- a/media-video/mtxdrivers-pro/mtxdrivers-pro-1.0_beta4.ebuild
+++ b/media-video/mtxdrivers-pro/mtxdrivers-pro-1.0_beta4.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/mtxdrivers-pro/mtxdrivers-pro-1.0_beta4.ebuild,v 1.1 2003/06/06 15:29:40 prez Exp $                     
+# $Header: /var/cvsroot/gentoo-x86/media-video/mtxdrivers-pro/mtxdrivers-pro-1.0_beta4.ebuild,v 1.2 2003/06/06 17:38:17 prez Exp $                     
 
 At="mtxdrivers-pro-rh9.0-beta4.tar.gz"
 S="${WORKDIR}/mtxdrivers-pro-RH9.0-beta4"
@@ -9,7 +9,8 @@ DESCRIPTION="Drviers for the Matrox Parhelia and Millenium P650/P750 cards with
 HOMEPAGE="http://www.matrox.com/mga/products/parhelia/home.cfm"
 
 DEPEND=">=x11-base/xfree-4.2.0
-	virtual/kernel"
+	virtual/kernel
+	opengl-update"
 
 SLOT="0"
 LICENSE="Matrox"
@@ -23,7 +24,8 @@ src_unpack() {
 		einfo "Matrox requires you email them for the 'pro' version of their drivers"
 		einfo "(ie. the ones with GL support).  If you do not need GL support, please"
 		einfo "emerge mtxdrivers, otherwise e-mail cad-support@matrox.com and request"
-		einfo "the Matrox Parhelia drivers with GL support."
+		einfo "the Matrox Parhelia drivers with GL support.  Please remember to"
+		einfo "download the RH9.0 driver, once you are given the site address."
 		die
     fi
 	unpack ${At}
@@ -52,8 +54,10 @@ src_install() {
 	Xpath="`which X | sed -e "s:/bin/X$::"`"
 	Kversion=`uname -r`
 
-	dodir /usr/lib /usr/include/GL /lib/modules/${Kversion}/kernel/drivers/video
-    dodir ${Xpath}/lib/modules/drivers ${Xpath}/lib/modules/extensions
+	dodir /lib/modules/${Kversion}/kernel/drivers/video
+	dodir /usr/include/GL ${Xpath}/lib/modules/drivers
+	dodir /usr/lib/opengl/mtx/extensions
+    dodir /usr/lib/opengl/mtx/lib /usr/lib/opengl/mtx/include
 
 	dodoc README* samples/*
 
@@ -64,19 +68,29 @@ src_install() {
 	install -m 755 ${S}/xfree86/${Xversion}/mtx_drv.o ${D}/${Xpath}/lib/modules/drivers
 
 	# OpenGL
-	install -m 755 ${S}/xfree86/${Xversion}/libglx.a ${D}/${Xpath}/lib/modules/extensions
-	install -m 644 ${S}/include/GL/gl.h ${D}/usr/include/GL
-	install -m 644 ${S}/include/GL/glx.h ${D}/usr/include/GL
+	install -m 755 ${S}/xfree86/${Xversion}/libglx.a ${D}/usr/lib/opengl/mtx/extensions
+	install -m 644 ${S}/include/GL/gl.h ${D}/usr/lib/opengl/mtx/include
+	install -m 644 ${S}/include/GL/glx.h ${D}/usr/lib/opengl/mtx/include
 	install -m 644 ${FILESDIR}/glext.h ${D}/usr/include/GL
-	dolib ${S}/lib/libGL.so.${GLversion}
+	install -m 755 ${S}/lib/libGL.so.${GLversion} ${D}/usr/lib/opengl/mtx/lib
+	cd ${D}/usr/lib/opengl/mtx/lib
+	ln -s libGL.so.${GLversion} libGL.so.1
+	ln -s libGL.so.${GLversion} libGL.so
 }
 
 pkg_postinst() {
     /sbin/depmod -a
     /sbin/ldconfig
-	einfo "Please look at /usr/share/doc/${P}/XF86Config.* for X configurations"
-	einfo "for your Parhelia or Millenium P650/P750 card."
-	einfo "NOTE: To be able to use busmastering (required for GL) , you MUST"
-	einfo "      have /dev/video as a directory, which means you must remove"
-    einfo "      anything there first (rm -f /dev/video), and mkdir /dev/video"
+	opengl-update mtx
+	einfo "Please look at /usr/share/doc/${P}/XF86Config.* for"
+	einfo "X configurations for your Parhelia or Millenium P650/P750 card."
+	if [ ! -d /dev/video ]; then
+		if [ -f /dev/video ]; then
+			einfo "NOTE: To be able to use busmastering (required for GL) , you MUST"
+			einfo "      have /dev/video as a directory, which means you must remove"
+		    einfo "      anything there first (rm -f /dev/video), and mkdir /dev/video"
+		else
+			mkdir /dev/video
+		fi
+	fi
 }
diff --git a/media-video/mtxdrivers/mtxdrivers-0.3.0.ebuild b/media-video/mtxdrivers/mtxdrivers-0.3.0.ebuild
index f497849183cd..399c7cd11698 100644
--- a/media-video/mtxdrivers/mtxdrivers-0.3.0.ebuild
+++ b/media-video/mtxdrivers/mtxdrivers-0.3.0.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/mtxdrivers/mtxdrivers-0.3.0.ebuild,v 1.1 2003/06/06 15:24:48 prez Exp $                     
+# $Header: /var/cvsroot/gentoo-x86/media-video/mtxdrivers/mtxdrivers-0.3.0.ebuild,v 1.2 2003/06/06 17:38:17 prez Exp $                     
 
 At="mtxdrivers-rh9.0-0.3.0.run"
 SRC_URI=""
@@ -12,15 +12,16 @@ DEPEND=">=x11-base/xfree-4.2.0
 
 SLOT="0"
 LICENSE="Matrox"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 
 Xversion=`X -version 2>&1 | grep -s "XFree86 Version" | cut -d" " -f3 | sed -e "s/\([^\.]*\.[^\.]*\.[^\.]*\)\.[^\.]*/\1/"`
 
 src_unpack() {
     if [ ! -f "${DISTDIR}/${At}" ]; then
 		einfo "You must go to: http://www.matrox.com/mga/registration/home.cfm?refid=7667"
-		einfo "and log in (or create an account) to download the Matrox Parhelia drivers."
-		einfo "Remember to right-click and Save Link As when downloading them."
+		einfo "(for the RH9.0 drivers) and log in (or create an account) to download the"
+		einfo "Matrox Parhelia drivers. Remember to right-click and use Save Link As when"
+		einfo "downloading the driver."
 		die
     fi
 	mkdir ${S}
@@ -65,9 +66,15 @@ src_install() {
 
 pkg_postinst() {
     /sbin/depmod -a
-	einfo "Please look at /usr/share/doc/${P}/XF86Config.* for X configurations"
-	einfo "for your Parhelia or Millenium P650/P750 card."
-	einfo "NOTE: To be able to use busmastering, you MUST have /dev/video as"
-    einfo "a directory, which means you must remove anything there first"
-    einfo "(rm -f /dev/video), and mkdir /dev/video"
+	einfo "Please look at /usr/share/doc/${P}/XF86Config.* for"
+	einfo "X configurations for your Parhelia or Millenium P650/P750 card."
+	if [ ! -d /dev/video ]; then
+		if [ -f /dev/video ]; then
+			einfo "NOTE: To be able to use busmastering, you MUST have /dev/video as"
+		    einfo "a directory, which means you must remove anything there first"
+    		einfo "(rm -f /dev/video), and mkdir /dev/video"
+		else
+			mkdir /dev/video
+		fi
+	fi
 }