svn commit: r561863 - in head/x11/virtualgl: . files
Steve Wills
swills at FreeBSD.org
Sun Jan 17 19:35:22 UTC 2021
Author: swills
Date: Sun Jan 17 19:35:20 2021
New Revision: 561863
URL: https://svnweb.freebsd.org/changeset/ports/561863
Log:
x11/virtualgl: fix build for recent version of mesa
PR: 250818
Submitted by: Thibault Payet <monwarez at mailoo.org>
Approved by: maintainer timeout (davidjx8p at gmail.com, >2 months)
Added:
head/x11/virtualgl/files/patch-server_faker-glx.cpp (contents, props changed)
head/x11/virtualgl/files/patch-server_faker-sym.h (contents, props changed)
Modified:
head/x11/virtualgl/Makefile (contents, props changed)
head/x11/virtualgl/files/patch-server__fakerconfig.cpp (contents, props changed)
Modified: head/x11/virtualgl/Makefile
==============================================================================
--- head/x11/virtualgl/Makefile Sun Jan 17 19:14:19 2021 (r561862)
+++ head/x11/virtualgl/Makefile Sun Jan 17 19:35:20 2021 (r561863)
@@ -3,6 +3,7 @@
PORTNAME= virtualgl
PORTVERSION= 2.6.3
+PORTREVISION= 1
CATEGORIES= x11 graphics
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
DISTNAME= VirtualGL-${PORTVERSION}
@@ -14,7 +15,6 @@ LIB_DEPENDS= libfltk.so:x11-toolkits/fltk \
libturbojpeg.so:graphics/libjpeg-turbo \
libxcb-keysyms.so:x11/xcb-util-keysyms
-BROKEN= fails to build
ONLY_FOR_ARCHS= amd64 i386
CMAKE_INSTALL_PREFIX= ${LOCALBASE}/VirtualGL
Modified: head/x11/virtualgl/files/patch-server__fakerconfig.cpp
==============================================================================
--- head/x11/virtualgl/files/patch-server__fakerconfig.cpp Sun Jan 17 19:14:19 2021 (r561862)
+++ head/x11/virtualgl/files/patch-server__fakerconfig.cpp Sun Jan 17 19:35:20 2021 (r561863)
@@ -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");
Added: head/x11/virtualgl/files/patch-server_faker-glx.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/virtualgl/files/patch-server_faker-glx.cpp Sun Jan 17 19:35:20 2021 (r561863)
@@ -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;
Added: head/x11/virtualgl/files/patch-server_faker-sym.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11/virtualgl/files/patch-server_faker-sym.h Sun Jan 17 19:35:20 2021 (r561863)
@@ -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
More information about the svn-ports-head
mailing list