libglvnd: update to 1.6.0

libglvnd/.signature

@@ -1,7 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndDP5tsZMphaF20XYRN+vL2jamyBk9h90wcueW5Gyr8hhfMdJ34kEPv9lBm4ot+euWmJ94JcuvQPPgQA1cx3Xdgg=
-SHA256 (Pkgfile) = c02c2651424148b4093492220c04938be13c140eb7e5848f502aa39abaed6439
+RWTSGWF5Q7TndCMt3xvYTTNvxkIn124NqEKSq/wGIOtCpxlg1H1EFLZEQ5XjsoOrMkI7Dw90xIFSdeihYBZZwmzM+GLsl5GhoQo=
+SHA256 (Pkgfile) = 7d1fe92087221873c96912ed38e1e26b978afe1725622bc8f56d1851190784d0
 SHA256 (.footprint) = 07003e941903a50550a5a235ec32d6e1aff2dbe44d9406660a15b4fec7b70680
-SHA256 (libglvnd-1.5.0.tar.gz) = abdf8229c86358f651e35bdc7cfced0fdf67d0a2acdf9197d08a9732ef7b53bc
-SHA256 (fd1df5e9891dec71013a272e7132f1a33e45f5b5.patch) = feea791d9ff07926c2160808223eab676295142616b947607309ca5e9b450a6e
-SHA256 (0001-glx-Add-another-fallback-library-name.patch) = 87565356c31b20e60ded9f17ab76d442dd2cd36bfa4214a0de9699c49106ce43
+SHA256 (libglvnd-1.6.0.tar.gz) = e31dd71441604cf7467397e740af8070caa84133b5ed71241d3d5ca84c950baf

libglvnd/0001-glx-Add-another-fallback-library-name.patch

@@ -1,30 +0,0 @@
-From 24606973bfabd75285fbd489264235167ba0f44c Mon Sep 17 00:00:00 2001
-From: Adam Jackson <ajax@redhat.com>
-Date: Thu, 14 Jun 2018 11:25:21 -0400
-Subject: [PATCH] glx: Add another fallback library name
-
-This is mostly to avoid file conflicts with external packaging.
-
-Signed-off-by: Adam Jackson <ajax@redhat.com>
----
- src/GLX/libglxmapping.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/GLX/libglxmapping.c b/src/GLX/libglxmapping.c
-index be384f8..2016a04 100644
---- a/src/GLX/libglxmapping.c
-+++ b/src/GLX/libglxmapping.c
-@@ -591,6 +591,10 @@ __GLXvendorInfo *__glXLookupVendorByScreen(Display *dpy, const int screen)
-             vendor = __glXLookupVendorByName(FALLBACK_VENDOR_NAME);
-         }
- 
-+        if (!vendor) {
-+            vendor = __glXLookupVendorByName("system");
-+        }
-+
-         dpyInfo->vendors[screen] = vendor;
-     }
-     __glvndPthreadFuncs.rwlock_unlock(&dpyInfo->vendorLock);
--- 
-2.17.0
-

libglvnd/Pkgfile

@@ -4,25 +4,15 @@
 # Depends on: xorg-libxext
 
 name=libglvnd
-version=1.5.0
-release=2
-source=(https://github.com/NVIDIA/$name/archive/v$version/$name-$version.tar.gz
-	https://gitlab.freedesktop.org/glvnd/libglvnd/-/commit/fd1df5e9891dec71013a272e7132f1a33e45f5b5.patch
-	0001-glx-Add-another-fallback-library-name.patch)
+version=1.6.0
+release=1
+source=(https://github.com/NVIDIA/$name/archive/v$version/$name-$version.tar.gz)
 
 build() {
 	## for future references
 	#prt-get isinst xorg-libx11 xorg-libxext xorg-xorgproto && PKGMK_GLVND+=' -D x11=enabled -D glx=enabled'
 	PKGMK_GLVND+=' -D x11=enabled -D glx=enabled'
 
-	# https://src.fedoraproject.org/rpms/libglvnd
-	patch -Np1 -d $name-$version -i $SRC/0001-glx-Add-another-fallback-library-name.patch
-
-	# [PATCH] Update GL headers and XML files.
-	# Update the GL headers and XML files to the Khronos repository, from
-	# commit 11d7b7baebfc2b58116670cd17266f9c6a0d760b.
-	patch -p1 -d $name-$version -i $SRC/fd1df5e9891dec71013a272e7132f1a33e45f5b5.patch
-
 	meson setup $name-$version build $PKGMK_GLVND \
 		--prefix=/usr \
 		--buildtype=plain \