aboutsummaryrefslogtreecommitdiff
path: root/x11/virtualgl/files
diff options
context:
space:
mode:
authorSteve Wills <swills@FreeBSD.org>2021-01-17 19:35:20 +0000
committerSteve Wills <swills@FreeBSD.org>2021-01-17 19:35:20 +0000
commit537e0bbec5775c38b3041979095686b2fd87ddab (patch)
treed16f44e4e8c33c9ded07391a8946b953559fbc56 /x11/virtualgl/files
parent63d96251d3e6043d43d50bfb75810b74d6d6a834 (diff)
downloadports-537e0bbec5775c38b3041979095686b2fd87ddab.tar.gz
ports-537e0bbec5775c38b3041979095686b2fd87ddab.zip
x11/virtualgl: fix build for recent version of mesa
PR: 250818 Submitted by: Thibault Payet <monwarez@mailoo.org> Approved by: maintainer timeout (davidjx8p@gmail.com, >2 months)
Notes
Notes: svn path=/head/; revision=561863
Diffstat (limited to 'x11/virtualgl/files')
-rw-r--r--x11/virtualgl/files/patch-server__fakerconfig.cpp6
-rw-r--r--x11/virtualgl/files/patch-server_faker-glx.cpp24
-rw-r--r--x11/virtualgl/files/patch-server_faker-sym.h11
3 files changed, 38 insertions, 3 deletions
diff --git a/x11/virtualgl/files/patch-server__fakerconfig.cpp b/x11/virtualgl/files/patch-server__fakerconfig.cpp
index 4750fd638397..e5dd516d404f 100644
--- a/x11/virtualgl/files/patch-server__fakerconfig.cpp
+++ b/x11/virtualgl/files/patch-server__fakerconfig.cpp
@@ -1,6 +1,6 @@
---- server/fakerconfig.cpp 2019-10-20 16:29:00.000000000 -0500
-+++ server/fakerconfig.cpp 2020-04-14 10:37:51.384994000 -0500
-@@ -97,7 +97,7 @@
+--- server/fakerconfig.cpp.orig 2019-10-20 21:29:00 UTC
++++ server/fakerconfig.cpp
+@@ -97,7 +97,7 @@ FakerConfig *fconfig_getinstance(void)
if((addr = shmat(fconfig_shmid, 0, 0)) == (void *)-1) THROW_UNIX();
if(!addr)
THROW("Could not attach to config structure in shared memory");
diff --git a/x11/virtualgl/files/patch-server_faker-glx.cpp b/x11/virtualgl/files/patch-server_faker-glx.cpp
new file mode 100644
index 000000000000..6fb9d381ce39
--- /dev/null
+++ b/x11/virtualgl/files/patch-server_faker-glx.cpp
@@ -0,0 +1,24 @@
+--- server/faker-glx.cpp.orig 2019-10-20 21:29:00 UTC
++++ server/faker-glx.cpp
+@@ -2192,11 +2192,10 @@ void glXQueryDrawable(Display *dpy, GLXDrawable draw,
+ CATCH();
+ }
+
+-int glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute,
++void glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute,
+ unsigned int *value)
+ {
+ glXQueryDrawable(dpy, pbuf, attribute, value);
+- return 0;
+ }
+
+
+@@ -2359,7 +2358,7 @@ void glXSwapBuffers(Display *dpy, GLXDrawable drawable
+ // Returns the transparent index from the overlay visual on the 2D X server
+
+ int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay,
+- long *transparentIndex)
++ unsigned long *transparentIndex)
+ {
+ int retval = False;
+ XWindowAttributes xwa;
diff --git a/x11/virtualgl/files/patch-server_faker-sym.h b/x11/virtualgl/files/patch-server_faker-sym.h
new file mode 100644
index 000000000000..985d6bdea41e
--- /dev/null
+++ b/x11/virtualgl/files/patch-server_faker-sym.h
@@ -0,0 +1,11 @@
+--- server/faker-sym.h.orig 2019-10-20 21:29:00 UTC
++++ server/faker-sym.h
+@@ -536,7 +536,7 @@ FUNCDEF2(GLXFBConfigSGIX, glXGetFBConfigFromVisualSGIX
+ // GLX_SUN_get_transparent_index
+
+ FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay,
+- Window, underlay, long *, transparentIndex, glXGetTransparentIndexSUN);
++ Window, underlay, unsigned long *, transparentIndex, glXGetTransparentIndexSUN);
+
+
+ // GL functions