1 |
mattst88 14/01/26 18:47:01 |
2 |
|
3 |
Modified: mesa-10.0.2-update-glxext.h.patch |
4 |
Log: |
5 |
Fix patch, bug #499352. |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 974CA72A) |
8 |
|
9 |
Revision Changes Path |
10 |
1.2 media-libs/mesa/files/mesa-10.0.2-update-glxext.h.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/files/mesa-10.0.2-update-glxext.h.patch?rev=1.2&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/files/mesa-10.0.2-update-glxext.h.patch?rev=1.2&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/mesa/files/mesa-10.0.2-update-glxext.h.patch?r1=1.1&r2=1.2 |
15 |
|
16 |
Index: mesa-10.0.2-update-glxext.h.patch |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/mesa/files/mesa-10.0.2-update-glxext.h.patch,v |
19 |
retrieving revision 1.1 |
20 |
retrieving revision 1.2 |
21 |
diff -u -r1.1 -r1.2 |
22 |
--- mesa-10.0.2-update-glxext.h.patch 26 Jan 2014 03:24:22 -0000 1.1 |
23 |
+++ mesa-10.0.2-update-glxext.h.patch 26 Jan 2014 18:47:01 -0000 1.2 |
24 |
@@ -1,25 +1,12 @@ |
25 |
-From faa518dd947f35bca46dcc59493d3fbecf376d39 Mon Sep 17 00:00:00 2001 |
26 |
-From: Matt Turner <mattst88@×××××.com> |
27 |
-Date: Sat, 25 Jan 2014 19:16:38 -0800 |
28 |
-Subject: [PATCH] glx: Update glxext.h to revision 24777. |
29 |
- |
30 |
-It readds the GLXContextID typedef, but under #ifndef GLX_VERSION_1_3. |
31 |
- |
32 |
-Bugzilla: https://cvs.khronos.org/bugzilla/show_bug.cgi?id=11454 |
33 |
---- |
34 |
- include/GL/glxext.h | 14 +++++++++++--- |
35 |
- 1 file changed, 11 insertions(+), 3 deletions(-) |
36 |
- |
37 |
-diff --git a/include/GL/glxext.h b/include/GL/glxext.h |
38 |
-index cfabe8c..8c642f3 100644 |
39 |
---- a/include/GL/glxext.h |
40 |
-+++ b/include/GL/glxext.h |
41 |
-@@ -33,10 +33,10 @@ extern "C" { |
42 |
+diff -ur Mesa-10.0.2.orig/include/GL/glxext.h Mesa-10.0.2/include/GL/glxext.h |
43 |
+--- Mesa-10.0.2.orig/include/GL/glxext.h 2014-01-26 10:43:47.082996517 -0800 |
44 |
++++ Mesa-10.0.2/include/GL/glxext.h 2014-01-26 10:44:19.378000149 -0800 |
45 |
+@@ -33,10 +33,10 @@ |
46 |
** used to make the header, and the header can be found at |
47 |
** http://www.opengl.org/registry/ |
48 |
** |
49 |
--** Khronos $Revision: 1.1 $ on $Date: 2014/01/26 03:24:22 $ |
50 |
-+** Khronos $Revision: 1.1 $ on $Date: 2014/01/26 03:24:22 $ |
51 |
+-** Khronos $Revision: 1.2 $ on $Date: 2014/01/26 18:47:01 $ |
52 |
++** Khronos $Revision: 1.2 $ on $Date: 2014/01/26 18:47:01 $ |
53 |
*/ |
54 |
|
55 |
-#define GLX_GLXEXT_VERSION 20131008 |
56 |
@@ -27,7 +14,7 @@ |
57 |
|
58 |
/* Generated C header for: |
59 |
* API: glx |
60 |
-@@ -49,6 +49,7 @@ extern "C" { |
61 |
+@@ -49,6 +49,7 @@ |
62 |
|
63 |
#ifndef GLX_VERSION_1_3 |
64 |
#define GLX_VERSION_1_3 1 |
65 |
@@ -35,7 +22,7 @@ |
66 |
typedef struct __GLXFBConfigRec *GLXFBConfig; |
67 |
typedef XID GLXWindow; |
68 |
typedef XID GLXPbuffer; |
69 |
-@@ -272,7 +273,6 @@ __GLXextFuncPtr glXGetProcAddressARB (const GLubyte *procName); |
70 |
+@@ -272,7 +273,6 @@ |
71 |
|
72 |
#ifndef GLX_EXT_import_context |
73 |
#define GLX_EXT_import_context 1 |
74 |
@@ -43,7 +30,7 @@ |
75 |
#define GLX_SHARE_CONTEXT_EXT 0x800A |
76 |
#define GLX_VISUAL_ID_EXT 0x800B |
77 |
#define GLX_SCREEN_EXT 0x800C |
78 |
-@@ -433,6 +433,14 @@ void glXCopyImageSubDataNV (Display *dpy, GLXContext srcCtx, GLuint srcName, GLe |
79 |
+@@ -433,6 +433,14 @@ |
80 |
#endif |
81 |
#endif /* GLX_NV_copy_image */ |
82 |
|
83 |
@@ -58,6 +45,3 @@ |
84 |
#ifndef GLX_NV_float_buffer |
85 |
#define GLX_NV_float_buffer 1 |
86 |
#define GLX_FLOAT_COMPONENTS_NV 0x20B0 |
87 |
--- |
88 |
-1.8.3.2 |
89 |
- |