Attachment #219058 for bug #250315

View | Details | Raw Unified | Return to bug 250315 | Differences between
Collapse All | Expand All




--- src/VBox/Additions/common/crOpenGL/dri_glx.h.orig	2020-07-09 16:50:09 UTC
+++ src/VBox/Additions/common/crOpenGL/dri_glx.h
@@ -111,23 +111,23 @@ extern DECLEXPORT(const char *) VBOXGLXTAG(glXQueryExt
 extern DECLEXPORT(GLXPbufferSGIX) VBOXGLXTAG(glXCreateGLXPbufferSGIX)
 (Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list);
 
-extern DECLEXPORT(int) VBOXGLXTAG(glXQueryGLXPbufferSGIX)
-(Display *dpy, GLXPbuffer pbuf, int attribute, unsigned int *value);
+extern DECLEXPORT(void) VBOXGLXTAG(glXQueryGLXPbufferSGIX)
+(Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value);
 
 extern DECLEXPORT(GLXFBConfigSGIX *) VBOXGLXTAG(glXChooseFBConfigSGIX)
 (Display *dpy, int screen, int *attrib_list, int *nelements);
 
-extern DECLEXPORT(void) VBOXGLXTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf);
+extern DECLEXPORT(void) VBOXGLXTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf);
 extern DECLEXPORT(void) VBOXGLXTAG(glXSelectEventSGIX)(Display *dpy, GLXDrawable drawable, unsigned long mask);
 extern DECLEXPORT(void) VBOXGLXTAG(glXGetSelectedEventSGIX)(Display *dpy, GLXDrawable drawable, unsigned long *mask);
 
 extern DECLEXPORT(GLXFBConfigSGIX) VBOXGLXTAG(glXGetFBConfigFromVisualSGIX)(Display *dpy, XVisualInfo *vis);
-extern DECLEXPORT(XVisualInfo *) VBOXGLXTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfig config);
+extern DECLEXPORT(XVisualInfo *) VBOXGLXTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfigSGIX config);
 extern DECLEXPORT(GLXContext) VBOXGLXTAG(glXCreateContextWithConfigSGIX)
-(Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
+(Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
 
-extern DECLEXPORT(GLXPixmap) VBOXGLXTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfig config, Pixmap pixmap);
-extern DECLEXPORT(int) VBOXGLXTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfig config, int attribute, int *value);
+extern DECLEXPORT(GLXPixmap) VBOXGLXTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap);
+extern DECLEXPORT(int) VBOXGLXTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfigSGIX config, int attribute, int *value);
 
 /*
  * GLX 1.3 functions




--- src/VBox/Additions/common/crOpenGL/fakedri_drv.h.orig	2020-07-09 16:50:09 UTC
+++ src/VBox/Additions/common/crOpenGL/fakedri_drv.h
@@ -80,16 +80,16 @@ extern Bool VBOXGLXENTRYTAG(glXQueryVersion)(Display *
 extern XVisualInfo * VBOXGLXENTRYTAG(glXChooseVisual)(Display *dpy, int screen, int *attribList) ;
 extern const char * VBOXGLXENTRYTAG(glXQueryExtensionsString)(Display *dpy, int screen) ;
 extern GLXPbufferSGIX VBOXGLXENTRYTAG(glXCreateGLXPbufferSGIX)(Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list);
-extern int VBOXGLXENTRYTAG(glXQueryGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf, int attribute, unsigned int *value);
+extern void VBOXGLXENTRYTAG(glXQueryGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value);
 extern GLXFBConfigSGIX * VBOXGLXENTRYTAG(glXChooseFBConfigSGIX)(Display *dpy, int screen, int *attrib_list, int *nelements);
-extern void VBOXGLXENTRYTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf) ;
+extern void VBOXGLXENTRYTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf) ;
 extern void VBOXGLXENTRYTAG(glXSelectEventSGIX)(Display *dpy, GLXDrawable drawable, unsigned long mask) ;
 extern void VBOXGLXENTRYTAG(glXGetSelectedEventSGIX)(Display *dpy, GLXDrawable drawable, unsigned long *mask) ;
 extern GLXFBConfigSGIX VBOXGLXENTRYTAG(glXGetFBConfigFromVisualSGIX)(Display *dpy, XVisualInfo *vis) ;
-extern XVisualInfo * VBOXGLXENTRYTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfig config) ;
-extern GLXContext VBOXGLXENTRYTAG(glXCreateContextWithConfigSGIX)(Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
-extern GLXPixmap VBOXGLXENTRYTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfig config, Pixmap pixmap) ;
-extern int VBOXGLXENTRYTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfig config, int attribute, int *value) ;
+extern XVisualInfo * VBOXGLXENTRYTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfigSGIX config) ;
+extern GLXContext VBOXGLXENTRYTAG(glXCreateContextWithConfigSGIX)(Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
+extern GLXPixmap VBOXGLXENTRYTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap) ;
+extern int VBOXGLXENTRYTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfigSGIX config, int attribute, int *value) ;
 extern GLXFBConfig * VBOXGLXENTRYTAG(glXChooseFBConfig)(Display *dpy, int screen, ATTRIB_TYPE *attrib_list, int *nelements) ;
 extern GLXPbuffer VBOXGLXENTRYTAG(glXCreatePbuffer)(Display *dpy, GLXFBConfig config, ATTRIB_TYPE *attrib_list) ;
 extern GLXPixmap VBOXGLXENTRYTAG(glXCreatePixmap)(Display *dpy, GLXFBConfig config, Pixmap pixmap, const ATTRIB_TYPE *attrib_list) ;




--- src/VBox/Additions/common/crOpenGL/glx.c.orig	2020-07-09 16:50:09 UTC
+++ src/VBox/Additions/common/crOpenGL/glx.c
@@ -742,7 +742,7 @@ VBOXGLXTAG(glXCreateGLXPbufferSGIX)(Display *dpy, GLXF
     return 0;
 }
 
-DECLEXPORT(void) VBOXGLXTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf)
+DECLEXPORT(void) VBOXGLXTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf)
 {
     (void) dpy;
     (void) pbuf;
@@ -763,7 +763,7 @@ DECLEXPORT(void) VBOXGLXTAG(glXGetSelectedEventSGIX)(D
     (void) mask;
 }
 
-DECLEXPORT(int) VBOXGLXTAG(glXQueryGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf,
+DECLEXPORT(void) VBOXGLXTAG(glXQueryGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf,
                                                    int attribute, unsigned int *value)
 {
     (void) dpy;
@@ -771,10 +771,9 @@ DECLEXPORT(int) VBOXGLXTAG(glXQueryGLXPbufferSGIX)(Dis
     (void) attribute;
     (void) value;
     crWarning("glXQueryGLXPbufferSGIX not implemented by Chromium");
-    return 0;
 }
 
-DECLEXPORT(int) VBOXGLXTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfig config,
+DECLEXPORT(int) VBOXGLXTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfigSGIX config,
                                                      int attribute, int *value)
 {
     return VBOXGLXTAG(glXGetFBConfigAttrib)(dpy, config, attribute, value);
@@ -789,14 +788,14 @@ VBOXGLXTAG(glXChooseFBConfigSGIX)(Display *dpy, int sc
 
 DECLEXPORT(GLXPixmap)
 VBOXGLXTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy,
-                                             GLXFBConfig config,
+                                             GLXFBConfigSGIX config,
                                              Pixmap pixmap)
 {
     return VBOXGLXTAG(glXCreatePixmap)(dpy, config, pixmap, NULL);
 }
 
 DECLEXPORT(GLXContext)
-VBOXGLXTAG(glXCreateContextWithConfigSGIX)(Display *dpy, GLXFBConfig config,
+VBOXGLXTAG(glXCreateContextWithConfigSGIX)(Display *dpy, GLXFBConfigSGIX config,
                                            int render_type,
                                            GLXContext share_list,
                                            Bool direct)
@@ -812,7 +811,7 @@ VBOXGLXTAG(glXCreateContextWithConfigSGIX)(Display *dp
 
 DECLEXPORT(XVisualInfo *)
 VBOXGLXTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy,
-                                         GLXFBConfig config)
+                                         GLXFBConfigSGIX config)
 {
     return visualInfoFromFBConfig(dpy, config);
 }




--- src/VBox/Additions/common/crOpenGL/glx_c_exports.c.orig	2020-10-25 11:52:00 UTC
+++ src/VBox/Additions/common/crOpenGL/glx_c_exports.c
@@ -213,8 +213,8 @@ DECLEXPORT(GLXPbufferSGIX) VBOXGLXENTRYTAG(glXCreateGL
     return glxim.CreateGLXPbufferSGIX(dpy, config, width, height, attrib_list);
 }
 
-DECLEXPORT(int) VBOXGLXENTRYTAG(glXQueryGLXPbufferSGIX)
-(Display *dpy, GLXPbuffer pbuf, int attribute, unsigned int *value)
+DECLEXPORT(void) VBOXGLXENTRYTAG(glXQueryGLXPbufferSGIX)
+(Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value)
 {
     return glxim.QueryGLXPbufferSGIX(dpy, pbuf, attribute, value);
 }
@@ -225,7 +225,7 @@ DECLEXPORT(GLXFBConfigSGIX *) VBOXGLXENTRYTAG(glXChoos
     return glxim.ChooseFBConfigSGIX(dpy, screen, attrib_list, nelements);
 }
 
-DECLEXPORT(void) VBOXGLXENTRYTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf)
+DECLEXPORT(void) VBOXGLXENTRYTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf)
 {
     return glxim.DestroyGLXPbufferSGIX(dpy, pbuf);
 }
@@ -245,23 +245,23 @@ DECLEXPORT(GLXFBConfigSGIX) VBOXGLXENTRYTAG(glXGetFBCo
     return glxim.GetFBConfigFromVisualSGIX(dpy, vis);
 }
 
-DECLEXPORT(XVisualInfo *) VBOXGLXENTRYTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfig config)
+DECLEXPORT(XVisualInfo *) VBOXGLXENTRYTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfigSGIX config)
 {
     return glxim.GetVisualFromFBConfigSGIX(dpy, config);
 }
 
 DECLEXPORT(GLXContext) VBOXGLXENTRYTAG(glXCreateContextWithConfigSGIX)
-(Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct)
+(Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct)
 {
     return glxim.CreateContextWithConfigSGIX(dpy, config, render_type, share_list, direct);
 }
 
-DECLEXPORT(GLXPixmap) VBOXGLXENTRYTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfig config, Pixmap pixmap)
+DECLEXPORT(GLXPixmap) VBOXGLXENTRYTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap)
 {
     return glxim.CreateGLXPixmapWithConfigSGIX(dpy, config, pixmap);
 }
 
-DECLEXPORT(int) VBOXGLXENTRYTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfig config, int attribute, int *value)
+DECLEXPORT(int) VBOXGLXENTRYTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfigSGIX config, int attribute, int *value)
 {
     return glxim.GetFBConfigAttribSGIX(dpy, config, attribute, value);
 }




--- src/VBox/Additions/common/crOpenGL/glx_proto.h.orig	2020-07-09 16:50:09 UTC
+++ src/VBox/Additions/common/crOpenGL/glx_proto.h
@@ -95,23 +95,23 @@ typedef const char * (*PGLXFUNC_QueryExtensionsString)
 typedef GLXPbufferSGIX (*PGLXFUNC_CreateGLXPbufferSGIX)
 (Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list);
 
-typedef int (*PGLXFUNC_QueryGLXPbufferSGIX)
-(Display *dpy, GLXPbuffer pbuf, int attribute, unsigned int *value);
+typedef void (*PGLXFUNC_QueryGLXPbufferSGIX)
+(Display *dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int *value);
 
 typedef GLXFBConfigSGIX * (*PGLXFUNC_ChooseFBConfigSGIX)
 (Display *dpy, int screen, int *attrib_list, int *nelements);
 
-typedef void (*PGLXFUNC_DestroyGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf);
+typedef void (*PGLXFUNC_DestroyGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf);
 typedef void (*PGLXFUNC_SelectEventSGIX)(Display *dpy, GLXDrawable drawable, unsigned long mask);
 typedef void (*PGLXFUNC_GetSelectedEventSGIX)(Display *dpy, GLXDrawable drawable, unsigned long *mask);
 
 typedef GLXFBConfigSGIX (*PGLXFUNC_GetFBConfigFromVisualSGIX)(Display *dpy, XVisualInfo *vis);
-typedef XVisualInfo * (*PGLXFUNC_GetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfig config);
+typedef XVisualInfo * (*PGLXFUNC_GetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfigSGIX config);
 typedef GLXContext (*PGLXFUNC_CreateContextWithConfigSGIX)
-(Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
+(Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
 
-typedef GLXPixmap (*PGLXFUNC_CreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfig config, Pixmap pixmap);
-typedef int (*PGLXFUNC_GetFBConfigAttribSGIX)(Display *dpy, GLXFBConfig config, int attribute, int *value);
+typedef GLXPixmap (*PGLXFUNC_CreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap);
+typedef int (*PGLXFUNC_GetFBConfigAttribSGIX)(Display *dpy, GLXFBConfigSGIX config, int attribute, int *value);
 
 /*
  * GLX 1.3 functions





PORTNAME=	virtualbox-ose
PORTVERSION=	5.2.44
PORTREVISION=	3
CATEGORIES=	emulators
MASTER_SITES=	https://download.oracle.com/virtualbox/${PORTVERSION}/
PKGNAMESUFFIX?=	-additions

	    ${WRKSRC}/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
.endif
	@${REINPLACE_CMD} \
	    -e 's|#define GLX_EXTRAS 1||g' \
	    ${WRKSRC}/src/VBox/Additions/common/crOpenGL/dri_glx.h \
	    ${WRKSRC}/src/VBox/Additions/common/crOpenGL/glx_proto.h

post-patch-OPENGL-on:
	@${ECHO_CMD} 'VBOX_USE_SYSTEM_GL_HEADERS = 1' >> ${WRKSRC}/LocalConfig.kmk

Return to bug 250315

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_crOpenGL_dri__glx.h (+33 lines)
	1	--- src/VBox/Additions/common/crOpenGL/dri_glx.h.orig 2020-07-09 16:50:09 UTC
	2	+++ src/VBox/Additions/common/crOpenGL/dri_glx.h
	3	@@ -111,23 +111,23 @@ extern DECLEXPORT(const char *) VBOXGLXTAG(glXQueryExt
	4	extern DECLEXPORT(GLXPbufferSGIX) VBOXGLXTAG(glXCreateGLXPbufferSGIX)
	5	(Display dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int attrib_list);
	6
	7	-extern DECLEXPORT(int) VBOXGLXTAG(glXQueryGLXPbufferSGIX)
	8	-(Display dpy, GLXPbuffer pbuf, int attribute, unsigned int value);
	9	+extern DECLEXPORT(void) VBOXGLXTAG(glXQueryGLXPbufferSGIX)
	10	+(Display dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int value);
	11
	12	extern DECLEXPORT(GLXFBConfigSGIX *) VBOXGLXTAG(glXChooseFBConfigSGIX)
	13	(Display dpy, int screen, int attrib_list, int *nelements);
	14
	15	-extern DECLEXPORT(void) VBOXGLXTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf);
	16	+extern DECLEXPORT(void) VBOXGLXTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf);
	17	extern DECLEXPORT(void) VBOXGLXTAG(glXSelectEventSGIX)(Display *dpy, GLXDrawable drawable, unsigned long mask);
	18	extern DECLEXPORT(void) VBOXGLXTAG(glXGetSelectedEventSGIX)(Display dpy, GLXDrawable drawable, unsigned long mask);
	19
	20	extern DECLEXPORT(GLXFBConfigSGIX) VBOXGLXTAG(glXGetFBConfigFromVisualSGIX)(Display dpy, XVisualInfo vis);
	21	-extern DECLEXPORT(XVisualInfo ) VBOXGLXTAG(glXGetVisualFromFBConfigSGIX)(Display dpy, GLXFBConfig config);
	22	+extern DECLEXPORT(XVisualInfo ) VBOXGLXTAG(glXGetVisualFromFBConfigSGIX)(Display dpy, GLXFBConfigSGIX config);
	23	extern DECLEXPORT(GLXContext) VBOXGLXTAG(glXCreateContextWithConfigSGIX)
	24	-(Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
	25	+(Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
	26
	27	-extern DECLEXPORT(GLXPixmap) VBOXGLXTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfig config, Pixmap pixmap);
	28	-extern DECLEXPORT(int) VBOXGLXTAG(glXGetFBConfigAttribSGIX)(Display dpy, GLXFBConfig config, int attribute, int value);
	29	+extern DECLEXPORT(GLXPixmap) VBOXGLXTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap);
	30	+extern DECLEXPORT(int) VBOXGLXTAG(glXGetFBConfigAttribSGIX)(Display dpy, GLXFBConfigSGIX config, int attribute, int value);
	31
	32	/*
	33	* GLX 1.3 functions

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_crOpenGL_fakedri__drv.h (+25 lines)
	1	--- src/VBox/Additions/common/crOpenGL/fakedri_drv.h.orig 2020-07-09 16:50:09 UTC
	2	+++ src/VBox/Additions/common/crOpenGL/fakedri_drv.h
	3	@@ -80,16 +80,16 @@ extern Bool VBOXGLXENTRYTAG(glXQueryVersion)(Display *
	4	extern XVisualInfo * VBOXGLXENTRYTAG(glXChooseVisual)(Display dpy, int screen, int attribList) ;
	5	extern const char * VBOXGLXENTRYTAG(glXQueryExtensionsString)(Display *dpy, int screen) ;
	6	extern GLXPbufferSGIX VBOXGLXENTRYTAG(glXCreateGLXPbufferSGIX)(Display dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int attrib_list);
	7	-extern int VBOXGLXENTRYTAG(glXQueryGLXPbufferSGIX)(Display dpy, GLXPbuffer pbuf, int attribute, unsigned int value);
	8	+extern void VBOXGLXENTRYTAG(glXQueryGLXPbufferSGIX)(Display dpy, GLXPbufferSGIX pbuf, int attribute, unsigned int value);
	9	extern GLXFBConfigSGIX * VBOXGLXENTRYTAG(glXChooseFBConfigSGIX)(Display dpy, int screen, int attrib_list, int *nelements);
	10	-extern void VBOXGLXENTRYTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf) ;
	11	+extern void VBOXGLXENTRYTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf) ;
	12	extern void VBOXGLXENTRYTAG(glXSelectEventSGIX)(Display *dpy, GLXDrawable drawable, unsigned long mask) ;
	13	extern void VBOXGLXENTRYTAG(glXGetSelectedEventSGIX)(Display dpy, GLXDrawable drawable, unsigned long mask) ;
	14	extern GLXFBConfigSGIX VBOXGLXENTRYTAG(glXGetFBConfigFromVisualSGIX)(Display dpy, XVisualInfo vis) ;
	15	-extern XVisualInfo * VBOXGLXENTRYTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfig config) ;
	16	-extern GLXContext VBOXGLXENTRYTAG(glXCreateContextWithConfigSGIX)(Display *dpy, GLXFBConfig config, int render_type, GLXContext share_list, Bool direct);
	17	-extern GLXPixmap VBOXGLXENTRYTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfig config, Pixmap pixmap) ;
	18	-extern int VBOXGLXENTRYTAG(glXGetFBConfigAttribSGIX)(Display dpy, GLXFBConfig config, int attribute, int value) ;
	19	+extern XVisualInfo * VBOXGLXENTRYTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy, GLXFBConfigSGIX config) ;
	20	+extern GLXContext VBOXGLXENTRYTAG(glXCreateContextWithConfigSGIX)(Display *dpy, GLXFBConfigSGIX config, int render_type, GLXContext share_list, Bool direct);
	21	+extern GLXPixmap VBOXGLXENTRYTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy, GLXFBConfigSGIX config, Pixmap pixmap) ;
	22	+extern int VBOXGLXENTRYTAG(glXGetFBConfigAttribSGIX)(Display dpy, GLXFBConfigSGIX config, int attribute, int value) ;
	23	extern GLXFBConfig * VBOXGLXENTRYTAG(glXChooseFBConfig)(Display dpy, int screen, ATTRIB_TYPE attrib_list, int *nelements) ;
	24	extern GLXPbuffer VBOXGLXENTRYTAG(glXCreatePbuffer)(Display dpy, GLXFBConfig config, ATTRIB_TYPE attrib_list) ;
	25	extern GLXPixmap VBOXGLXENTRYTAG(glXCreatePixmap)(Display dpy, GLXFBConfig config, Pixmap pixmap, const ATTRIB_TYPE attrib_list) ;

Line 0 Link Here

(-)emulators/virtualbox-ose/files/patch-src_VBox_Additions_common_crOpenGL_glx.c (+58 lines)
	1	--- src/VBox/Additions/common/crOpenGL/glx.c.orig 2020-07-09 16:50:09 UTC
	2	+++ src/VBox/Additions/common/crOpenGL/glx.c
	3	@@ -742,7 +742,7 @@ VBOXGLXTAG(glXCreateGLXPbufferSGIX)(Display *dpy, GLXF
	4	return 0;
	5	}
	6
	7	-DECLEXPORT(void) VBOXGLXTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf)
	8	+DECLEXPORT(void) VBOXGLXTAG(glXDestroyGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf)
	9	{
	10	(void) dpy;
	11	(void) pbuf;
	12	@@ -763,7 +763,7 @@ DECLEXPORT(void) VBOXGLXTAG(glXGetSelectedEventSGIX)(D
	13	(void) mask;
	14	}
	15
	16	-DECLEXPORT(int) VBOXGLXTAG(glXQueryGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf,
	17	+DECLEXPORT(void) VBOXGLXTAG(glXQueryGLXPbufferSGIX)(Display *dpy, GLXPbufferSGIX pbuf,
	18	int attribute, unsigned int *value)
	19	{
	20	(void) dpy;
	21	@@ -771,10 +771,9 @@ DECLEXPORT(int) VBOXGLXTAG(glXQueryGLXPbufferSGIX)(Dis
	22	(void) attribute;
	23	(void) value;
	24	crWarning("glXQueryGLXPbufferSGIX not implemented by Chromium");
	25	- return 0;
	26	}
	27
	28	-DECLEXPORT(int) VBOXGLXTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfig config,
	29	+DECLEXPORT(int) VBOXGLXTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfigSGIX config,
	30	int attribute, int *value)
	31	{
	32	return VBOXGLXTAG(glXGetFBConfigAttrib)(dpy, config, attribute, value);
	33	@@ -789,14 +788,14 @@ VBOXGLXTAG(glXChooseFBConfigSGIX)(Display *dpy, int sc
	34
	35	DECLEXPORT(GLXPixmap)
	36	VBOXGLXTAG(glXCreateGLXPixmapWithConfigSGIX)(Display *dpy,
	37	- GLXFBConfig config,
	38	+ GLXFBConfigSGIX config,
	39	Pixmap pixmap)
	40	{
	41	return VBOXGLXTAG(glXCreatePixmap)(dpy, config, pixmap, NULL);
	42	}
	43
	44	DECLEXPORT(GLXContext)
	45	-VBOXGLXTAG(glXCreateContextWithConfigSGIX)(Display *dpy, GLXFBConfig config,
	46	+VBOXGLXTAG(glXCreateContextWithConfigSGIX)(Display *dpy, GLXFBConfigSGIX config,
	47	int render_type,
	48	GLXContext share_list,
	49	Bool direct)
	50	@@ -812,7 +811,7 @@ VBOXGLXTAG(glXCreateContextWithConfigSGIX)(Display *dp
	51
	52	DECLEXPORT(XVisualInfo *)
	53	VBOXGLXTAG(glXGetVisualFromFBConfigSGIX)(Display *dpy,
	54	- GLXFBConfig config)
	55	+ GLXFBConfigSGIX config)
	56	{
	57	return visualInfoFromFBConfig(dpy, config);
	58	}

Lines 3-9 Link Here

(-)emulators/virtualbox-ose-additions/Makefile (-5 / +1 lines)
3		3
4	PORTNAME= virtualbox-ose	4	PORTNAME= virtualbox-ose
5	PORTVERSION= 5.2.44	5	PORTVERSION= 5.2.44
6	PORTREVISION= 2	6	PORTREVISION= 3
7	CATEGORIES= emulators	7	CATEGORIES= emulators
8	MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/	8	MASTER_SITES= https://download.oracle.com/virtualbox/${PORTVERSION}/
9	PKGNAMESUFFIX?= -additions	9	PKGNAMESUFFIX?= -additions
Lines 141-150 Link Here
141	${WRKSRC}/src/VBox/Additions/x11/VBoxClient/Makefile.kmk	141	${WRKSRC}/src/VBox/Additions/x11/VBoxClient/Makefile.kmk
142	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk	142	@${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk
143	.endif	143	.endif
144	@${REINPLACE_CMD} \
145	-e 's\|#define GLX_EXTRAS 1\|\|g' \
146	${WRKSRC}/src/VBox/Additions/common/crOpenGL/dri_glx.h \
147	${WRKSRC}/src/VBox/Additions/common/crOpenGL/glx_proto.h
148		144
149	post-patch-OPENGL-on:	145	post-patch-OPENGL-on:
150	@${ECHO_CMD} 'VBOX_USE_SYSTEM_GL_HEADERS = 1' >> ${WRKSRC}/LocalConfig.kmk	146	@${ECHO_CMD} 'VBOX_USE_SYSTEM_GL_HEADERS = 1' >> ${WRKSRC}/LocalConfig.kmk