Index: head/x11/virtualgl/Makefile =================================================================== --- head/x11/virtualgl/Makefile (revision 561862) +++ head/x11/virtualgl/Makefile (revision 561863) @@ -1,62 +1,62 @@ # Created by: David Mackay # $FreeBSD$ PORTNAME= virtualgl PORTVERSION= 2.6.3 +PORTREVISION= 1 CATEGORIES= x11 graphics MASTER_SITES= SF/${PORTNAME}/${PORTVERSION} DISTNAME= VirtualGL-${PORTVERSION} MAINTAINER= davidjx8p@gmail.com COMMENT= Redirects commands from an OpenGL app to another X server 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 DOCSDIR= ${LOCALBASE}/VirtualGL/doc USES= cmake compiler:c++11-lang gl xorg USE_GL= gl glu USE_XORG= x11 xcb xext xtst CMAKE_ARGS= -DTJPEG_INCLUDE_DIR=${LOCALBASE}/include \ -DTJPEG_LIBRARY=${LOCALBASE}/lib/libturbojpeg.so \ -DVGL_FAKEXCB=on -DVGL_SYSTEMFLTK=on \ -DCMAKE_INSTALL_DOCDIR=${DOCSDIR} USE_LDCONFIG= ${PREFIX}/VirtualGL/lib LDFLAGS+= -L${LOCALBASE}/lib OPTIONS_DEFINE= OPENCL OPENSSL XVIDEO OPTIONS_DEFAULT= OPENCL OPTIONS_SUB= yes OPENCL_CMAKE_BOOL= VGL_FAKEOPENCL OPENCL_BUILD_DEPENDS= opencl>=0:devel/opencl OPENCL_LIB_DEPENDS= libOpenCL.so:devel/ocl-icd OPENCL_DESC= Build OpenCL interposer library OPENSSL_CMAKE_BOOL= VGL_USESSL OPENSSL_USES= ssl XVIDEO_CMAKE_BOOL= VGL_USEXV XVIDEO_USE= XORG=xv .include .if ${ARCH} == "i386" PLIST_SUB+= I386="" PLIST_SUB+= AMD64="@comment " .else PLIST_SUB+= I386="@comment " PLIST_SUB+= AMD64="" .endif post-patch: @${REINPLACE_CMD} -e '/^#define CHECKGL/s,m);, &,' \ ${WRKSRC}/server/VirtualDrawable.cpp .include Index: head/x11/virtualgl/files/patch-server__fakerconfig.cpp =================================================================== --- head/x11/virtualgl/files/patch-server__fakerconfig.cpp (revision 561862) +++ head/x11/virtualgl/files/patch-server__fakerconfig.cpp (revision 561863) @@ -1,11 +1,11 @@ ---- 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"); - #ifdef linux + #if defined(linux) || defined(__FreeBSD__) shmctl(fconfig_shmid, IPC_RMID, 0); #endif char *env = NULL; Property changes on: head/x11/virtualgl/files/patch-server__fakerconfig.cpp ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/virtualgl/files/patch-server_faker-glx.cpp =================================================================== --- head/x11/virtualgl/files/patch-server_faker-glx.cpp (nonexistent) +++ head/x11/virtualgl/files/patch-server_faker-glx.cpp (revision 561863) @@ -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; Property changes on: head/x11/virtualgl/files/patch-server_faker-glx.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/x11/virtualgl/files/patch-server_faker-sym.h =================================================================== --- head/x11/virtualgl/files/patch-server_faker-sym.h (nonexistent) +++ head/x11/virtualgl/files/patch-server_faker-sym.h (revision 561863) @@ -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 Property changes on: head/x11/virtualgl/files/patch-server_faker-sym.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property