[arch-commits] Commit in virtualgl/trunk (2 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Fri Aug 28 20:01:54 UTC 2020
Date: Friday, August 28, 2020 @ 20:01:53
Author: svenstaro
Revision: 691247
upgpkg: virtualgl 2.6.4-1
Modified:
virtualgl/trunk/PKGBUILD
Deleted:
virtualgl/trunk/faedcc1e36b4ed89a325e01822447900840a0b77.patch
------------------------------------------------+
PKGBUILD | 12 --
faedcc1e36b4ed89a325e01822447900840a0b77.patch | 105 -----------------------
2 files changed, 4 insertions(+), 113 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-08-28 20:01:42 UTC (rev 691246)
+++ PKGBUILD 2020-08-28 20:01:53 UTC (rev 691247)
@@ -3,7 +3,7 @@
# Contributor: Andres Jimenez
pkgname=virtualgl
-pkgver=2.6.3
+pkgver=2.6.4
pkgrel=1
pkgdesc="Redirects 3D commands from an OpenGL application onto a server-side 3D graphics card"
arch=('x86_64')
@@ -11,18 +11,14 @@
license=('LGPL')
depends=('libxv' 'glu' 'libjpeg-turbo' 'xcb-util-keysyms' 'opencl-driver' 'ocl-icd')
makedepends=('cmake' 'mesa' 'libxtst' 'opencl-headers')
-source=("https://downloads.sourceforge.net/project/virtualgl/${pkgver}/VirtualGL-${pkgver}.tar.gz"{,.sig}
- faedcc1e36b4ed89a325e01822447900840a0b77.patch)
-sha512sums=('c01c602335d51c94840c32021a5ce4f982939d67efbe1458fce67582c5a76ac42f5b733998a8c8f04a77d57d7c2de01377f7cabcf848c01bfd9b2d8e0b318fea'
- 'SKIP'
- '6845a60071aac333ac1c2ad5c3861f9fbe8cdf9f28425817a18c2b6f8c280b5469ce3be4831a0bf8a6600955bf5177217ff684c61f728783f2d09be6885f2815')
+source=("https://downloads.sourceforge.net/project/virtualgl/${pkgver}/VirtualGL-${pkgver}.tar.gz"{,.sig})
+sha512sums=('a475e5b7373d0c86ec7d1274f7527cd7bb1d82acdb38d42366faae58175052f957e090a4c8fdb4e3ba4b2b9063957c14b46d55316b69420247d2f9cf3afb1280'
+ 'SKIP')
validpgpkeys=('ECF01671D05E2A105FF84DC46BBEFA1972FEB9CE') # The VirtualGL Project (Signing key for official binaries) <information at VirtualGL.org>
prepare() {
cd VirtualGL-$pkgver
- patch -Np1 -i "$srcdir"/faedcc1e36b4ed89a325e01822447900840a0b77.patch
-
# FS#48403
export LDFLAGS="${LDFLAGS/--as-needed,}"
Deleted: faedcc1e36b4ed89a325e01822447900840a0b77.patch
===================================================================
--- faedcc1e36b4ed89a325e01822447900840a0b77.patch 2020-08-28 20:01:42 UTC (rev 691246)
+++ faedcc1e36b4ed89a325e01822447900840a0b77.patch 2020-08-28 20:01:53 UTC (rev 691247)
@@ -1,105 +0,0 @@
-From faedcc1e36b4ed89a325e01822447900840a0b77 Mon Sep 17 00:00:00 2001
-From: DRC <information at virtualgl.org>
-Date: Thu, 13 Feb 2020 19:11:46 -0600
-Subject: [PATCH] Faker: Fix build issue w/ Mesa 19.3.0+ headers
-
-Mesa changed the signatures for glXGetTransparentIndexSUN() and
-glXQueryGLXPbufferSGIX() to match the official GLX extension specs:
-https://www.khronos.org/registry/OpenGL/extensions/SUN/GLX_SUN_get_transparent_index.txt
-https://www.khronos.org/registry/OpenGL/extensions/SGIX/GLX_SGIX_pbuffer.txt
-
-Reference:
-https://gitlab.freedesktop.org/mesa/mesa/commit/3dd299c3d5b88114894ec30d1fac85fba688201f
-
-Fixes #109
----
- ChangeLog.md | 2 ++
- server/faker-glx.cpp | 14 +++++++++++++-
- server/faker-sym.h | 8 +++++++-
- 3 files changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/ChangeLog.md b/ChangeLog.md
-index 8d092bd7..78391d06 100644
---- a/ChangeLog.md
-+++ b/ChangeLog.md
-@@ -6,6 +6,8 @@
- 1. VirtualGL now works properly with 3D applications that use the
- `glDrawBuffers()` function and render to the front buffer.
-
-+2. VirtualGL can now be built using the GLX headers from Mesa 19.3.0 and later.
-+
-
- 2.6.3
- =====
-diff --git a/server/faker-glx.cpp b/server/faker-glx.cpp
-index faea37b6..6e7beb63 100644
---- a/server/faker-glx.cpp
-+++ b/server/faker-glx.cpp
-@@ -1,6 +1,6 @@
- // Copyright (C)2004 Landmark Graphics Corporation
- // Copyright (C)2005, 2006 Sun Microsystems, Inc.
--// Copyright (C)2009, 2011-2019 D. R. Commander
-+// Copyright (C)2009, 2011-2020 D. R. Commander
- //
- // This library is free software and may be redistributed and/or modified under
- // the terms of the wxWindows Library License, Version 3.1 or (at your option)
-@@ -2192,11 +2192,18 @@ void glXQueryDrawable(Display *dpy, GLXDrawable draw, int attribute,
- CATCH();
- }
-
-+#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 20190000
-+void glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute,
-+ unsigned int *value)
-+#else
- int glXQueryGLXPbufferSGIX(Display *dpy, GLXPbuffer pbuf, int attribute,
- unsigned int *value)
-+#endif
- {
- glXQueryDrawable(dpy, pbuf, attribute, value);
-+ #if !defined(GLX_GLXEXT_VERSION) || GLX_GLXEXT_VERSION < 20190000
- return 0;
-+ #endif
- }
-
-
-@@ -2358,8 +2365,13 @@ void glXSwapBuffers(Display *dpy, GLXDrawable drawable)
-
- // Returns the transparent index from the overlay visual on the 2D X server
-
-+#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 20190000
-+int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay,
-+ unsigned long *transparentIndex)
-+#else
- int glXGetTransparentIndexSUN(Display *dpy, Window overlay, Window underlay,
- long *transparentIndex)
-+#endif
- {
- int retval = False;
- XWindowAttributes xwa;
-diff --git a/server/faker-sym.h b/server/faker-sym.h
-index b9aa30d0..0168ac7b 100644
---- a/server/faker-sym.h
-+++ b/server/faker-sym.h
-@@ -1,6 +1,6 @@
- // Copyright (C)2004 Landmark Graphics Corporation
- // Copyright (C)2005, 2006 Sun Microsystems, Inc.
--// Copyright (C)2009, 2011, 2013-2016, 2018-2019 D. R. Commander
-+// Copyright (C)2009, 2011, 2013-2016, 2018-2020 D. R. Commander
- //
- // This library is free software and may be redistributed and/or modified under
- // the terms of the wxWindows Library License, Version 3.1 or (at your option)
-@@ -535,8 +535,14 @@ FUNCDEF2(GLXFBConfigSGIX, glXGetFBConfigFromVisualSGIX, Display *, dpy,
-
- // GLX_SUN_get_transparent_index
-
-+#if defined(GLX_GLXEXT_VERSION) && GLX_GLXEXT_VERSION >= 20190000
-+FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay,
-+ Window, underlay, unsigned long *, transparentIndex,
-+ glXGetTransparentIndexSUN)
-+#else
- FUNCDEF4(int, glXGetTransparentIndexSUN, Display *, dpy, Window, overlay,
- Window, underlay, long *, transparentIndex, glXGetTransparentIndexSUN);
-+#endif
-
-
- // GL functions
More information about the arch-commits
mailing list