gentoo new year resync : 01.01.2021

2 files changed, 0 insertions, 106 deletions

diff --git a/x11-misc/virtualgl/Manifest b/x11-misc/virtualgl/Manifest
index c0bad4ffbf50..abef7ccc2c72 100644
--- a/x11-misc/virtualgl/Manifest
+++ b/x11-misc/virtualgl/Manifest
@@ -2,7 +2,6 @@ AUX vgl-helper.sh 881 BLAKE2B 5373592a2fb784e38c1542aadb4f150937a69f51284bf21337
 AUX vgl.confd-r2 629 BLAKE2B 9794409221cc6a95b2f7a48e02063d3c6bcfd66c6b3e1929073947b3794ab1f9e69c76be47b9d06fa4ec9404e3ec4b4f7cc3f0395fc3d09684f346304db6202f SHA512 bab0ad095a2f075a1923f1b58531101bce634c89b30e77c239ee224b58eac3083c7eba4d21bd997a4dc8b6e4cfb0be7b013732bdf37a27a16a3301a098d60c29
 AUX vgl.initd-r3 856 BLAKE2B df423f82debf67ef0611c603bf38aa76173044012d3bc5a6276d1325e0d706fc6ff868957d7bc4ea1e14171a7000dabfef4acf3f736e22f9a40c3bdbb4ac0033 SHA512 fcc6c02265e0e2bb1faa00e5da2246b56a7bd8c730faa912904953f5c67eae12bffa99fe57f2a76d199c22956fc1b6ca940fba40972b2afbf73ae7f4f2a0fc7d
 AUX vgl.service 254 BLAKE2B 0a0e73228821019a764b1bc3ff61a752b15001018f704739d86eebbf326ee3a0612475cf7a0c360993e1a27c87815626290dfe4d85fc7e1aaa3897ce41f787c2 SHA512 18615552301c52c272bc47f942c47121100c175651b3957ddf996ca40e755d96dd51194ecb599c92e62fbdba3b9245e999ef488c889833009f8eba1c038c38f9
-AUX virtualgl-2.6.3-mesa-19.3.patch 3803 BLAKE2B cd2120dfc1fdc9c65cb65e428fd5bf98082c0bfcba3ce18ddd736bd1f421188ad9df4170bd6aa7bc2c8ef15f36398ec37a80554aa82e959e2e858faa910171d7 SHA512 6845a60071aac333ac1c2ad5c3861f9fbe8cdf9f28425817a18c2b6f8c280b5469ce3be4831a0bf8a6600955bf5177217ff684c61f728783f2d09be6885f2815
 DIST VirtualGL-2.6.4.tar.gz 1198141 BLAKE2B 34794897f62ccdf7f5d80b1c4465af5e22d72408e14ae9243c66315c9ffeedb21eb5dc6afc95c889c000c46685b8ab6e0756edaee4f34d9d28ea0b71459efba3 SHA512 a475e5b7373d0c86ec7d1274f7527cd7bb1d82acdb38d42366faae58175052f957e090a4c8fdb4e3ba4b2b9063957c14b46d55316b69420247d2f9cf3afb1280
 DIST VirtualGL-2.6.5.tar.gz 1201656 BLAKE2B 4dc38a144e197ea7578dd29eea5eb69fb3e96a75c2729605f6678fbc96f3cf039c2e1780aa69ca8836771f72731cd8cdd795237d69d4b591e330124496aecc1c SHA512 0ab9e744e400d323bc16f6e2cf310905361745ea4da9e9e9a41cbeb45b1d661eebd38a0fad8ae5df4664d02b341de44c5730af8437e6ef49c7351b4afb953532
 EBUILD virtualgl-2.6.4-r1.ebuild 2929 BLAKE2B 2c591c97f2cb5fd44fb96d970a7e99f2c0c6414303a179e7a455e53a0699d38d7358b814b5d67a4bc58eb3bd666cb5b9956317ae3b8255fcb77c405a72e01323 SHA512 7d72262e2e9f00c4895aef235b054281fb4c93843055d7802029d3f38bce1bcfd3f577ea015004ed805505b3d958b28579bf3932d6fefaf3976c12fe4cdaec81
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
deleted file mode 100644
index 6f45ba8a3ffa..000000000000
--- a/x11-misc/virtualgl/files/virtualgl-2.6.3-mesa-19.3.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From faedcc1e36b4ed89a325e01822447900840a0b77 Mon Sep 17 00:00:00 2001
-From: DRC <information@virtualgl.org>
-Date: Thu, 13 Feb 2020 19:11:46 -0600
-Subject: [PATCH] Faker: Fix build issue w/ Mesa 19.3.0+ headers
-
-Mesa changed the signatures for glXGetTransparentIndexSUN() and
-glXQueryGLXPbufferSGIX() to match the official GLX extension specs:
-https://www.khronos.org/registry/OpenGL/extensions/SUN/GLX_SUN_get_transparent_index.txt
-https://www.khronos.org/registry/OpenGL/extensions/SGIX/GLX_SGIX_pbuffer.txt
-
-Reference:
-https://gitlab.freedesktop.org/mesa/mesa/commit/3dd299c3d5b88114894ec30d1fac85fba688201f
-
-Fixes #109
----
- ChangeLog.md         |  2 ++
- server/faker-glx.cpp | 14 +++++++++++++-
- server/faker-sym.h   |  8 +++++++-
- 3 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/ChangeLog.md b/ChangeLog.md
-index 8d092bd7..78391d06 100644
---- a/ChangeLog.md
-+++ b/ChangeLog.md
-@@ -6,6 +6,8 @@
- 1. VirtualGL now works properly with 3D applications that use the
- `glDrawBuffers()` function and render to the front buffer.
- 
-+2. VirtualGL can now be built using the GLX headers from Mesa 19.3.0 and later.
-+
- 
- 2.6.3
- =====
-diff --git a/server/faker-glx.cpp b/server/faker-glx.cpp
-index faea37b6..6e7beb63 100644
---- a/server/faker-glx.cpp
-+++ b/server/faker-glx.cpp
-@@ -1,6 +1,6 @@
- // Copyright (C)2004 Landmark Graphics Corporation
- // Copyright (C)2005, 2006 Sun Microsystems, Inc.
--// Copyright (C)2009, 2011-2019 D. R. Commander
-+// Copyright (C)2009, 2011-2020 D. R. Commander
- //
- // This library is free software and may be redistributed and/or modified under
- // the terms of the wxWindows Library License, Version 3.1 or (at your option)
-@@ -2192,11 +2192,18 @@ void glXQueryDrawable(Display *dpy, GLXDrawable draw, int attribute,
- 	CATCH();
- }
- 
-+#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 20190000
-+void glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute,
-+	unsigned int *value)
-+#else
- int glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute,
- 	unsigned int *value)
-+#endif
- {
- 	glXQueryDrawable(dpy, pbuf, attribute, value);
-+	#if !defined(GLX_GLXEXT_VERSION) || GLX_GLXEXT_VERSION < 20190000
- 	return 0;
-+	#endif
- }
- 
- 
-@@ -2358,8 +2365,13 @@ void glXSwapBuffers(Display *dpy, GLXDrawable drawable)
- 
- // Returns the transparent index from the overlay visual on the 2D X server
- 
-+#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 20190000
-+int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay,
-+	unsigned long *transparentIndex)
-+#else
- int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay,
- 	long *transparentIndex)
-+#endif
- {
- 	int retval = False;
- 	XWindowAttributes xwa;
-diff --git a/server/faker-sym.h b/server/faker-sym.h
-index b9aa30d0..0168ac7b 100644
---- a/server/faker-sym.h
-+++ b/server/faker-sym.h
-@@ -1,6 +1,6 @@
- // Copyright (C)2004 Landmark Graphics Corporation
- // Copyright (C)2005, 2006 Sun Microsystems, Inc.
--// Copyright (C)2009, 2011, 2013-2016, 2018-2019 D. R. Commander
-+// Copyright (C)2009, 2011, 2013-2016, 2018-2020 D. R. Commander
- //
- // This library is free software and may be redistributed and/or modified under
- // the terms of the wxWindows Library License, Version 3.1 or (at your option)
-@@ -535,8 +535,14 @@ FUNCDEF2(GLXFBConfigSGIX, glXGetFBConfigFromVisualSGIX, Display *, dpy,
- 
- // GLX_SUN_get_transparent_index
- 
-+#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 20190000
-+FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay,
-+	Window, underlay, unsigned long *, transparentIndex,
-+	glXGetTransparentIndexSUN)
-+#else
- FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay,
- 	Window, underlay, long *, transparentIndex, glXGetTransparentIndexSUN);
-+#endif
- 
- 
- // GL functions