gentoo auto-resync : 29:03:2023 - 21:54:14

4 files changed, 80 insertions, 4 deletions

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 11376f7e331c..86e735d1b9bb 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,7 +1,9 @@
 AUX vulkan-layers-1.3.239-Build-shared-libs.patch 754 BLAKE2B fb86f678b9b2b76642ec3fccdd3068b9f4da2dd55f884fe4adb83b02090adb1c992a2aca853cf7b716a0006f8ff2cb2660070220b54c450f5333d5436c4b93a4 SHA512 d82a8b4ddb542b52a49c6fc83aac5af5b598371df58699838f5c646efcbd10b0ba54dd163e3c223b54f276f2209f942d65d7d32aef42d395a154cfb7aadd5b33
 AUX vulkan-layers-1.3.239-Export-symbols.patch 436 BLAKE2B 0e9f86d8d64844fe42d0e438e2c1e3ae5b53b92acaf3f458ef335904a78fb9c6947dbdbfc6217b87d961ab82b75f46bd7fc0b120afba064a577b7ba5a1619a73 SHA512 ef8a653bb66f8224cf94dfe77ad2988f9b3d53001961998be3567f917db696a5a05ba892365f049837a21aa3831c4d196f7a1c623eeeac27ee6eabd83e81c928
+AUX vulkan-layers-1.3.239-r2-Build-shared-libs.patch 444 BLAKE2B f6db7c8244385560dba4550c63681814ab2cf835364dc3d5e2425d7a3d7ce784822b59b349bb7ef5f1e564d13d118910a87a7e4f1ba8d4c4a42fe940ce002a52 SHA512 e6a3ea885628c3516296118a1489a834ca02400e66430bf5fe6083c6944cf9d2a95aea55f1744d7ed5cfbde08f73ab0d0c6b5feb8e3cff1a55c79e86809666cc
 DIST vulkan-layers-1.3.239.tar.gz 4549587 BLAKE2B b5ac5afade60b048414a336dc130ae2e7c332e1a9e4b86448be9c86f17f7705990b27908721ee2f62e3425f117d3941f47525f8fa0d07e79bc3c68f7e4e48f14 SHA512 4b96951874e5b7c7abbab83b0b85cfe10b13d3ced20148ddcdd9b6e79db5d083b9ee00ae1c3605a72bcea4c3b8f1ab42ed284eb2cbc8f7e98d377108970e884c
 EBUILD vulkan-layers-1.3.239-r1.ebuild 1525 BLAKE2B dfb26d17837db94b629d3f4a024e2dc4893f2a273cce48689befe740aac8cd74c1fc08dbd25745626192d4debb7b0c85f0721a3a22b231bcc7f67609ac437774 SHA512 8ba9fcc8788520716524aceaa9bd98d895d72962e0051b8e169e4e51faf76daf434ddd9f553a62d295ac25878d006a0991773ad7f8141474d264ea436e690ddd
+EBUILD vulkan-layers-1.3.239-r2.ebuild 1566 BLAKE2B 31aeaf8d67513bb479b18536fa5a229f0c13f5528b4a8a4e548127f858e354eea144c38c0546e0a0a11961fdb4c4c2013728e1d45100fb771553dfc90d853ebb SHA512 5c3fe2b9f550438791852ed04cdff9a9b58dd07f1d3c41ec2cd6c0534851674a27c8eb80c48adb789d89f46dd5ce9f7d2f9352ddeb9efbdae676fdb350a307c3
 EBUILD vulkan-layers-1.3.239.ebuild 1479 BLAKE2B 830d065c5956333c011b567ad9910b20a7c847d4eb59afee1f3219495a602a91a023a3e1e8d71b08bf2b0f5990a50b5126e41a5cc8917f2bb6cfcaf40bb9b3c1 SHA512 ecf247f0f9ce12744ba0db4f4bc378ed939a912ceea8341776a7553377d9260de36454c3f60195814e16ac6c20fd6400e7fe24e1a68a0be576ddde2d014caa09
-EBUILD vulkan-layers-9999.ebuild 1545 BLAKE2B f2b26623ef55b877668d064005ca2ed22d608e391ede93d6428a548dbf647137a0fc5c08cc55a101fb917817c9ac3648e8ab44c272952b0cfbd8adf6e3f47ee9 SHA512 2b15a39150ce333f18aa0937143c584fdb92a004d1f153ce58868d2ed8921b2bf97794582d88c8477c8715a78e5cc5f46ddf83d12d00703566884687eb884f4a
+EBUILD vulkan-layers-9999.ebuild 1580 BLAKE2B a8b5007de49a2a4dff79f65f3a9f30414c26122df6953f96719f0a08188158e440bfd3e38a249205080b73fc10c56e7f5ef589f48f23e44d4832121ead0fd2a6 SHA512 5ccd75db840552b627b8fb271283cf19492cf251850b4c78fba94b0e2a9880e2a2083e2248d4874540be5227238a65b96ec78e41760755815563d967e6baca22
 MISC metadata.xml 441 BLAKE2B d2183b70060e05054bd1fa93696ab04b5487fb8cc6b6af72520a47d0490b066c8ecdf10c9717cfaec7463668d7f639cfe8d05e5aa3ad860dbce3f4316122cd02 SHA512 c6c9c42f4cdd6c08cff6259c24ae05fe0755792f77078741e60594cd083a198b5575def4544a85162a7120578416c95b76d4b5847b9b781e16e9b826dcb5d095
diff --git a/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-r2-Build-shared-libs.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-r2-Build-shared-libs.patch
new file mode 100644
index 000000000000..58973fa70e0d
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.239-r2-Build-shared-libs.patch
@@ -0,0 +1,13 @@
+diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt
+index 640ac8471..19caed0ed 100644
+--- a/layers/CMakeLists.txt
++++ b/layers/CMakeLists.txt
+@@ -158,7 +158,7 @@ else()
+     message(NOTICE "VulkanVL_generated_source target requires python 3")
+ endif()
+ 
+-add_library(VkLayer_khronos_validation MODULE)
++add_library(VkLayer_khronos_validation SHARED)
+ 
+ target_sources(VkLayer_khronos_validation PRIVATE
+     generated/best_practices.cpp
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.239-r2.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.239-r2.ebuild
new file mode 100644
index 000000000000..fa2ffd709370
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.239-r2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN=Vulkan-ValidationLayers
+PYTHON_COMPAT=( python3_{9..11} )
+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 ~loong ~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"
+
+RDEPEND="~dev-util/spirv-tools-${PV}:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-cpp/robin-hood-hashing-3.11.5
+	~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}]
+	)
+"
+
+PATCHES="${FILESDIR}/${PF}-Build-shared-libs.patch"
+
+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_WERROR=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DBUILD_TESTS=OFF
+	)
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name \*.a -delete || die
+}
diff --git a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
index 3bdb7b185bb7..fad8788c59bc 100644
--- a/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-9999.ebuild
@@ -37,9 +37,7 @@ DEPEND="${RDEPEND}
 	)
 "
 
-PATCHES="${FILESDIR}/${PN}-1.3.239-Build-shared-libs.patch
-${FILESDIR}/${PN}-1.3.239-Export-symbols.patch
-"
+PATCHES="${FILESDIR}/${PN}-1.3.239-r2-Build-shared-libs.patch"
 
 multilib_src_configure() {
 	local mycmakeargs=(
@@ -55,3 +53,7 @@ multilib_src_configure() {
 	)
 	cmake_src_configure
 }
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name \*.a -delete || die
+}