1 |
commit: ca0df93ff051c586cd5002f3d55989e759ad2cc6 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Thu Dec 24 08:57:15 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 26 21:13:21 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca0df93f |
7 |
|
8 |
x11-misc/virtualgl: remove unused patch |
9 |
|
10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/18803 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
.../files/virtualgl-2.6.3-mesa-19.3.patch | 105 --------------------- |
16 |
1 file changed, 105 deletions(-) |
17 |
|
18 |
diff --git a/x11-misc/virtualgl/files/virtualgl-2.6.3-mesa-19.3.patch b/x11-misc/virtualgl/files/virtualgl-2.6.3-mesa-19.3.patch |
19 |
deleted file mode 100644 |
20 |
index 6f45ba8a3ff..00000000000 |
21 |
--- a/x11-misc/virtualgl/files/virtualgl-2.6.3-mesa-19.3.patch |
22 |
+++ /dev/null |
23 |
@@ -1,105 +0,0 @@ |
24 |
-From faedcc1e36b4ed89a325e01822447900840a0b77 Mon Sep 17 00:00:00 2001 |
25 |
-From: DRC <information@×××××××××.org> |
26 |
-Date: Thu, 13 Feb 2020 19:11:46 -0600 |
27 |
-Subject: [PATCH] Faker: Fix build issue w/ Mesa 19.3.0+ headers |
28 |
- |
29 |
-Mesa changed the signatures for glXGetTransparentIndexSUN() and |
30 |
-glXQueryGLXPbufferSGIX() to match the official GLX extension specs: |
31 |
-https://www.khronos.org/registry/OpenGL/extensions/SUN/GLX_SUN_get_transparent_index.txt |
32 |
-https://www.khronos.org/registry/OpenGL/extensions/SGIX/GLX_SGIX_pbuffer.txt |
33 |
- |
34 |
-Reference: |
35 |
-https://gitlab.freedesktop.org/mesa/mesa/commit/3dd299c3d5b88114894ec30d1fac85fba688201f |
36 |
- |
37 |
-Fixes #109 |
38 |
---- |
39 |
- ChangeLog.md | 2 ++ |
40 |
- server/faker-glx.cpp | 14 +++++++++++++- |
41 |
- server/faker-sym.h | 8 +++++++- |
42 |
- 3 files changed, 22 insertions(+), 2 deletions(-) |
43 |
- |
44 |
-diff --git a/ChangeLog.md b/ChangeLog.md |
45 |
-index 8d092bd7..78391d06 100644 |
46 |
---- a/ChangeLog.md |
47 |
-+++ b/ChangeLog.md |
48 |
-@@ -6,6 +6,8 @@ |
49 |
- 1. VirtualGL now works properly with 3D applications that use the |
50 |
- `glDrawBuffers()` function and render to the front buffer. |
51 |
- |
52 |
-+2. VirtualGL can now be built using the GLX headers from Mesa 19.3.0 and later. |
53 |
-+ |
54 |
- |
55 |
- 2.6.3 |
56 |
- ===== |
57 |
-diff --git a/server/faker-glx.cpp b/server/faker-glx.cpp |
58 |
-index faea37b6..6e7beb63 100644 |
59 |
---- a/server/faker-glx.cpp |
60 |
-+++ b/server/faker-glx.cpp |
61 |
-@@ -1,6 +1,6 @@ |
62 |
- // Copyright (C)2004 Landmark Graphics Corporation |
63 |
- // Copyright (C)2005, 2006 Sun Microsystems, Inc. |
64 |
--// Copyright (C)2009, 2011-2019 D. R. Commander |
65 |
-+// Copyright (C)2009, 2011-2020 D. R. Commander |
66 |
- // |
67 |
- // This library is free software and may be redistributed and/or modified under |
68 |
- // the terms of the wxWindows Library License, Version 3.1 or (at your option) |
69 |
-@@ -2192,11 +2192,18 @@ void glXQueryDrawable(Display *dpy, GLXDrawable draw, int attribute, |
70 |
- CATCH(); |
71 |
- } |
72 |
- |
73 |
-+#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 20190000 |
74 |
-+void glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute, |
75 |
-+ unsigned int *value) |
76 |
-+#else |
77 |
- int glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute, |
78 |
- unsigned int *value) |
79 |
-+#endif |
80 |
- { |
81 |
- glXQueryDrawable(dpy, pbuf, attribute, value); |
82 |
-+ #if !defined(GLX_GLXEXT_VERSION) || GLX_GLXEXT_VERSION < 20190000 |
83 |
- return 0; |
84 |
-+ #endif |
85 |
- } |
86 |
- |
87 |
- |
88 |
-@@ -2358,8 +2365,13 @@ void glXSwapBuffers(Display *dpy, GLXDrawable drawable) |
89 |
- |
90 |
- // Returns the transparent index from the overlay visual on the 2D X server |
91 |
- |
92 |
-+#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 20190000 |
93 |
-+int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay, |
94 |
-+ unsigned long *transparentIndex) |
95 |
-+#else |
96 |
- int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay, |
97 |
- long *transparentIndex) |
98 |
-+#endif |
99 |
- { |
100 |
- int retval = False; |
101 |
- XWindowAttributes xwa; |
102 |
-diff --git a/server/faker-sym.h b/server/faker-sym.h |
103 |
-index b9aa30d0..0168ac7b 100644 |
104 |
---- a/server/faker-sym.h |
105 |
-+++ b/server/faker-sym.h |
106 |
-@@ -1,6 +1,6 @@ |
107 |
- // Copyright (C)2004 Landmark Graphics Corporation |
108 |
- // Copyright (C)2005, 2006 Sun Microsystems, Inc. |
109 |
--// Copyright (C)2009, 2011, 2013-2016, 2018-2019 D. R. Commander |
110 |
-+// Copyright (C)2009, 2011, 2013-2016, 2018-2020 D. R. Commander |
111 |
- // |
112 |
- // This library is free software and may be redistributed and/or modified under |
113 |
- // the terms of the wxWindows Library License, Version 3.1 or (at your option) |
114 |
-@@ -535,8 +535,14 @@ FUNCDEF2(GLXFBConfigSGIX, glXGetFBConfigFromVisualSGIX, Display *, dpy, |
115 |
- |
116 |
- // GLX_SUN_get_transparent_index |
117 |
- |
118 |
-+#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 20190000 |
119 |
-+FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay, |
120 |
-+ Window, underlay, unsigned long *, transparentIndex, |
121 |
-+ glXGetTransparentIndexSUN) |
122 |
-+#else |
123 |
- FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay, |
124 |
- Window, underlay, long *, transparentIndex, glXGetTransparentIndexSUN); |
125 |
-+#endif |
126 |
- |
127 |
- |
128 |
- // GL functions |