From 967de252e42c1a32f532f68e166aae615ace0f86 Mon Sep 17 00:00:00 2001
From: kenmays <maybird1776@yahoo.com>
Date: Thu, 25 Nov 2021 22:59:50 -0800
Subject: [PATCH]  vulkan: bump to 1.2.199 (#6432)

---
 ...2.198.patchset => vulkan-1.2.199.patchset} |  9 +------
 ...n-1.2.198.recipe => vulkan-1.2.199.recipe} | 27 +++++++++----------
 2 files changed, 14 insertions(+), 22 deletions(-)
 rename sys-libs/vulkan/patches/{vulkan-1.2.198.patchset => vulkan-1.2.199.patchset} (94%)
 rename sys-libs/vulkan/{vulkan-1.2.198.recipe => vulkan-1.2.199.recipe} (80%)

diff --git a/sys-libs/vulkan/patches/vulkan-1.2.198.patchset b/sys-libs/vulkan/patches/vulkan-1.2.199.patchset
similarity index 94%
rename from sys-libs/vulkan/patches/vulkan-1.2.198.patchset
rename to sys-libs/vulkan/patches/vulkan-1.2.199.patchset
index e93a67442..948f92647 100644
--- a/sys-libs/vulkan/patches/vulkan-1.2.198.patchset
+++ b/sys-libs/vulkan/patches/vulkan-1.2.199.patchset
@@ -1,15 +1,8 @@
-From cbcbd40e3cae480ed98cf966f818926657813c70 Mon Sep 17 00:00:00 2001
+From 7079185366d6b93b92206e8cf9f4be60809d0872 Mon Sep 17 00:00:00 2001
 From: X512 <danger_mail@list.ru>
 Date: Mon, 4 Oct 2021 03:12:53 +0900
 Subject: basic fixes for haiku
 
----
- CMakeLists.txt              | 2 +-
- loader/allocation.h         | 4 ++--
- loader/get_environment.c    | 7 ++++---
- loader/loader.h             | 5 +++--
- loader/vk_loader_platform.h | 6 +++---
- 5 files changed, 13 insertions(+), 11 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index eba079c..7eae8d5 100644
diff --git a/sys-libs/vulkan/vulkan-1.2.198.recipe b/sys-libs/vulkan/vulkan-1.2.199.recipe
similarity index 80%
rename from sys-libs/vulkan/vulkan-1.2.198.recipe
rename to sys-libs/vulkan/vulkan-1.2.199.recipe
index 4ba7530bd..efd2f8df4 100644
--- a/sys-libs/vulkan/vulkan-1.2.198.recipe
+++ b/sys-libs/vulkan/vulkan-1.2.199.recipe
@@ -14,28 +14,31 @@ LICENSE="Apache v2"
 REVISION="1"
 SOURCE_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/v$portVersion.tar.gz"
 SOURCE_FILENAME="Vulkan-Loader-$portVersion.tar.gz"
-CHECKSUM_SHA256="b4a0ec6ce8921f50ab291f1c3a16802cfbe2c3dbd86820eb699bfb98890ad126"
+CHECKSUM_SHA256="cc496f6725c7e088510d1a5e7c6a97b61e356b147dcc3d697233ca775dd768ef"
 SOURCE_DIR="Vulkan-Loader-$portVersion"
 SOURCE_URI_2="https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/v$portVersion.tar.gz"
 SOURCE_FILENAME_2="Vulkan-Headers-$portVersion.tar.gz"
-CHECKSUM_SHA256_2="0b2c69bc392a0022652f65efe5c51ec39ae90ec427065a914ba74ac6c728db30"
+CHECKSUM_SHA256_2="c4b860e267312364aa0b36e457e5ac8c114fe0957f216668c9da9211ef4643d0"
 SOURCE_DIR_2="Vulkan-Headers-$portVersion"
 PATCHES="vulkan-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
 
+libVersion="$portVersion"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
-	vulkan$secondaryArchSuffix = $portVersion compat >= 1
-	lib:libvulkan$secondaryArchSuffix = $portVersion compat >= 1
+	vulkan$secondaryArchSuffix = $portVersion
+	lib:libvulkan$secondaryArchSuffix = libVersionCompat
 	"
 REQUIRES="
 	haiku$secondaryArchSuffix
 	"
 
 PROVIDES_devel="
-	vulkan${secondaryArchSuffix}_devel = $portVersion compat >= 1
-	devel:libvulkan$secondaryArchSuffix = $portVersion compat >= 1
+	vulkan${secondaryArchSuffix}_devel = $portVersion
+	devel:libvulkan$secondaryArchSuffix = libVersionCompat
 	"
 REQUIRES_devel="
 	vulkan$secondaryArchSuffix == $portVersion base
@@ -53,14 +56,11 @@ BUILD_PREREQUIRES="
 	"
 
 defineDebugInfoPackage vulkan$secondaryArchSuffix \
-	"$libDir"/libvulkan.so.$portVersion
+	"$libDir"/libvulkan.so.$libVersion
 
 BUILD()
 {
-	mkdir -p build
-	cd build
-
-	cmake .. \
+	cmake -S . -B build $cmakeDirArgs \
 		-DCMAKE_BUILD_TYPE=RelWithDebInfo \
 		-DCMAKE_INSTALL_PREFIX:PATH=$prefix \
 		-DVULKAN_HEADERS_INSTALL_DIR=$sourceDir2 \
@@ -68,13 +68,12 @@ BUILD()
 		-DFALLBACK_CONFIG_DIRS="/boot/home/config/non-packaged/add-ons:/boot/home/config/add-ons:/boot/system/non-packaged/add-ons:/boot/system/add-ons" \
 		-G Ninja
 
-	ninja
+	ninja -C build
 }
 
 INSTALL()
 {
-	cd build
-	ninja install
+	ninja -C build install
 
 	mkdir -p $dataDir/vulkan/registry
 	cp $sourceDir2/registry/vk.xml $dataDir/vulkan/registry/vk.xml