gentoo resync : 29.12.2022

7 files changed, 9 insertions, 192 deletions

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index a58291325d91..b15a5bfc2ece 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,10 +1,6 @@
-AUX vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch 1068 BLAKE2B 4a91aa7fbebf2707c34dc228d6ba81989c07fefb1386b8293f6d7707be7c76ad1abb96b0e9ac7cf6830ba60de97bf32fdeb94fa3432440fdeeee2e7d57bd24a0 SHA512 7ccd1380dc2796a6b671014be0af40d2591cefb4e04c8260e924ebbfafbc336b3a8f3fde4a238a6bf013b6528e5aadbcef208a8fa4ad8042803e9366b999aefc
-AUX vulkan-layers-1.3.204-Fix-dependency-detection.patch 3923 BLAKE2B 7c07fb98dd07855e38d52b5af7fa557f722b83e6afa1c22bba027f2ffd6d6fee71dd27e4782b40d5e62734e7b913e332dfbf2d01b69eaad1a563337f9ac5df19 SHA512 4d4323acac168e5d9ea2b530c69400e980278bf5ec4450dcb2ff865c9714e02646ce90918dc4aa2f9dda932e46e3ff90c1639e4507ce5bf498a512b26f6b0417
-DIST vulkan-layers-1.2.198.tar.gz 3555293 BLAKE2B 1a419b1b4b50241f6f4225a8666b8f6f4fc00e30dba045deeca709f4b9ff777f8a66691ef094b72cbf059c9dafee9f1ad2986108e48c8ef3974ac805c103644e SHA512 c5ac3e458987f3aa8ca21a79aa7819fbc1ca6013b6e445a82407ac0664884b90b8f79a2593368f6264a509674aa1f9584614c7c464c88d74284601f0c7636ef0
-DIST vulkan-layers-1.3.204.tar.gz 3662632 BLAKE2B 277ab312fa8b127fadb2df37933b7eaf11b6ff5dc40246fb35c7e5d35f7d80b17bdc55e5a5686b5222500f416f462be06a3991bf786100bf0fc1af57be569a6f SHA512 9f0649d2e3eccd52a093b4d9c3446d7f05ad4938a6950042fc2c3cf05f6ca2f513706385fc39cf4559344a4770fcc4375306904a233d0edd48b6eff5f17f1b0f
 DIST vulkan-layers-1.3.211.tar.gz 3967709 BLAKE2B f86ff0fa053e0138a0bbdbec30e2fe0a59cfc24f43fe787b007ae352db81a700442d777637e1fc577332a47f36bc09383dd29416b5170fcf5d735562b6a58230 SHA512 e494ba793064f0d32fbdeaddaa01dcd730a36a5c793625bb4671a4e8067364171416ec8fb7361f946cc5d5e8dc16d58e2194c3eb5d3a57d58f4ace2e7ed34f5f
-EBUILD vulkan-layers-1.2.198-r1.ebuild 1602 BLAKE2B 8eacbcfd0c71f721bfcefd5487570635c2113067104c3ef97cfe448a2ba4bec2a8c17fc162603060dce5ee83c1cc08f08cb59435c0cb97ac3c6e1d00d0bc187d SHA512 313a2f169ce77b408715cf6f6122d6856d5cff491f5160e8d594337ed21e94e3f314b635de00beecbb228a68020591a633b93c707e879a4abc3e600c923b70aa
-EBUILD vulkan-layers-1.3.204.ebuild 1625 BLAKE2B 185afc830eea2ef233b17f445dac3f800b7b48bd30608589f693af0bbcf07b68ea43520566f12b116e48395f3539fe20f561f07b3585b05fa199e518d187d832 SHA512 993ab073216fb6086e61373244093a69857d67ec909df5c234f574fea73ea0474a75e2aa21d78f5c86f834b3175963485687877298d9f89f7441661ff94b1365
-EBUILD vulkan-layers-1.3.211.ebuild 1515 BLAKE2B 9bd2188639f752c469053660fa149254708045c879e696c02750817483411ec58b46121988911a51a9aca38f49c1a9959f3539056b7b2b73dd222edd800bfc99 SHA512 0f3cc41164869c868fe38b69703a9731ce60ff3a206ce1505a0f3e24c059df0e8d29af6a996b4efd31f099532bab2331f87b4303b6c312d569912b2350fd4b0c
-EBUILD vulkan-layers-9999.ebuild 1580 BLAKE2B 03665b8beed8a159df389fd81393541088511469fe9305495d6e1a5a9bebfe2e3649f4d2caa2ff4a1f83e8899ad00fde7e0895818d7803844cf27b5c51e131d1 SHA512 7a624fe100dc6a7bff7155a73b9faba422eb2ad83eee4a3d4924432e838ec95e7251ef73f0f12a3fdbee30b762a3b455a3687c3e2d6edeed99ee2e89a916fd2f
+DIST vulkan-layers-1.3.216.tar.gz 4036109 BLAKE2B 03772c0c34fb531366ad3f0e5610c21af013ed05b50f37eee20220385f3525f5a3ae0fcca5ab28b1cc0650057faf7a22db3f17b22187e09ddad7bd8425903ce4 SHA512 c3e3f44ddec4a440c759a5773cf8cabdb79e35152fd912b75ba7ef80126184fab7d0cd93e55e6f0a1b3fa5379295bf60dd21cbba97b3c24e753cd7b6ccb78f72
+EBUILD vulkan-layers-1.3.211.ebuild 1516 BLAKE2B a35ff1d9040ff0590fff177803333305d4e9eb8d900122f6905fab780ecc3c16384a552db5573e2409bdb95aba2537e7656c376672d2a3f1eed54efb5ec4d7ef SHA512 717cbd44b55ce4db5f04353c3812635548550584ffe33cc4e7fed30351be1e1b17f1383cff2793b45e3e1caf1356aa145bdfa2c1955a338bb7f5ba38541c584d
+EBUILD vulkan-layers-1.3.216.ebuild 1522 BLAKE2B fcd5d4961c8ad3f31c662d2fb88e550f060bae941181a6f1cd8b1842757cd1ecea13a0e30c7442ef00435fba5c5b6fd1c7b2c342e0e93c5c400c2f9ae3ec89d3 SHA512 ea42f13ab4a600b9b66e4f879cf4b6d646b52ce37981c9e249654d5d2ccf95676e539ffbbd2e8bccede4cea052263cae288c1b445494109807113e82a3a451b2
+EBUILD vulkan-layers-9999.ebuild 1587 BLAKE2B 6b75f50a21271f2fcf704616f35c5d8e07991cc3c14fd45bcc69d365ca90295a971f53be4479d8a75aeec06186760e8bfeda8ec30dac87e23bfabd3afc81b434 SHA512 143e71edcc9eb2fa307967b2739517925b1037f29c52bc77f1efd0536b4d78fa34dfdc6855da8fcbe9574610b8778e23edab04a6419e723395fced26a2dafb8e
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch
deleted file mode 100644
index 791ac6764bce..000000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Dont-use-static-spirv-tools.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 68f030f9e776d1f2549e471f40c9794f6056bb05 Mon Sep 17 00:00:00 2001
-From: Nick Sarnie <sarnex@gentoo.org>
-Date: Sat, 19 Feb 2022 20:41:44 -0500
-Subject: [PATCH] Dont use static spirv-tools
-
-Signed-off-by: Nick Sarnie <sarnex@gentoo.org>
----
- layers/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
-index 59e294a07..5d30a9834 100644
---- a/layers/CMakeLists.txt
-+++ b/layers/CMakeLists.txt
-@@ -310,7 +310,7 @@ if(BUILD_LAYERS)
-         target_include_directories(VkLayer_khronos_validation PRIVATE ${ROBIN_HOOD_HASHING_INCLUDE_DIR})
-     endif()
-     target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
--    target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt)
-+    target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools SPIRV-Tools-opt)
- 
- 
-     # The output file needs Unix "/" separators or Windows "\" separators On top of that, Windows separators actually need to be doubled
-
--- 
-2.35.1
-
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Fix-dependency-detection.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Fix-dependency-detection.patch
deleted file mode 100644
index 25f3b4bafd27..000000000000
--- a/media-libs/vulkan-layers/files/vulkan-layers-1.3.204-Fix-dependency-detection.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-From 534810e26e0be782b2c702a97bf726af250b8cd6 Mon Sep 17 00:00:00 2001
-From: Jeremy Gebben <jeremyg@lunarg.com>
-Date: Thu, 17 Feb 2022 15:26:25 -0700
-Subject: [PATCH] build: Handle many permutations of SPIRV-Headers locations
-
-If the SPIRV-Headers package is not found, fall back to looking for
-headers in SPIRV_HEADERS_INSTALL_DIR or SPIRV_HEADERS_INCLUDE_DIR.
-
-Fixes #3765
----
- CMakeLists.txt        | 19 ++++++++++++++++---
- layers/CMakeLists.txt |  7 +------
- tests/CMakeLists.txt  |  6 +++---
- 3 files changed, 20 insertions(+), 12 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d4ca786ca07..58a966f03d6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -256,10 +256,23 @@ if (USE_ROBIN_HOOD_HASHING)
-     endif()
- endif()
- 
--set(SPIRV_HEADERS_INCLUDE_DIR "" CACHE STRING "")
- if(BUILD_LAYERS OR BUILD_TESTS)
--    if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "")
--        find_package(SPIRV-Headers REQUIRED CONFIG)
-+    find_package(SPIRV-Headers CONFIG QUIET)
-+    if(SPIRV-Headers_FOUND)
-+	# pefer the package if found. Note that if SPIRV_HEADERS_INSTALL_DIR points at an 'installed'
-+	# version of SPIRV-Headers, the package will be found.
-+	get_target_property(SPIRV_HEADERS_INCLUDE_DIR SPIRV-Headers::SPIRV-Headers INTERFACE_INCLUDE_DIRECTORIES)
-+    elseif(SPIRV_HEADERS_INCLUDE_DIR)
-+	# This is set by SPIRV-Tools (in parent scope!) and also some packages that include VVL with add_subdirectory
-+	if (NOT EXISTS "${SPIRV_HEADERS_INCLUDE_DIR}/spirv/unified1/spirv.h")
-+	    message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INCLUDE_DIR: ${SPIRV_HEADERS_INCLUDE_DIR}")
-+        endif()
-+    elseif(SPIRV_HEADERS_INSTALL_DIR)
-+        # This is our official variable for setting SPIRV-Headers location, but pointing at the raw source of SPIRV-Headers
-+	if (NOT EXISTS "${SPIRV_HEADERS_INSTALL_DIR}/include/spirv/unified1/spirv.h")
-+	    message(FATAL_ERROR "Cannot find SPIRV-Headers from SPIRV_HEADERS_INSTALL_DIR: ${SPIRV_HEADERS_INSTALL_DIR}")
-+        endif()
-+	set(SPIRV_HEADERS_INCLUDE_DIR "${SPIRV_HEADERS_INSTALL_DIR}/include")
-     endif()
- endif()
- 
-diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
-index 6edcf6eb5ab..59e294a0793 100644
---- a/layers/CMakeLists.txt
-+++ b/layers/CMakeLists.txt
-@@ -309,12 +309,7 @@ if(BUILD_LAYERS)
-     if (USE_ROBIN_HOOD_HASHING)
-         target_include_directories(VkLayer_khronos_validation PRIVATE ${ROBIN_HOOD_HASHING_INCLUDE_DIR})
-     endif()
--    if (SPIRV_HEADERS_INCLUDE_DIR STREQUAL "")
--        target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Headers::SPIRV-Headers)
--    else()
--        target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
--    endif()
--
-+    target_include_directories(VkLayer_khronos_validation PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
-     target_link_libraries(VkLayer_khronos_validation PRIVATE SPIRV-Tools-static SPIRV-Tools-opt)
- 
- 
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 2b98d109b7f..780c0538486 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -1,6 +1,6 @@
- # ~~~
--# Copyright (c) 2014-2021 Valve Corporation
--# Copyright (c) 2014-2021 LunarG, Inc.
-+# Copyright (c) 2014-2022 Valve Corporation
-+# Copyright (c) 2014-2022 LunarG, Inc.
- #
- # Licensed under the Apache License, Version 2.0 (the "License");
- # you may not use this file except in compliance with the License.
-@@ -149,11 +149,11 @@ if (NOT MSVC)
-     target_compile_options(vk_layer_validation_tests PRIVATE "-Wno-sign-compare")
- endif()
- 
-+target_include_directories(vk_layer_validation_tests PRIVATE ${SPIRV_HEADERS_INCLUDE_DIR})
- # Specify target_link_libraries
- target_link_libraries(vk_layer_validation_tests
-                       PRIVATE VkLayer_utils
-                               ${GLSLANG_LIBRARIES}
--			      SPIRV-Headers::SPIRV-Headers
- 			      SPIRV-Tools-static SPIRV-Tools-opt
- 			      GTest::gtest GTest::gtest_main)
- 
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild
deleted file mode 100644
index e7998585382d..000000000000
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.198-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN=Vulkan-ValidationLayers
-CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{8,9} )
-inherit cmake-multilib python-any-r1
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
-	EGIT_SUBMODULES=()
-	inherit git-r3
-else
-	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
-fi
-
-DESCRIPTION="Vulkan Validation Layers"
-HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="wayland X"
-
-BDEPEND=">=dev-util/cmake-3.10.2"
-RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-cpp/robin-hood-hashing
-	~dev-util/glslang-${PV}:=[${MULTILIB_USEDEP}]
-	~dev-util/vulkan-headers-${PV}
-	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
-	X? (
-		x11-libs/libX11:=[${MULTILIB_USEDEP}]
-		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
-	)
-"
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
-		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
-		-DCMAKE_SKIP_RPATH=ON
-		-DBUILD_LAYER_SUPPORT_FILES=ON
-		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
-		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
-		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DBUILD_TESTS=OFF
-		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
-		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/"
-		-DSPIRV_HEADERS_INSTALL_DIR="${ESYSROOT}/usr/include/spirv"
-	)
-	cmake_src_configure
-}
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.211.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.211.ebuild
index 71a5b3ebe001..184ab1935455 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.211.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.211.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.216.ebuild
index 9ae97ee6a3f7..f1b3923e1bd1 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.3.204.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.216.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN=Vulkan-ValidationLayers
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
@@ -14,18 +14,13 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi
 
 DESCRIPTION="Vulkan Validation Layers"
 HOMEPAGE="https://github.com/KhronosGroup/Vulkan-ValidationLayers"
 
-PATCHES=(
-	"${FILESDIR}"/${P}-Fix-dependency-detection.patch
-	"${FILESDIR}"/${P}-Dont-use-static-spirv-tools.patch
-)
-
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="wayland X"
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index ced265c1f55b..83b3fca4460a 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN=Vulkan-ValidationLayers
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.0.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}.0
 fi