* [gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/
@ 2015-12-27 10:16 Patrice Clement
0 siblings, 0 replies; 6+ messages in thread
From: Patrice Clement @ 2015-12-27 10:16 UTC (permalink / raw
To: gentoo-commits
commit: fad420ef357962a3505f9aca55b32434ddc6719a
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 10:14:44 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 10:15:32 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fad420ef
x11-misc/virtualgl: Backticks out, Subshell in.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
x11-misc/virtualgl/files/vgl.initd-r3 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/x11-misc/virtualgl/files/vgl.initd-r3 b/x11-misc/virtualgl/files/vgl.initd-r3
index 970a29e..7901025 100644
--- a/x11-misc/virtualgl/files/vgl.initd-r3
+++ b/x11-misc/virtualgl/files/vgl.initd-r3
@@ -33,7 +33,7 @@ start() {
fi
- xauth -f /var/lib/VirtualGL/vgl_xauth_key add $DISPLAY . `xauth -f $XAUTHORITY list | awk '{print $3;exit}'` && \
+ xauth -f /var/lib/VirtualGL/vgl_xauth_key add $DISPLAY . $(xauth -f $XAUTHORITY list | awk '{print $3;exit}') && \
chmod 644 /var/lib/VirtualGL/vgl_xauth_key
eend $?
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/
@ 2016-05-18 6:42 Austin English
0 siblings, 0 replies; 6+ messages in thread
From: Austin English @ 2016-05-18 6:42 UTC (permalink / raw
To: gentoo-commits
commit: 857a0adb6afcffb07946e062df60a93b63d003a2
Author: Austin English <wizardedit <AT> gentoo <DOT> org>
AuthorDate: Wed May 18 06:35:32 2016 +0000
Commit: Austin English <wizardedit <AT> gentoo <DOT> org>
CommitDate: Wed May 18 06:38:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=857a0adb
x11-misc/virtualgl: use #!/sbin/openrc-run instead of #!/sbin/runscript
x11-misc/virtualgl/files/vgl.initd-r2 | 2 +-
x11-misc/virtualgl/files/vgl.initd-r3 | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/x11-misc/virtualgl/files/vgl.initd-r2 b/x11-misc/virtualgl/files/vgl.initd-r2
index 7d5981f..6b1e6d6 100644
--- a/x11-misc/virtualgl/files/vgl.initd-r2
+++ b/x11-misc/virtualgl/files/vgl.initd-r2
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/x11-misc/virtualgl/files/vgl.initd-r3 b/x11-misc/virtualgl/files/vgl.initd-r3
index 7901025..32ab7d1 100644
--- a/x11-misc/virtualgl/files/vgl.initd-r3
+++ b/x11-misc/virtualgl/files/vgl.initd-r3
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/
@ 2019-12-23 10:16 David Seifert
0 siblings, 0 replies; 6+ messages in thread
From: David Seifert @ 2019-12-23 10:16 UTC (permalink / raw
To: gentoo-commits
commit: 6156592b3249381c17ae4d55f2804376f0ce4dff
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Dec 23 06:47:09 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Mon Dec 23 10:15:20 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6156592b
x11-misc/virtualgl: remove unused patch
Closes: https://github.com/gentoo/gentoo/pull/14098
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Signed-off-by: David Seifert <soap <AT> gentoo.org>
...-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch | 168 ---------------------
1 file changed, 168 deletions(-)
diff --git a/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch b/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch
deleted file mode 100644
index d5d923f89d1..00000000000
--- a/x11-misc/virtualgl/files/virtualgl-2.5.2-openssl-1.1-compat-a974c22141d0ded9ff60a0b903f81e6b484d6ba4.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-Patch modified to apply to VirtualGL 2.5.2, before
-1b82bceb3723b24ea5dc32edffbe019a8a37ab39 reformatted whitespace
-
-
-From a974c22141d0ded9ff60a0b903f81e6b484d6ba4 Mon Sep 17 00:00:00 2001
-From: DRC <information@virtualgl.org>
-Date: Mon, 16 Apr 2018 15:06:07 -0500
-Subject: [PATCH] OpenSSL improvements
-
-- Fix build issues with OpenSSL 1.1 (OpenSSL 1.1 and later no longer
- provides CRYPTO_set_locking_callback(), since locking is now performed
- internally.)
-- Detect whether the platform has /dev/urandom at compile time, rather
- than assuming that all Sun and SGI machines don't have it (Solaris 10
- and later supports /dev/urandom.)
----
- ChangeLog.md | 2 ++
- include/Socket.h | 8 ++++++--
- util/CMakeLists.txt | 5 +++++
- util/Socket.cpp | 25 ++++++++++++++++---------
- 4 files changed, 29 insertions(+), 11 deletions(-)
-
-diff --git a/ChangeLog.md b/ChangeLog.md
-index 3632c1d8..5c9bff84 100644
---- a/ChangeLog.md
-+++ b/ChangeLog.md
-@@ -52,6 +52,8 @@ a subsequent segfault when VTK tried to call `glBlendFuncSeparate()`.
- VirtualGL's implementation of `glXGetVisualFromFBConfig()` now returns NULL
- unless the FB config has a corresponding visual on the 3D X server.
-
-+6. VirtualGL can now be built and run with OpenSSL 1.1.
-+
-
- 2.5.2
- =====
-diff --git a/include/Socket.h b/include/Socket.h
-index dfe45e3a..f7409956 100644
---- a/include/Socket.h
-+++ b/include/Socket.h
-@@ -1,6 +1,6 @@
- /* Copyright (C)2004 Landmark Graphics Corporation
- * Copyright (C)2005 Sun Microsystems, Inc.
-- * Copyright (C)2014, 2016 D. R. Commander
-+ * Copyright (C)2014, 2016, 2018 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)
-@@ -23,7 +23,7 @@
- #endif
- #include <openssl/ssl.h>
- #include <openssl/err.h>
--#if defined(sun) || defined(sgi)
-+#if !defined(HAVE_DEVURANDOM) && !defined(_WIN32)
- #include <openssl/rand.h>
- #endif
- #endif
-@@ -161,15 +161,19 @@ namespace vglutil
-
- #ifdef USESSL
-
-+ #if OPENSSL_VERSION_NUMBER < 0x10100000L
- static void lockingCallback(int mode, int type, const char *file,
- int line)
- {
- if(mode&CRYPTO_LOCK) cryptoLock[type].lock();
- else cryptoLock[type].unlock();
- }
-+ #endif
-
- static bool sslInit;
-+ #if OPENSSL_VERSION_NUMBER < 0x10100000L
- static CriticalSection cryptoLock[CRYPTO_NUM_LOCKS];
-+ #endif
- bool doSSL; SSL_CTX *sslctx; SSL *ssl;
-
- #endif
-diff --git a/util/CMakeLists.txt b/util/CMakeLists.txt
-index 65ef59e7..ed1dfb39 100644
---- a/util/CMakeLists.txt
-+++ b/util/CMakeLists.txt
-@@ -13,6 +13,11 @@ target_link_libraries(bmptest vglutil)
- add_executable(pftest pftest.c)
- target_link_libraries(pftest vglutil)
-
-+if(EXISTS /dev/urandom)
-+ message(STATUS "Using /dev/urandom for random number generation")
-+ add_definitions(-DHAVE_DEVURANDOM)
-+endif()
-+
- add_library(vglsocket STATIC Socket.cpp)
- target_link_libraries(vglsocket vglutil)
- if(WIN32)
-diff --git a/util/Socket.cpp b/util/Socket.cpp
-index 0d230841..b41c25e9 100644
---- a/util/Socket.cpp
-+++ b/util/Socket.cpp
-@@ -1,6 +1,6 @@
- /* Copyright (C)2004 Landmark Graphics Corporation
- * Copyright (C)2005 Sun Microsystems, Inc.
-- * Copyright (C)2014, 2016 D. R. Commander
-+ * Copyright (C)2014, 2016, 2018 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)
-@@ -43,32 +43,37 @@ typedef socklen_t SOCKLEN_T;
-
- #ifdef USESSL
- bool Socket::sslInit=false;
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- CriticalSection Socket::cryptoLock[CRYPTO_NUM_LOCKS];
- #endif
-+#endif
- CriticalSection Socket::mutex;
- int Socket::instanceCount=0;
-
-
- #ifdef USESSL
-
--static void progressCallback(int p, int n, void *arg)
--{
--}
--
--
- static EVP_PKEY *newPrivateKey(int bits)
- {
-+ BIGNUM *bn = NULL;
-+ RSA *rsa = NULL;
- EVP_PKEY *pk=NULL;
-
- try
- {
-+ if(!(bn = BN_new())) _throwssl();
-+ if(!BN_set_word(bn, RSA_F4)) _throwssl();
-+ if(!(rsa = RSA_new())) _throwssl();
-+ if(!RSA_generate_key_ex(rsa, bits, bn, NULL)) _throwssl();
- if(!(pk=EVP_PKEY_new())) _throwssl();
-- if(!EVP_PKEY_assign_RSA(pk, RSA_generate_key(bits, 0x10001,
-- progressCallback, NULL))) _throwssl();
-+ if(!EVP_PKEY_assign_RSA(pk, rsa)) _throwssl();
-+ BN_free(bn);
- return pk;
- }
- catch (...)
- {
-+ if(bn) BN_free(bn);
-+ if(rsa) RSA_free(rsa);
- if(pk) EVP_PKEY_free(pk);
- throw;
- }
-@@ -147,7 +152,7 @@ Socket::Socket(bool doSSL_)
- #ifdef USESSL
- if(!sslInit && doSSL)
- {
-- #if defined(sun) || defined(sgi)
-+ #if !defined(HAVE_DEVURANDOM) && !defined(_WIN32)
- char buf[128]; int i;
- srandom(getpid());
- for(i = 0; i < 128; i++)
-@@ -158,7 +163,9 @@ Socket::Socket(bool doSSL_)
- SSL_load_error_strings();
- ERR_load_crypto_strings();
- CRYPTO_set_id_callback(Thread::threadID);
-+ #if OPENSSL_VERSION_NUMBER < 0x10100000L
- CRYPTO_set_locking_callback(lockingCallback);
-+ #endif
- SSL_library_init();
- sslInit = true;
- char *env = NULL;
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/
@ 2020-06-05 7:06 Pacho Ramos
0 siblings, 0 replies; 6+ messages in thread
From: Pacho Ramos @ 2020-06-05 7:06 UTC (permalink / raw
To: gentoo-commits
commit: 62f7a283d2c4e2d738a99d7d6b09ced2ee450e57
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 5 07:06:06 2020 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri Jun 5 07:06:15 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62f7a283
x11-misc/virtualgl: Add forgotten patch
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
.../files/virtualgl-2.6.3-mesa-19.3.patch | 105 +++++++++++++++++++++
1 file changed, 105 insertions(+)
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
new file mode 100644
index 00000000000..6f45ba8a3ff
--- /dev/null
+++ b/x11-misc/virtualgl/files/virtualgl-2.6.3-mesa-19.3.patch
@@ -0,0 +1,105 @@
+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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/
@ 2020-12-26 21:13 Andreas Sturmlechner
0 siblings, 0 replies; 6+ messages in thread
From: Andreas Sturmlechner @ 2020-12-26 21:13 UTC (permalink / raw
To: gentoo-commits
commit: ca0df93ff051c586cd5002f3d55989e759ad2cc6
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Thu Dec 24 08:57:15 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 21:13:21 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca0df93f
x11-misc/virtualgl: remove unused patch
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18803
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../files/virtualgl-2.6.3-mesa-19.3.patch | 105 ---------------------
1 file changed, 105 deletions(-)
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 6f45ba8a3ff..00000000000
--- 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
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/
@ 2023-04-18 19:10 Conrad Kostecki
0 siblings, 0 replies; 6+ messages in thread
From: Conrad Kostecki @ 2023-04-18 19:10 UTC (permalink / raw
To: gentoo-commits
commit: e5edf90120faab5fe44ee48f7ada78193d0c0303
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Apr 18 16:33:12 2023 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Apr 18 19:10:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5edf901
x11-misc/virtualgl: remove unused patch
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30645
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/virtualgl-3.0.1-libX11-1.8.patch | 140 ---------------------
1 file changed, 140 deletions(-)
diff --git a/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch b/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch
deleted file mode 100644
index dd37d6c3b664..000000000000
--- a/x11-misc/virtualgl/files/virtualgl-3.0.1-libX11-1.8.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From 46d09529563127fef0d42a4fb2681ae8d65a856b Mon Sep 17 00:00:00 2001
-From: DRC <information@virtualgl.org>
-Date: Thu, 7 Jul 2022 17:22:57 -0500
-Subject: [PATCH] Build: Fix compilation errors with libX11 1.8.x
-
-Fixes #205
----
- ChangeLog.md | 2 ++
- server/CMakeLists.txt | 10 ++++++++++
- server/FakePbuffer.cpp | 2 +-
- server/faker-sym.h | 6 ++++++
- server/faker-x11.cpp | 7 ++++++-
- server/faker.cpp | 4 ++--
- 6 files changed, 27 insertions(+), 4 deletions(-)
-
-diff --git a/ChangeLog.md b/ChangeLog.md
-index 292a5a94..4b9cc36f 100644
---- a/ChangeLog.md
-+++ b/ChangeLog.md
-@@ -8,6 +8,8 @@ module when using recent versions of nVidia's proprietary drivers. In some
- cases, this led to incorrect device permissions for **/dev/nvidia*** after the
- display manager was restarted.
-
-+2. Fixed compilation errors when building with libX11 1.8.x.
-+
-
- 3.0.1
- =====
-diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
-index 574521a0..2ce92856 100644
---- a/server/CMakeLists.txt
-+++ b/server/CMakeLists.txt
-@@ -91,6 +91,16 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile
- > ${CMAKE_CURRENT_BINARY_DIR}/faker-mapfile
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/faker-mapfile.c)
-
-+include(CheckPrototypeDefinition)
-+set(CMAKE_REQUIRED_INCLUDES ${X11_X11_INCLUDE_PATH})
-+check_prototype_definition(XkbOpenDisplay
-+ "Display *XkbOpenDisplay(_Xconst char *, int *, int *, int *, int *, int *)"
-+ NULL X11/XKBlib.h LIBX11_18)
-+unset(CMAKE_REQUIRED_INCLUDES)
-+if(LIBX11_18)
-+ add_definitions(-DLIBX11_18)
-+endif()
-+
- set(FAKER_SOURCES
- backend.cpp
- ContextHash.cpp
-diff --git a/server/FakePbuffer.cpp b/server/FakePbuffer.cpp
-index bfa55279..64aab775 100644
---- a/server/FakePbuffer.cpp
-+++ b/server/FakePbuffer.cpp
-@@ -10,11 +10,11 @@
- // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- // wxWindows Library License for more details.
-
-+#include <X11/Xlibint.h>
- #include "FakePbuffer.h"
- #include "TempContextEGL.h"
- #include "BufferState.h"
- #include "ContextHashEGL.h"
--#include <X11/Xlibint.h>
-
- using namespace util;
- using namespace backend;
-diff --git a/server/faker-sym.h b/server/faker-sym.h
-index 0fa1e5cd..3c6f94e8 100644
---- a/server/faker-sym.h
-+++ b/server/faker-sym.h
-@@ -704,9 +704,15 @@ FUNCDEF2(int, XNextEvent, Display *, dpy, XEvent *, xe, XNextEvent)
-
- FUNCDEF1(Display *, XOpenDisplay, _Xconst char *, name, XOpenDisplay)
-
-+#ifdef LIBX11_18
-+FUNCDEF6(Display *, XkbOpenDisplay, _Xconst char *, display_name,
-+ int *, event_rtrn, int *, error_rtrn, int *, major_in_out,
-+ int *, minor_in_out, int *, reason_rtrn, XkbOpenDisplay)
-+#else
- FUNCDEF6(Display *, XkbOpenDisplay, char *, display_name, int *, event_rtrn,
- int *, error_rtrn, int *, major_in_out, int *, minor_in_out,
- int *, reason_rtrn, XkbOpenDisplay)
-+#endif
-
- FUNCDEF5(Bool, XQueryExtension, Display *, dpy, _Xconst char *, name,
- int *, major_opcode, int *, first_event, int *, first_error,
-diff --git a/server/faker-x11.cpp b/server/faker-x11.cpp
-index 99e8bf17..a233f3b1 100644
---- a/server/faker-x11.cpp
-+++ b/server/faker-x11.cpp
-@@ -1,6 +1,6 @@
- // Copyright (C)2004 Landmark Graphics Corporation
- // Copyright (C)2005, 2006 Sun Microsystems, Inc.
--// Copyright (C)2009, 2011-2016, 2018-2021 D. R. Commander
-+// Copyright (C)2009, 2011-2016, 2018-2022 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)
-@@ -586,8 +586,13 @@ Display *XOpenDisplay(_Xconst char *name)
- // within libX11, VirtualGL cannot intercept it on some platforms. Thus we
- // need to interpose XkbOpenDisplay().
-
-+#ifdef LIBX11_18
-+Display *XkbOpenDisplay(_Xconst char *display_name, int *event_rtrn,
-+ int *error_rtrn, int *major_in_out, int *minor_in_out, int *reason_rtrn)
-+#else
- Display *XkbOpenDisplay(char *display_name, int *event_rtrn, int *error_rtrn,
- int *major_in_out, int *minor_in_out, int *reason_rtrn)
-+#endif
- {
- Display *dpy = NULL;
-
-diff --git a/server/faker.cpp b/server/faker.cpp
-index ec537a62..601cfa3e 100644
---- a/server/faker.cpp
-+++ b/server/faker.cpp
-@@ -1,6 +1,6 @@
- // Copyright (C)2004 Landmark Graphics Corporation
- // Copyright (C)2005, 2006 Sun Microsystems, Inc.
--// Copyright (C)2009, 2011, 2013-2016, 2019-2021 D. R. Commander
-+// Copyright (C)2009, 2011, 2013-2016, 2019-2022 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)
-@@ -14,6 +14,7 @@
-
- #include <unistd.h>
- #include "Mutex.h"
-+#include <X11/Xlibint.h>
- #include "ContextHash.h"
- #ifdef EGLBACKEND
- #include "ContextHashEGL.h"
-@@ -27,7 +28,6 @@
- #include "fakerconfig.h"
- #include "threadlocal.h"
- #include <dlfcn.h>
--#include <X11/Xlibint.h>
- #include "faker.h"
-
-
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-04-18 19:10 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-18 6:42 [gentoo-commits] repo/gentoo:master commit in: x11-misc/virtualgl/files/ Austin English
-- strict thread matches above, loose matches on Subject: below --
2023-04-18 19:10 Conrad Kostecki
2020-12-26 21:13 Andreas Sturmlechner
2020-06-05 7:06 Pacho Ramos
2019-12-23 10:16 David Seifert
2015-12-27 10:16 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox