Attachment #219310 for bug #250818

View | Details | Raw Unified | Return to bug 250818
Collapse All | Expand All

Lines 3-8 Link Here

(-)Makefile (-1 / +1 lines)
3		3
4	PORTNAME= virtualgl	4	PORTNAME= virtualgl
5	PORTVERSION= 2.6.3	5	PORTVERSION= 2.6.3
		6	PORTREVISION= 1
6	CATEGORIES= x11 graphics	7	CATEGORIES= x11 graphics
7	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}	8	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
8	DISTNAME= VirtualGL-${PORTVERSION}	9	DISTNAME= VirtualGL-${PORTVERSION}
Lines 14-20 Link Here
14	libturbojpeg.so:graphics/libjpeg-turbo \	15	libturbojpeg.so:graphics/libjpeg-turbo \
15	libxcb-keysyms.so:x11/xcb-util-keysyms	16	libxcb-keysyms.so:x11/xcb-util-keysyms
16		17
17	BROKEN= fails to build
18	ONLY_FOR_ARCHS= amd64 i386	18	ONLY_FOR_ARCHS= amd64 i386
19		19
20	CMAKE_INSTALL_PREFIX= ${LOCALBASE}/VirtualGL	20	CMAKE_INSTALL_PREFIX= ${LOCALBASE}/VirtualGL

Lines 1-6 Link Here

(-)files/patch-server__fakerconfig.cpp (-3 / +3 lines)
1	--- server/fakerconfig.cpp 2019-10-20 16:29:00.000000000 -0500	1	--- server/fakerconfig.cpp.orig 2019-10-20 21:29:00 UTC
2	+++ server/fakerconfig.cpp 2020-04-14 10:37:51.384994000 -0500	2	+++ server/fakerconfig.cpp
3	@@ -97,7 +97,7 @@	3	@@ -97,7 +97,7 @@ FakerConfig *fconfig_getinstance(void)
4	if((addr = shmat(fconfig_shmid, 0, 0)) == (void *)-1) THROW_UNIX();	4	if((addr = shmat(fconfig_shmid, 0, 0)) == (void *)-1) THROW_UNIX();
5	if(!addr)	5	if(!addr)
6	THROW("Could not attach to config structure in shared memory");	6	THROW("Could not attach to config structure in shared memory");




--- 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;

Line 0 Link Here

(-)files/patch-server_faker-sym.h (+11 lines)
	1	--- server/faker-sym.h.orig 2019-10-20 21:29:00 UTC
	2	+++ server/faker-sym.h
	3	@@ -536,7 +536,7 @@ FUNCDEF2(GLXFBConfigSGIX, glXGetFBConfigFromVisualSGIX
	4	// GLX_SUN_get_transparent_index
	5
	6	FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay,
	7	- Window, underlay, long *, transparentIndex, glXGetTransparentIndexSUN);
	8	+ Window, underlay, unsigned long *, transparentIndex, glXGetTransparentIndexSUN);
	9
	10
	11	// GL functions

Return to bug 250818

Line 0 Link Here

(-)files/patch-server_faker-glx.cpp (+24 lines)
	1	--- server/faker-glx.cpp.orig 2019-10-20 21:29:00 UTC
	2	+++ server/faker-glx.cpp
	3	@@ -2192,11 +2192,10 @@ void glXQueryDrawable(Display *dpy, GLXDrawable draw,
	4	CATCH();
	5	}
	6
	7	-int glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute,
	8	+void glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute,
	9	unsigned int *value)
	10	{
	11	glXQueryDrawable(dpy, pbuf, attribute, value);
	12	- return 0;
	13	}
	14
	15
	16	@@ -2359,7 +2358,7 @@ void glXSwapBuffers(Display *dpy, GLXDrawable drawable
	17	// Returns the transparent index from the overlay visual on the 2D X server
	18
	19	int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay,
	20	- long *transparentIndex)
	21	+ unsigned long *transparentIndex)
	22	{
	23	int retval = False;
	24	XWindowAttributes xwa;