summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2006-04-08 21:01:34 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2006-04-08 21:01:34 +0000
commit3405d518f3abf7c9689c0ed66f3bcde8886529cf (patch)
tree74c9dd2e93b5500101cf2a56a8a743c80f7e51db /x11-apps/xdriinfo
parentPull old ebuild. (diff)
downloadgentoo-2-3405d518f3abf7c9689c0ed66f3bcde8886529cf.tar.gz
gentoo-2-3405d518f3abf7c9689c0ed66f3bcde8886529cf.tar.bz2
gentoo-2-3405d518f3abf7c9689c0ed66f3bcde8886529cf.zip
Pull old ebuild.
(Portage version: 2.1_pre7-r4)
Diffstat (limited to 'x11-apps/xdriinfo')
-rw-r--r--x11-apps/xdriinfo/ChangeLog6
-rw-r--r--x11-apps/xdriinfo/files/digest-xdriinfo-1.0.0-r13
-rw-r--r--x11-apps/xdriinfo/files/nvidia-glx-fix.patch71
-rw-r--r--x11-apps/xdriinfo/xdriinfo-1.0.0-r1.ebuild17
4 files changed, 5 insertions, 92 deletions
diff --git a/x11-apps/xdriinfo/ChangeLog b/x11-apps/xdriinfo/ChangeLog
index da48dafad697..9e806205fcb9 100644
--- a/x11-apps/xdriinfo/ChangeLog
+++ b/x11-apps/xdriinfo/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for x11-apps/xdriinfo
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/ChangeLog,v 1.13 2006/04/04 00:49:03 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/xdriinfo/ChangeLog,v 1.14 2006/04/08 21:01:34 spyderous Exp $
+
+ 08 Apr 2006; Donnie Berkholz <spyderous@gentoo.org>;
+ -files/nvidia-glx-fix.patch, -xdriinfo-1.0.0-r1.ebuild:
+ Pull old ebuild.
*xdriinfo-1.0.1 (04 Apr 2006)
diff --git a/x11-apps/xdriinfo/files/digest-xdriinfo-1.0.0-r1 b/x11-apps/xdriinfo/files/digest-xdriinfo-1.0.0-r1
deleted file mode 100644
index dca789ec98c8..000000000000
--- a/x11-apps/xdriinfo/files/digest-xdriinfo-1.0.0-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8941897fd2bd533f8a676df60ec4f7f5 xdriinfo-1.0.0.tar.bz2 77340
-RMD160 dc9ced42fb56e693941441195131152ee1c8bb5e xdriinfo-1.0.0.tar.bz2 77340
-SHA256 71ee74d4818db1ab74dbbad27c8cf73511aba61ba5f2a0ad88f9fd3018622023 xdriinfo-1.0.0.tar.bz2 77340
diff --git a/x11-apps/xdriinfo/files/nvidia-glx-fix.patch b/x11-apps/xdriinfo/files/nvidia-glx-fix.patch
deleted file mode 100644
index b971e61f59fd..000000000000
--- a/x11-apps/xdriinfo/files/nvidia-glx-fix.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-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-r1.ebuild b/x11-apps/xdriinfo/xdriinfo-1.0.0-r1.ebuild
deleted file mode 100644
index 6072bd805c5c..000000000000
--- a/x11-apps/xdriinfo/xdriinfo-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# 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-r1.ebuild,v 1.4 2006/03/24 03:55:44 spyderous Exp $
-
-# Must be before x-modular eclass is inherited
-SNAPSHOT="yes"
-
-inherit x-modular
-
-DESCRIPTION="X.Org xdriinfo application"
-RESTRICT="mirror"
-KEYWORDS="~ppc ~ppc64 ~x86"
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}
- x11-proto/glproto"
-
-PATCHES="${FILESDIR}/nvidia-glx-fix.patch"