gentoo auto-resync : 18:05:2023 - 04:11:16

3 files changed, 75 insertions, 0 deletions

diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 0d808268ddaa..26f349bcdb2c 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -1,5 +1,8 @@
 AUX vulkan-layers-1.3.239-r2-Build-shared-libs.patch 444 BLAKE2B f6db7c8244385560dba4550c63681814ab2cf835364dc3d5e2425d7a3d7ce784822b59b349bb7ef5f1e564d13d118910a87a7e4f1ba8d4c4a42fe940ce002a52 SHA512 e6a3ea885628c3516296118a1489a834ca02400e66430bf5fe6083c6944cf9d2a95aea55f1744d7ed5cfbde08f73ab0d0c6b5feb8e3cff1a55c79e86809666cc
+AUX vulkan-layers-1.3.246-Fix-build.patch 400 BLAKE2B 434dde4545c97fbc0a2a3b7e6b5999ab54288cea80888d07857c6524c9b7a09374da5e0be64ed4c3af71a40a57d9727eb5d2b337dacd1e46e6ef177678677166 SHA512 e6acea418a09af548a9cd9f0ca62e7afad4abca44fe9e04bec4e4319c7cf12f00ef636fcd16b5616664f537f8361c88fd50ab0d9baa09b0409188002b82cca25
 DIST vulkan-layers-1.3.243.tar.gz 4624249 BLAKE2B d358ccf3dbe690d7f30e153271602b4ab14d55a854169fa828a4bc8ffeb688531b4b4703dbe7ea4e038237db650a923ab9f618178a5edf304fc4a3170be57238 SHA512 d2bba9afc2013ccd41953eb699e9568c85f90bb99d1be9866126a8bc18ae492e55970acc2ca4d7b9850b0201b0451acbb5335ea19dcd030dc71d545feb261a19
+DIST vulkan-layers-1.3.246.tar.gz 4750578 BLAKE2B df6c51756231d50866b8a676ae6f62f79ba361155c7c1009fa4e62b921aa4ef7434140ec6ae82ab773e3e01c74b1213175ac2156a8a79adf212760786853aa5e SHA512 2c0f9ed198a1a806e564072057d2d0e42eb8e42ae5fc847399fa5eb8227ef52a0114f47569fa49f0bfbcb210530bea658558fbc27451c972681eb9ee79099c6d
 EBUILD vulkan-layers-1.3.243.ebuild 1571 BLAKE2B bb4d3088696d8d2df94aa9254bdf2a03a1e2ad7dfd0643e24f98470cb91d1a0b06e8afd3ec55489976d58c293e0ee0ff42209f80b4c843828d32fe8ec9d1b0aa SHA512 9160c4b7484a52027fc37b8adfbcfed1d97ca4e666bf50399fa111d0d07eaff501c3f6f0b7c5ef54fb40bd563854ed0fbd7943547cd97cc2923331056d552aae
+EBUILD vulkan-layers-1.3.246.ebuild 1611 BLAKE2B 9032f2432b2e8fa68695c8644db1958152a1846138cfe1c54871b48f6cb02a5546215a5740247b25875f2b49cd8b15d0f7adb09c2780ceb973080763ae15d0c4 SHA512 6d9958819ef9d0db7fb11cb0827f9b627d3cfe2ff707d92cc61a1ecd1100d3544d3b629c36bd95bbfdd3177c685a29cad1ebfb62e21261f20ef7dcbcdf9af534
 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.246-Fix-build.patch b/media-libs/vulkan-layers/files/vulkan-layers-1.3.246-Fix-build.patch
new file mode 100644
index 000000000000..2b9210cbed68
--- /dev/null
+++ b/media-libs/vulkan-layers/files/vulkan-layers-1.3.246-Fix-build.patch
@@ -0,0 +1,12 @@
+diff --git a/layers/external/vma/vk_mem_alloc.h b/layers/external/vma/vk_mem_alloc.h
+index b47bd730c..b3ed1a951 100644
+--- a/layers/external/vma/vk_mem_alloc.h
++++ b/layers/external/vma/vk_mem_alloc.h
+@@ -2580,6 +2580,7 @@ VMA_CALL_PRE void VMA_CALL_POST vmaFreeStatsString(
+ 
+ #include <cstdint>
+ #include <cstdlib>
++#include <cstdio>
+ #include <cstring>
+ #include <utility>
+ #include <type_traits>
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.3.246.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.3.246.ebuild
new file mode 100644
index 000000000000..3b9b94d64bf7
--- /dev/null
+++ b/media-libs/vulkan-layers/vulkan-layers-1.3.246.ebuild
@@ -0,0 +1,60 @@
+# 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}/${PN}-1.3.239-r2-Build-shared-libs.patch
+	${FILESDIR}/${P}-Fix-build.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
+}