gentoo resync : 12.05.2022

5 files changed, 140 insertions, 2 deletions

diff --git a/dev-util/spirv-tools/Manifest b/dev-util/spirv-tools/Manifest
index 40c6d84257a5..7ccd590facf7 100644
--- a/dev-util/spirv-tools/Manifest
+++ b/dev-util/spirv-tools/Manifest
@@ -1,6 +1,10 @@
+AUX spirv-tools-1.3.211-cmake-librt.patch 1611 BLAKE2B 1199d25a4933f0d16875f9d8595ba158d84e5cbd6dadf19349667824da4d9931b6d83b9a571242c323868d5bc369f300f9ee2698da5aa65b764ed0c380fc060b SHA512 18935d1f2b520924a607bea05b4a37b371d908ebe317637fcf3d134ee7986aae1be3a8840b6ec674d9cb3dca932bc0896077b7b0660d5b3c016628cd94a7b0c5
 DIST spirv-tools-1.2.198.tar.gz 2888894 BLAKE2B 036f2457863c1bff47939d6238d6f270baee67253edeb5dc4cb1270eb32b9fdb6427c959bde4c5496056784c0334922276b9a4e0ac5530a4c662abdf0190f119 SHA512 90a53d0c7c6dfeb5ef2ee3e8b92c00cd39211f18f57aaeae079ac95b94ec4c839443017eb39fbee0f737d0c070ed64e2369609e81dba149f08676724b254f714
 DIST spirv-tools-1.3.204.tar.gz 2905656 BLAKE2B 9bea5d91243283a0a167913fe531f0778915c03ec4db3f152d88f0952aa0df0e92bfa57762876c61277fedf99f156bdacbbd934333afb8376555a96566edb81e SHA512 f71738d5494c1e7bc38aeb8b2c89dcf24bb14eb6fcac1b14a794d47427ffadffc8e2b7b793b234e7146847744975a5d20de18043447a50a31af305e8ce4b1214
+DIST spirv-tools-1.3.211.tar.gz 2995491 BLAKE2B 545457d097d1e00720a3f97c1f2ed0f27c7b8b6e799ac22c6adbbed7fed17edee27e13c04848db70ee08ac3319ed9a322e22a9288184651f8aa4c03df0ab4057 SHA512 df7de69779baa7ea2269cb4c9813a7d8026763f7d4f7408ea5c160ca7bd670e46e75dcbf9d99ca5f1619f37f504e695d151ede5d5cd0ef675a8898bb297c5842
 EBUILD spirv-tools-1.2.198.ebuild 1234 BLAKE2B c24dd15b41ef53e246aac254d77a8861e9a528965c83004e5dd8400295de9c154744ee64719a577f292e43633ae0a01f5df2872b53b844fcf8a231c720a61e8b SHA512 033f36f7da530fe39aaa86e6a84e0cf6cc2408243f765bce1dfdfb5e6fdc16627aec8419859142be8b05ef3374daf376a1a8bd0e1423558492e15db2a1655680
-EBUILD spirv-tools-1.3.204.ebuild 1240 BLAKE2B 8150c83ab26145e2fca5f48e3469bfb7494ef037dad3ff6113d31410aae5c1db38d13429405cb56eeca07b51cd966c709e0e076c3050daee1863b7fa3997ee1b SHA512 88131c23130a09fd75e2f7d58c567d68a30808501e7307a65fd030012acef2326924dca8fd295b5f389dbc2f644f70f515736a5461187285ef944d1d3fc29e12
+EBUILD spirv-tools-1.3.204.ebuild 1234 BLAKE2B c24dd15b41ef53e246aac254d77a8861e9a528965c83004e5dd8400295de9c154744ee64719a577f292e43633ae0a01f5df2872b53b844fcf8a231c720a61e8b SHA512 033f36f7da530fe39aaa86e6a84e0cf6cc2408243f765bce1dfdfb5e6fdc16627aec8419859142be8b05ef3374daf376a1a8bd0e1423558492e15db2a1655680
+EBUILD spirv-tools-1.3.211-r1.ebuild 1291 BLAKE2B 8ab86706e433b62d71825740222f258f1408363e7feb1c4b9075d7d8a49a3a2c2f207586805875531f02671e64839007413957b5ac08c6e756d76274d65021ae SHA512 a7fa7860049a8389558ec5c0a2e3808b11dc793389564b76259babc24c4a94bc95f6c415d55e2fadfb3de2ca8f8d3bfa9b2e8b8e8c8e7b47026fecffc1e58e3e
+EBUILD spirv-tools-1.3.211.ebuild 1240 BLAKE2B 8150c83ab26145e2fca5f48e3469bfb7494ef037dad3ff6113d31410aae5c1db38d13429405cb56eeca07b51cd966c709e0e076c3050daee1863b7fa3997ee1b SHA512 88131c23130a09fd75e2f7d58c567d68a30808501e7307a65fd030012acef2326924dca8fd295b5f389dbc2f644f70f515736a5461187285ef944d1d3fc29e12
 EBUILD spirv-tools-99999999.ebuild 1242 BLAKE2B d243ffb7a2b93b2e3b9b08d7759749d21d644b91c7db6ad2495aebdecad71e0b32df36807f3429510bb6ae516f8176369506241fd031ea2bdf42b3f859f2483b SHA512 f4f086ed7f6ffc472420708e3f94e325e0fc202421bf14e5475ce6370d13e4ea23e516f082a6fad8dfd8cc156094b3b8ac9b486352123b5a6d4b2a450f5ea706
 MISC metadata.xml 429 BLAKE2B 8d9917ace6eaaab8b826f48bc6f38c629efc5245a5356d821632867b8a65246180dcc14927db6ed1e025a32d7bb248aa35e3a7095c79bff5a2e91b3d880de997 SHA512 3f076c95eb788258a2451c3b54a013eeb936fed744b68499f53970590fc846d79b9724198ed54300a57395b1f4f2a657840bf8aa7ff25dcef8cdf28aa7f35ae3
diff --git a/dev-util/spirv-tools/files/spirv-tools-1.3.211-cmake-librt.patch b/dev-util/spirv-tools/files/spirv-tools-1.3.211-cmake-librt.patch
new file mode 100644
index 000000000000..48afd5a736f1
--- /dev/null
+++ b/dev-util/spirv-tools/files/spirv-tools-1.3.211-cmake-librt.patch
@@ -0,0 +1,40 @@
+https://github.com/KhronosGroup/SPIRV-Tools/commit/cb96abbf7affd986016f17dd09f9f971138a922b
+
+From: Chad Versace <chad@kiwitree.net>
+Date: Thu, 14 Apr 2022 06:04:12 -0700
+Subject: [PATCH] Fix CMake for librt (#4773)
+
+In the installed file
+/usr/lib64/cmake/SPIRV-Tools/SPIRV-ToolsTarget.cmake, occurences of
+librt in the INTERFACE_LINK_LIBRARIES property are incorrect.  The
+property contains the absolute path to librt. In most situations, this
+produces no problem. But when building in a sysroot, which is commonly
+done when cross-compiling, the absolute path breaks dependent projects.
+
+For example, when building spirv-tools using the Chrome OS SDK, and
+targeting the board 'volteer', where the build sysroot is
+'/build/volteer', the file includes this line
+    INTERFACE_LINK_LIBRARIES "/build/volteer/usr/lib64/librt.so"
+when it should instead say
+    INTERFACE_LINK_LIBRARIES "rt"
+
+The CMake documentation agrees [1]:
+    Note that it is not advisable to populate the
+    INTERFACE_LINK_LIBRARIES of a target with absolute paths to
+    dependencies. That would hard-code into installed packages the
+    library file paths for dependencies as found on the machine the
+    package was made on.
+
+[1] https://cmake.org/cmake/help/latest/prop_tgt/INTERFACE_LINK_LIBRARIES.html
+--- a/source/CMakeLists.txt
++++ b/source/CMakeLists.txt
+@@ -407,7 +407,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+   find_library(LIBRT rt)
+   if(LIBRT)
+     foreach(target ${SPIRV_TOOLS_TARGETS})
+-      target_link_libraries(${target} ${LIBRT})
++      target_link_libraries(${target} rt)
+     endforeach()
+   endif()
+ endif()
+
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.204.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.204.ebuild
index ac0beb4ad14f..ec2ad8d84ae9 100644
--- a/dev-util/spirv-tools/spirv-tools-1.3.204.ebuild
+++ b/dev-util/spirv-tools/spirv-tools-1.3.204.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 else
 	EGIT_COMMIT="sdk-${PV}.0"
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.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}-${EGIT_COMMIT}
 fi
 
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild
new file mode 100644
index 000000000000..b85f5ddda7c5
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-1.3.211-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=SPIRV-Tools
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="sdk-${PV}.0"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
+fi
+
+DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests fail upon finding symbols that do not match a regular expression
+# in the generated library. Easily hit with non-standard compiler flags
+RESTRICT="test"
+COMMON_DEPEND="~dev-util/spirv-headers-${PV}"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-cmake-librt.patch
+)
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/"
+		"-DSPIRV_WERROR=OFF"
+		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
+		"-DBUILD_SHARED_LIBS=ON"
+	)
+
+	cmake_src_configure
+}
diff --git a/dev-util/spirv-tools/spirv-tools-1.3.211.ebuild b/dev-util/spirv-tools/spirv-tools-1.3.211.ebuild
new file mode 100644
index 000000000000..ac0beb4ad14f
--- /dev/null
+++ b/dev-util/spirv-tools/spirv-tools-1.3.211.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=SPIRV-Tools
+CMAKE_ECLASS="cmake"
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="xml(+)"
+inherit cmake-multilib python-any-r1
+
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/KhronosGroup/${MY_PN}.git"
+	inherit git-r3
+else
+	EGIT_COMMIT="sdk-${PV}.0"
+	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}"/${MY_PN}-${EGIT_COMMIT}
+fi
+
+DESCRIPTION="Provides an API and commands for processing SPIR-V modules"
+HOMEPAGE="https://github.com/KhronosGroup/SPIRV-Tools"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# Tests fail upon finding symbols that do not match a regular expression
+# in the generated library. Easily hit with non-standard compiler flags
+RESTRICT="test"
+COMMON_DEPEND="~dev-util/spirv-headers-${PV}"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND=""
+BDEPEND="${PYTHON_DEPS}
+	${COMMON_DEPEND}"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		"-DSPIRV-Headers_SOURCE_DIR=${ESYSROOT}/usr/"
+		"-DSPIRV_WERROR=OFF"
+		"-DSPIRV_TOOLS_BUILD_STATIC=OFF"
+		"-DBUILD_SHARED_LIBS=ON"
+	)
+
+	cmake_src_configure
+}