gentoo resync : 12.05.2022

3 files changed, 70 insertions, 2 deletions

diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 3209ff94e197..39538ab2712b 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,8 +1,10 @@
 DIST vulkan-loader-1.2.198.1.tar.gz 1441540 BLAKE2B c34fe5c0b97ee01038749754eb76b0fa7f1e4b9ad5ee78fa63ed9bf27e49362b215b39fd9fadcc5592097db80f3e655d109d6c92ae97829bdc75f5a28085d234 SHA512 dff0d8d9f6ffe4da6b94d491133c79d8fdbc724577387ae6f1522d7e557e39067ba66de60cc075bc469ad755dbe77d6e6728238a7ab4c07c36cf16964936e641
 DIST vulkan-loader-1.2.198.tar.gz 1440922 BLAKE2B 5048a85155f94cd13f36fae48414ae3a0ea5f120a22f8b199fd43a2813b7168a9c5310ac6298ec2dee6488012d17d06043cf37dee38de265924e408f36498ed7 SHA512 92fc0cfa872e286abe4aa26a68a2bb90683b68425abbe001a62ac511c76850ad08102634e64ac06a88cf8ab225e60ddaf5bc80aa2c4bf68c25c0c47e5782f4fc
 DIST vulkan-loader-1.3.204.tar.gz 1465828 BLAKE2B 92716a01958a851374c037b325f7dcd1f3dcb45c1ee0086102c71424965255a3ce9423ed8c1312023f445050cf112c9312110c2d6f4d43ec9980270eca2bbb67 SHA512 f78778783a4981a2b0b38c651e87358afad5c15d220bd1cb95e907f9afe2a81073b6ee12992c7038d0c8227cadcd7a64c93d21b2155585db3d807982354989d1
+DIST vulkan-loader-1.3.211.tar.gz 1581450 BLAKE2B d7ea8cf54693733d78a0f4d96119c8b693f88f38c1a7664f2dc14b10bee3558fdf32279a51978c2d77a282a33b93ea6e0d6769e9d17345117bc2e048c4645707 SHA512 2c363909b975d3b286f2ac277e7ff8ea26347d7eb1b6bac9580ceba83822978d51e11fdb58e91e103b00b324f67b776f0e5917e781b3278d7edcba4669cbbd6c
 EBUILD vulkan-loader-1.2.198-r1.ebuild 1768 BLAKE2B 0b0369e7612be07e579dfdf9827d43c3c03251be8f0aef04ca6f79f260c89ec645fef83186aa573f830cbb898e58df3a778dc5a7da42c74d3195ce2dd2d24ce8 SHA512 362dcaedd4423ed385e6e03420f11570611abffbb413366ec9aca326783218693f8c9a378b722394f2f00a36196b87e173341f22b3ad6a70390a58c40ce42606
 EBUILD vulkan-loader-1.2.198.ebuild 1760 BLAKE2B 0744e4e484ed2b0c1161e5941f5f0c4ac2f9fa6edfa6ac692ce0935c92cb1d71c5183035fde85abc22b57c3088b74410487a93f0a82ac5441ca0b53f6f47c6b1 SHA512 905a76ff689729fc9f40778d0a007c5729ec2ae54e4d146b14c5f69e00a8df6ffeeaceb307fdde441eff9702b4cfeeccb0f6e8c9ed049f15423ec2164d184fdb
-EBUILD vulkan-loader-1.3.204.ebuild 1762 BLAKE2B 8974c48cc3d535cf8e97fa759a50d3116f036db664344b8fac392f60c144385c6ffbc1ca40b2ea4145c9385890232096815558b69ef82094c9775ffd65ca57f3 SHA512 bcda2e11f00a4198867eef6190603c5e4cbed54dc1c990df24d3a6c4a8efa8672a3a0533b2aa40a75a7ca3b31ab5c31757f21aeb52a7e75529541bf726c32086
+EBUILD vulkan-loader-1.3.204.ebuild 1756 BLAKE2B 96d71d10ebb9a26f1594f10c1d6c0d667b49ae27ac06ff84cb34c729005229afac23f7665b4ba7d233412de7753edcf7238522cd316d40d9955d03808393d079 SHA512 e1ec1f2da7bcaffd0541139db2f526e63a2cbde079e40eabe12ccf41144f99a925f80f3151a5544137d11c4710b6c18aaabe72169f5b803d1175cbf55f80ab25
+EBUILD vulkan-loader-1.3.211.ebuild 1742 BLAKE2B 68ac5fdddd022f0c75bd25ddb3c4db4bf1a675d787fa5a6903af584521f334bd8edb819905947af9af651382efd580ceb8519b78e5cc8a893272067e34d1ecc8 SHA512 e6bcb7cb53d23e7c26edb845df106c0dbc739f5140c093df562cb1adc666df6650023397589828958dd431e08a8b9830329fe53e74957b771d8007c567c01909
 EBUILD vulkan-loader-9999.ebuild 1766 BLAKE2B 49c51cbe49671126cb244fc0b91d7c44b431817462ba7a4ac7d36110308fa002fe83f3b26058c88407b812ab2404f8b392fcd88dcf6119686ae5835312c6a147 SHA512 133dec0c07c43dad42e5719171c54939b6850249321a994c67891f6797e0adc6f78ad434bb31b8004789a971c1fe2cea844983663915eaa4dc23a63d4c64b888
 MISC metadata.xml 520 BLAKE2B 5f5add8ab6dcec0fec9ffd20f5dbfababeff0a441855c641e1791727c4dd1c9eb17cebee79b9c4c325c355b1efc91b25f0c6246d11b010dde2109e38d9df6178 SHA512 4274ba14bdeddfe766c7394cbbb44c52aa4726f096ef2567e427fff6a710fe3de23466cb742f40162f4c2890f3a3a62e326364e45680ac1b8a0bca47db0e6e34
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.204.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.204.ebuild
index ce4d1ef79739..758e14eb4eba 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.3.204.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.3.204.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
 	S="${WORKDIR}"/${MY_PN}-sdk-${PV}
 fi
 
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.3.211.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.3.211.ebuild
new file mode 100644
index 000000000000..2ab60aca789d
--- /dev/null
+++ b/media-libs/vulkan-loader/vulkan-loader-1.3.211.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=Vulkan-Loader
+CMAKE_ECLASS="cmake"
+inherit flag-o-matic cmake-multilib toolchain-funcs
+
+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}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-sdk-${PV}
+fi
+
+DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader"
+HOMEPAGE="https://github.com/KhronosGroup/Vulkan-Loader"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="layers wayland X"
+
+BDEPEND=">=dev-util/cmake-3.10.2"
+DEPEND="
+	~dev-util/vulkan-headers-${PV}
+	wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] )
+	X? (
+		x11-libs/libX11:=[${MULTILIB_USEDEP}]
+		x11-libs/libXrandr:=[${MULTILIB_USEDEP}]
+	)
+"
+PDEPEND="layers? ( media-libs/vulkan-layers:=[${MULTILIB_USEDEP}] )"
+
+multilib_src_configure() {
+	# Integrated clang assembler doesn't work with x86 - Bug #698164
+	if tc-is-clang && [[ ${ABI} == x86 ]]; then
+		append-cflags -fno-integrated-as
+	fi
+
+	local mycmakeargs=(
+		-DCMAKE_C_FLAGS="${CFLAGS} -DNDEBUG"
+		-DCMAKE_CXX_FLAGS="${CXXFLAGS} -DNDEBUG"
+		-DCMAKE_SKIP_RPATH=ON
+		-DBUILD_TESTS=OFF
+		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
+		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
+		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
+	)
+	cmake_src_configure
+}
+
+multilib_src_install() {
+	keepdir /etc/vulkan/icd.d
+
+	cmake_src_install
+}
+
+pkg_postinst() {
+	einfo "USE=demos has been dropped as per upstream packaging"
+	einfo "vulkaninfo is now available in the dev-util/vulkan-tools package"
+}