Re: [PR PATCH] [Updated] Vulkan update

[tibequadorian <tibequadorian@users.noreply.github.com>]

[-- Attachment #1: Type: text/plain, Size: 1307 bytes --]

There is an updated pull request by tibequadorian against master on the void-packages repository

https://github.com/tibequadorian/void-packages vulkan-update
https://github.com/void-linux/void-packages/pull/35431

Vulkan update
<!-- Uncomment relevant sections and delete options which are not applicable -->

closes #35185 

#### Testing the changes
- I tested the changes in this PR: **briefly**

`vkcube` works and I played CS:GO with the `-vulkan` option.

<!--
#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please [skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration)
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!-- 
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/35431.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-vulkan-update-35431.patch --]
[-- Type: text/x-diff, Size: 11544 bytes --]

From f3765a671f8899966946aac3b903b84215ffda57 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 21:50:38 +0100
Subject: [PATCH 1/7] New package: robin-hood-hashing-3.11.5

---
 srcpkgs/robin-hood-hashing/template | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 srcpkgs/robin-hood-hashing/template

diff --git a/srcpkgs/robin-hood-hashing/template b/srcpkgs/robin-hood-hashing/template
new file mode 100644
index 000000000000..63a9db6c3f89
--- /dev/null
+++ b/srcpkgs/robin-hood-hashing/template
@@ -0,0 +1,16 @@
+# Template file for 'robin-hood-hashing'
+pkgname=robin-hood-hashing
+version=3.11.5
+revision=1
+build_style=cmake
+configure_args=" -DRH_STANDALONE_PROJECT=OFF"
+short_desc="Fast & memory efficient hashtable based on robin hood hashing for C++"
+maintainer="tibequadorian <tibequadorian@posteo.de>"
+license="MIT"
+homepage="https://github.com/martinus/robin-hood-hashing"
+distfiles="https://github.com/martinus/robin-hood-hashing/archive/${version}.tar.gz"
+checksum=3693e44dda569e9a8b87ce8263f7477b23af448a3c3600c8ab9004fe79c20ad0
+
+post_install() {
+	vlicense LICENSE
+}

From 54aea2605eed836fdb300928d9627b33d3d58ff4 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:15 +0100
Subject: [PATCH 2/7] SPIRV-Tools: update to 2022.1.

---
 srcpkgs/SPIRV-Tools/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/SPIRV-Tools/template b/srcpkgs/SPIRV-Tools/template
index 70d13dfb6da5..7a0e2e6d2646 100644
--- a/srcpkgs/SPIRV-Tools/template
+++ b/srcpkgs/SPIRV-Tools/template
@@ -1,6 +1,6 @@
 # Template file for 'SPIRV-Tools'
 pkgname=SPIRV-Tools
-version=2020.6
+version=2022.1
 revision=1
 build_style=cmake
 configure_args="-DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF
@@ -12,7 +12,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://github.com/KhronosGroup/SPIRV-Tools"
 distfiles="https://github.com/KhronosGroup/SPIRV-Tools/archive/v${version}.tar.gz"
-checksum=de2392682df8def7ac666a2a320cd475751badf4790b01c7391b7644ecb550a3
+checksum=844c0f590a0ab9237cec947e27cfc75bd14f39a68fc3b37d8f1b9e1b21490a58
 
 SPIRV-Tools-devel_package() {
 	depends="SPIRV-Tools-${version}_${revision}"

From 4faad1fbed81c6bb43b6bb5ddf8ebe9ba44fa48d Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:22 +0100
Subject: [PATCH 3/7] SPIRV-Headers: update to 1.3.204.0.

---
 srcpkgs/SPIRV-Headers/template | 8 +++++---
 srcpkgs/SPIRV-Headers/update   | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)
 create mode 100644 srcpkgs/SPIRV-Headers/update

diff --git a/srcpkgs/SPIRV-Headers/template b/srcpkgs/SPIRV-Headers/template
index 5dcf457c04c7..93b636e0b86b 100644
--- a/srcpkgs/SPIRV-Headers/template
+++ b/srcpkgs/SPIRV-Headers/template
@@ -1,11 +1,13 @@
 # Template file for 'SPIRV-Headers'
 pkgname=SPIRV-Headers
-version=1.5.4.raytracing.fixed
+reverts="1.5.4.raytracing.fixed_1 1.5.3_2 1.5.3_1 1.5.1_1 1.4.1_1"
+version=1.3.204.0
 revision=1
+wrksrc="SPIRV-Headers-sdk-${version}"
 build_style=cmake
 short_desc="Machine-readable files for the SPIR-V Registry"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://github.com/KhronosGroup/SPIRV-Headers"
-distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/${version}.tar.gz"
-checksum=df2ad2520be4d95a479fa248921065885bbf435a658349a7fc164ad7b26b68c6
+distfiles="https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-${version}.tar.gz"
+checksum=519d09906dcdd4bf27089ff136d4e8c70abe2915bbde17a1d5ac18c5de6aee67
diff --git a/srcpkgs/SPIRV-Headers/update b/srcpkgs/SPIRV-Headers/update
new file mode 100644
index 000000000000..2fa65238787a
--- /dev/null
+++ b/srcpkgs/SPIRV-Headers/update
@@ -0,0 +1 @@
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"

From 4d5085493fe797507cc416478bd95caa76c0943a Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:32 +0100
Subject: [PATCH 4/7] Vulkan-Headers: update to 1.3.204.0.

---
 srcpkgs/Vulkan-Headers/template | 9 +++++----
 srcpkgs/Vulkan-Headers/update   | 3 +--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/Vulkan-Headers/template b/srcpkgs/Vulkan-Headers/template
index d619f96e2362..f73c97773551 100644
--- a/srcpkgs/Vulkan-Headers/template
+++ b/srcpkgs/Vulkan-Headers/template
@@ -1,11 +1,12 @@
 # Template file for 'Vulkan-Headers'
 pkgname=Vulkan-Headers
-version=1.2.182
+version=1.3.204.0
 revision=1
+wrksrc="Vulkan-Headers-sdk-${version}"
 build_style=cmake
 short_desc="Vulkan header files"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/Vulkan-Headers/archive/v${version}.tar.gz"
-checksum=38d1c953de7bb2d839556226851feeb690f0d23bc22ac46c823dcb66c97bfdc8
+distfiles="https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-${version}.tar.gz"
+checksum=5c3fcfc5dc1daa5fa1f3a0983fdcb344848f846ae34d933412d13456ebee10c1
diff --git a/srcpkgs/Vulkan-Headers/update b/srcpkgs/Vulkan-Headers/update
index 995551ef357b..2fa65238787a 100644
--- a/srcpkgs/Vulkan-Headers/update
+++ b/srcpkgs/Vulkan-Headers/update
@@ -1,2 +1 @@
-pkgname=sdk
-pattern="/$pkgname-\K[0-9.]+(?=.tar.gz)"
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"

From e4ec5614533f0638cd9e83300336b93a252aa5c3 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:35 +0100
Subject: [PATCH 5/7] Vulkan-Tools: update to 1.3.204.0.

---
 srcpkgs/Vulkan-Tools/template | 12 ++++++------
 srcpkgs/Vulkan-Tools/update   |  3 +--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/Vulkan-Tools/template b/srcpkgs/Vulkan-Tools/template
index 8d5c74629cb8..5979904395c2 100644
--- a/srcpkgs/Vulkan-Tools/template
+++ b/srcpkgs/Vulkan-Tools/template
@@ -1,20 +1,20 @@
 # Template file for 'Vulkan-Tools'
 pkgname=Vulkan-Tools
-version=1.2.182
+version=1.3.204.0
 revision=1
-wrksrc="${pkgname}-${version}"
+wrksrc="Vulkan-Tools-sdk-${version}"
 build_style=cmake
 configure_args="-DGLSLANG_INSTALL_DIR=/usr -DBUILD_CUBE=$(vopt_if cube ON OFF)
  -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -Wno-dev"
 hostmakedepends="python3 pkg-config $(vopt_if cube glslang)"
 makedepends="Vulkan-Headers vulkan-loader libxcb-devel libxkbcommon-devel
- wayland-devel libXrandr-devel"
+ wayland-devel wayland-protocols libXrandr-devel"
 short_desc="Official Vulkan tools and utilities"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/Vulkan-Tools/archive/v${version}.tar.gz"
-checksum=50c959851230d1daba20235167faced7b7686ebe5d9e626dfb1fe5c92fa30b9e
+distfiles="https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-${version}.tar.gz"
+checksum=672ae9c67d276090542cddf6110f00e3ec187db8fb4a0f3aee634e9619a2afc6
 
 build_options="cube"
 desc_option_cube="Build cube vulkan demo"
diff --git a/srcpkgs/Vulkan-Tools/update b/srcpkgs/Vulkan-Tools/update
index 75a4ad43aa6d..2fa65238787a 100644
--- a/srcpkgs/Vulkan-Tools/update
+++ b/srcpkgs/Vulkan-Tools/update
@@ -1,2 +1 @@
-site=https://github.com/KhronosGroup/Vulkan-Tools/releases
-pkgname=sdk
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"

From 2847acb15b1982634fe6ca1107704473d23be4a7 Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:41 +0100
Subject: [PATCH 6/7] Vulkan-ValidationLayers: update to 1.3.204.0.

---
 srcpkgs/Vulkan-ValidationLayers/template | 14 +++++++-------
 srcpkgs/Vulkan-ValidationLayers/update   |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 srcpkgs/Vulkan-ValidationLayers/update

diff --git a/srcpkgs/Vulkan-ValidationLayers/template b/srcpkgs/Vulkan-ValidationLayers/template
index d89eb414b126..ccd756522f58 100644
--- a/srcpkgs/Vulkan-ValidationLayers/template
+++ b/srcpkgs/Vulkan-ValidationLayers/template
@@ -1,16 +1,16 @@
 # Template file for 'Vulkan-ValidationLayers'
 pkgname=Vulkan-ValidationLayers
-version=1.2.162
+version=1.3.204.0
 revision=1
+wrksrc="Vulkan-ValidationLayers-sdk-${version}"
 build_style=cmake
-configure_args="-Wno-dev -DSPIRV_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
- -DGLSLANG_INSTALL_DIR=${XBPS_CROSS_BASE}/usr -DBUILD_LAYER_SUPPORT_FILES=ON"
+configure_args="-Wno-dev -DBUILD_LAYER_SUPPORT_FILES=ON"
 hostmakedepends="pkg-config"
 makedepends="Vulkan-Headers libXrandr-devel wayland-devel glslang-devel
- SPIRV-Tools-devel SPIRV-Headers"
+ SPIRV-Tools-devel SPIRV-Headers robin-hood-hashing"
 short_desc="Khronos official Vulkan validation layers"
-maintainer="Colin Gillespie <colin@breavyn.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/${pkgname}/archive/v${version}.tar.gz"
-checksum=83619b81a86e733383a71ea54f0f5e64e194bf596ee8ec4e36217bb0b29b8917
+distfiles="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-${version}.tar.gz"
+checksum=82b59c4622e9d1dbe267c4651bb2514b6b89bee90e512ae7d1d7abc76c833a1d
diff --git a/srcpkgs/Vulkan-ValidationLayers/update b/srcpkgs/Vulkan-ValidationLayers/update
new file mode 100644
index 000000000000..2fa65238787a
--- /dev/null
+++ b/srcpkgs/Vulkan-ValidationLayers/update
@@ -0,0 +1 @@
+pattern="/sdk-\K[0-9.]+(?=.tar.gz)"

From 5f39f3757a0a19b90d41e4055c330a3a133dff4c Mon Sep 17 00:00:00 2001
From: tibequadorian <tibequadorian@posteo.de>
Date: Thu, 17 Feb 2022 22:14:46 +0100
Subject: [PATCH 7/7] vulkan-loader: update to 1.3.204.0.

---
 srcpkgs/vulkan-loader/template | 10 +++++-----
 srcpkgs/vulkan-loader/update   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/srcpkgs/vulkan-loader/template b/srcpkgs/vulkan-loader/template
index 383d90ddd350..606367a93991 100644
--- a/srcpkgs/vulkan-loader/template
+++ b/srcpkgs/vulkan-loader/template
@@ -1,8 +1,8 @@
 # Template file for 'vulkan-loader'
 pkgname=vulkan-loader
-version=1.2.182
+version=1.3.204.0
 revision=1
-wrksrc="Vulkan-Loader-${version}"
+wrksrc="Vulkan-Loader-sdk-${version}"
 build_style=cmake
 configure_args="-Wno-dev -DVULKAN_HEADERS_INSTALL_DIR=${XBPS_CROSS_BASE}/usr
  -DBUILD_TESTS=OFF"
@@ -10,8 +10,8 @@ hostmakedepends="python3 pkg-config"
 makedepends="Vulkan-Headers libxcb-devel libxkbcommon-devel wayland-devel
  libXrandr-devel"
 short_desc="Vulkan Installable Client Driver (ICD) loader"
-maintainer="Arvin Ignaci <arvin.ignaci@gmail.com>"
+maintainer="Orphaned <orphan@voidlinux.org>"
 license="Apache-2.0"
 homepage="https://www.khronos.org/vulkan/"
-distfiles="https://github.com/KhronosGroup/Vulkan-Loader/archive/v${version}.tar.gz"
-checksum=0d1f9fde9d21642526e9baa55d30364c95035c4fe3c6db96836631991b44dd90
+distfiles="https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-${version}.tar.gz"
+checksum=7e9700f454007ea6f1e6eb097a905e7c30ad2be740ddd9e76235658c98db2ddd
diff --git a/srcpkgs/vulkan-loader/update b/srcpkgs/vulkan-loader/update
index 46acb07cbe81..c21c479d0e53 100644
--- a/srcpkgs/vulkan-loader/update
+++ b/srcpkgs/vulkan-loader/update
@@ -1,3 +1,3 @@
 _pkgname=Vulkan-Loader
-site="https://github.com/KhronosGroup/${_pkgname}/releases"
+site="https://github.com/KhronosGroup/${_pkgname}/tags"
 pattern="/releases/tag/sdk-\K\d.\d.\d+.\d(?=)"