[arch-commits] Commit in virtualbox/trunk (015-libglvnd-headers.patch PKGBUILD)

[Antonio Rojas]

    Date: Saturday, October 26, 2019 @ 13:54:53
  Author: arojas
Revision: 520340

Fix build with libglvnd headers

Added:
  virtualbox/trunk/015-libglvnd-headers.patch
Modified:
  virtualbox/trunk/PKGBUILD

----------------------------+
 015-libglvnd-headers.patch |   32 ++++++++++++++++++++++++++++++++
 PKGBUILD                   |    2 ++
 2 files changed, 34 insertions(+)

Added: 015-libglvnd-headers.patch
===================================================================
--- 015-libglvnd-headers.patch	                        (rev 0)
+++ 015-libglvnd-headers.patch	2019-10-26 13:54:53 UTC (rev 520340)
@@ -0,0 +1,32 @@
+--- VirtualBox-6.0.14/src/VBox/Additions/common/crOpenGL/dri_glx.h.orig	2019-10-26 13:39:24.704688716 +0000
++++ VirtualBox-6.0.14/src/VBox/Additions/common/crOpenGL/dri_glx.h	2019-10-26 13:40:40.635814833 +0000
+@@ -114,7 +114,7 @@
+ extern DECLEXPORT(GLXPbufferSGIX) VBOXGLXTAG(glXCreateGLXPbufferSGIX)
+ (Display *dpy, GLXFBConfigSGIX config, unsigned int width, unsigned int height, int *attrib_list);
+ 
+-extern DECLEXPORT(int) VBOXGLXTAG(glXQueryGLXPbufferSGIX)
++extern DECLEXPORT(void) VBOXGLXTAG(glXQueryGLXPbufferSGIX)
+ (Display *dpy, GLXPbuffer pbuf, int attribute, unsigned int *value);
+ 
+ extern DECLEXPORT(GLXFBConfigSGIX *) VBOXGLXTAG(glXChooseFBConfigSGIX)
+--- VirtualBox-6.0.14/src/VBox/Additions/common/crOpenGL/glx.c.orig     2019-10-26 13:47:03.041385389 +0000
++++ VirtualBox-6.0.14/src/VBox/Additions/common/crOpenGL/glx.c  2019-10-26 13:47:57.958842175 +0000
+@@ -763,7 +763,7 @@
+     (void) mask;
+ }
+ 
+-DECLEXPORT(int) VBOXGLXTAG(glXQueryGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf,
++DECLEXPORT(void) VBOXGLXTAG(glXQueryGLXPbufferSGIX)(Display *dpy, GLXPbuffer pbuf,
+                                                    int attribute, unsigned int *value)
+ {
+     (void) dpy;
+@@ -771,7 +771,7 @@
+     (void) attribute;
+     (void) value;
+     crWarning("glXQueryGLXPbufferSGIX not implemented by Chromium");
+-    return 0;
++    return;
+ }
+ 
+ DECLEXPORT(int) VBOXGLXTAG(glXGetFBConfigAttribSGIX)(Display *dpy, GLXFBConfig config,
+

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-26 11:15:40 UTC (rev 520339)
+++ PKGBUILD	2019-10-26 13:54:53 UTC (rev 520340)
@@ -76,6 +76,7 @@
         '012-vbglR3GuestCtrlDetectPeekGetCancelSupport.patch'
         '013-Makefile.patch'
         '014-iasl.patch'
+        '015-libglvnd-headers.patch'
         # The following patch and mount.vboxsf wrapper should be removed
         # once support for mainline-style options string gets upstreamed
         '101-vboxsf-automount.patch'
@@ -102,6 +103,7 @@
             '81900e13d36630488accd8c0bfd2ceb69563fb2c4f0f171caba1cca59d438024'
             'da7e58ed37dc23c6202aab3017864579a99e78417f3421ddcc98a198198fe2c9'
             '5ad14bd587031ac3dcadaeca2cc4d7b48a59ff09b03884b4fc2be5b1432a8237'
+            'c756a8492750fef099c2c2df1d444e1b47368f91caf30612cc4287c55e408f4e'
             'a784f3cc24652a16385cc63abac6c5178932ca5f3861be7650631b7dafa753a4'
             'f3ed6741f8977f40900c8aa372fa082df1f8723d497d4fff445153c543bc8947')