(#122476) Add patch from upstream CVS to fix with Nvidia's OpenGL implementation.

Package-Manager: portage-2.1_pre4-r1

6 files changed, 103 insertions, 9 deletions

diff --git a/x11-apps/xdriinfo/ChangeLog b/x11-apps/xdriinfo/ChangeLog
index 54dd89bcb293..df7894704089 100644
--- a/x11-apps/xdriinfo/ChangeLog
+++ b/x11-apps/xdriinfo/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-apps/xdriinfo
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/ChangeLog,v 1.8 2005/12/26 21:05:53 joshuabaergen Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/ChangeLog,v 1.9 2006/02/13 05:42:10 spyderous Exp $
+
+*xdriinfo-1.0.0-r1 (13 Feb 2006)
+
+  13 Feb 2006; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/nvidia-glx-fix.patch, -xdriinfo-1.0.0.ebuild,
+  +xdriinfo-1.0.0-r1.ebuild:
+  (#122476) Add patch from upstream CVS to fix with Nvidia's OpenGL
+  implementation.
 
   26 Dec 2005; Joshua Baergen <joshuabaergen@gentoo.org>
   -xdriinfo-0.99.2.ebuild:
diff --git a/x11-apps/xdriinfo/Manifest b/x11-apps/xdriinfo/Manifest
index 87fcbbacb99c..5ba6450df731 100644
--- a/x11-apps/xdriinfo/Manifest
+++ b/x11-apps/xdriinfo/Manifest
@@ -1,4 +1,15 @@
-MD5 069cb3c0b86bb1efd421602b50751f5c ChangeLog 1207
-MD5 4967c270ba007e48c43e172d8c5c9052 files/digest-xdriinfo-1.0.0 66
+MD5 724e45800d388004fc767ebfaaee2dd3 ChangeLog 1463
+RMD160 28e9a862b1fc7e955d1905c8a63df16cf5685826 ChangeLog 1463
+SHA256 9a043aedbb63db33bdc7a16a3df95740a43d223d9d7f62f4a9267ca03a8a58e8 ChangeLog 1463
+MD5 8ba38c2a51363cd78b707d1db4be13c5 files/digest-xdriinfo-1.0.0-r1 244
+RMD160 48127718eee7ccbbd1ceeb3c6fa0552c747b1b50 files/digest-xdriinfo-1.0.0-r1 244
+SHA256 13eaeb5fd70491e2dde8244ec947451348f2bcc748d5c67c8d3cab5bf775a8cc files/digest-xdriinfo-1.0.0-r1 244
+MD5 f109ccd6378404e7303a98569700fb56 files/nvidia-glx-fix.patch 2405
+RMD160 def4440abb5e3e306eb5fc4f1652fbdd0eaf99f7 files/nvidia-glx-fix.patch 2405
+SHA256 8f2cea610286db6ab98bb3097cf30509a8dfc894ee2437330837baace30e8e22 files/nvidia-glx-fix.patch 2405
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
-MD5 bb4b16e6bd672acaffe77abfdb7b3d63 xdriinfo-1.0.0.ebuild 434
+RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156
+SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 metadata.xml 156
+MD5 f53c1dfc1dc8ec391e01894153b571e8 xdriinfo-1.0.0-r1.ebuild 476
+RMD160 c68ac3b1b0eafca7aa3c983755a31b9eab2c33f0 xdriinfo-1.0.0-r1.ebuild 476
+SHA256 92505654c31813708210ba76610bd19168704e21aa45a8a8b88654807a06b41a xdriinfo-1.0.0-r1.ebuild 476
diff --git a/x11-apps/xdriinfo/files/digest-xdriinfo-1.0.0 b/x11-apps/xdriinfo/files/digest-xdriinfo-1.0.0
deleted file mode 100644
index c35baa71e01b..000000000000
--- a/x11-apps/xdriinfo/files/digest-xdriinfo-1.0.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 5ca3fc5073dd52875dcfb456cebe69db xdriinfo-1.0.0.tar.bz2 77241
diff --git a/x11-apps/xdriinfo/files/digest-xdriinfo-1.0.0-r1 b/x11-apps/xdriinfo/files/digest-xdriinfo-1.0.0-r1
new file mode 100644
index 000000000000..66a64cae0139
--- /dev/null
+++ b/x11-apps/xdriinfo/files/digest-xdriinfo-1.0.0-r1
@@ -0,0 +1,3 @@
+MD5 5ca3fc5073dd52875dcfb456cebe69db xdriinfo-1.0.0.tar.bz2 77241
+RMD160 c352f87a1a656617fed7c455197777ec59fa4817 xdriinfo-1.0.0.tar.bz2 77241
+SHA256 68d4785b9e44d2e420543b912e32dc3c48da415e9b2d964374f51eed61bab484 xdriinfo-1.0.0.tar.bz2 77241
diff --git a/x11-apps/xdriinfo/files/nvidia-glx-fix.patch b/x11-apps/xdriinfo/files/nvidia-glx-fix.patch
new file mode 100644
index 000000000000..b971e61f59fd
--- /dev/null
+++ b/x11-apps/xdriinfo/files/nvidia-glx-fix.patch
@@ -0,0 +1,71 @@
+Index: ChangeLog
+===================================================================
+RCS file: /cvs/xorg/app/xdriinfo/ChangeLog,v
+retrieving revision 1.6
+retrieving revision 1.8
+diff -u -b -B -r1.6 -r1.8
+--- ChangeLog	15 Dec 2005 00:24:06 -0000	1.6
++++ ChangeLog	16 Jan 2006 10:54:14 -0000	1.8
+@@ -1,3 +1,15 @@
++2006-01-16  Matthias Hopf  <mhopf@suse.de>
++
++	* xdriinfo.c:
++	GLX_GLXEXT_LEGACY -> GLX_GLXEXT_PROTOTYPES + glxext.h
++
++2006-01-13  Matthias Hopf  <mhopf@suse.de>
++
++	* configure.ac:
++	Using glXGetProcAddressARB instead of glXGetProcAddress.
++	* xdriinfo.c: (main):
++	Casting to GLubyte* to remove warning.
++
+ 2005-12-14  Kevin E. Martin  <kem-at-freedesktop-dot-org>
+ 
+ 	* configure.ac:
+Index: configure.ac
+===================================================================
+RCS file: /cvs/xorg/app/xdriinfo/configure.ac,v
+retrieving revision 1.7
+retrieving revision 1.8
+diff -u -b -B -r1.7 -r1.8
+--- configure.ac	15 Dec 2005 00:24:06 -0000	1.7
++++ configure.ac	13 Jan 2006 16:06:10 -0000	1.8
+@@ -38,7 +38,7 @@
+ AC_SUBST(XDRIINFO_LIBS)
+ 
+ # Checks for non-pkg-config packages (Mesa or vendor OpenGL)
+-AC_SEARCH_LIBS([glXGetProcAddress], [GL], [],
++AC_SEARCH_LIBS([glXGetProcAddressARB], [GL], [],
+ 	AC_MSG_FAILURE([cannot find GL library - make sure Mesa or other OpenGL package is installed]),
+ 	[$XDRIINFO_LIBS])
+ 
+Index: xdriinfo.c
+===================================================================
+RCS file: /cvs/xorg/app/xdriinfo/xdriinfo.c,v
+retrieving revision 1.2
+retrieving revision 1.4
+diff -u -b -B -r1.2 -r1.4
+--- xdriinfo.c	30 Nov 2005 01:17:30 -0000	1.2
++++ xdriinfo.c	16 Jan 2006 10:54:14 -0000	1.4
+@@ -22,8 +22,9 @@
+  * 
+  */
+ 
+-#define GLX_GLXEXT_LEGACY
++#define GLX_GLXEXT_PROTOTYPES
+ #include <GL/glx.h>
++#include <GL/glxext.h>
+ #include <X11/Xlib.h>
+ #include <stdio.h>
+ #include <unistd.h>
+@@ -58,8 +59,8 @@
+     char *funcArg = NULL;
+     char *dpyName = NULL;
+ 
+-    GetScreenDriver = (glXGetScreenDriver_t *)glXGetProcAddressARB ("glXGetScreenDriver");
+-    GetDriverConfig = (glXGetDriverConfig_t *)glXGetProcAddressARB ("glXGetDriverConfig");
++    GetScreenDriver = (glXGetScreenDriver_t *)glXGetProcAddressARB ((const GLubyte *)"glXGetScreenDriver");
++    GetDriverConfig = (glXGetDriverConfig_t *)glXGetProcAddressARB ((const GLubyte *)"glXGetDriverConfig");
+     if (!GetScreenDriver || !GetDriverConfig) {
+ 	fprintf (stderr, "libGL is too old.\n");
+ 	return 1;
diff --git a/x11-apps/xdriinfo/xdriinfo-1.0.0.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.0-r1.ebuild
index 7ecdf663491b..25858b875dc4 100644
--- a/x11-apps/xdriinfo/xdriinfo-1.0.0.ebuild
+++ b/x11-apps/xdriinfo/xdriinfo-1.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/xdriinfo-1.0.0.ebuild,v 1.1 2005/12/18 19:31:24 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/xdriinfo-1.0.0-r1.ebuild,v 1.1 2006/02/13 05:42:10 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
-#SNAPSHOT="yes"
+SNAPSHOT="yes"
 
 inherit x-modular
 
@@ -12,3 +12,5 @@ KEYWORDS="~x86"
 RDEPEND="x11-libs/libX11"
 DEPEND="${RDEPEND}
 	x11-proto/glproto"
+
+PATCHES="${FILESDIR}/nvidia-glx-fix.patch"