gentoo resync : 20.03.2022

3 files changed, 105 insertions, 0 deletions

diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index 1d4ffa7a648b..31d46659585b 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -5,6 +5,8 @@ AUX rocm-opencl-runtime-3.7.0-amdocl64icd.patch 503 BLAKE2B 33154b45dd539c068cb8
 AUX rocm-opencl-runtime-3.7.0-change-install-location.patch 2523 BLAKE2B f31cd13f8b50ea75c3ababe89905881ef92ec0319057a98978ff49514f213e5aad0f72d2eda75d300836ee4e90d1ac8b6b897442c968b30ad4c8af6c31f61fca SHA512 945d37ef36adec5ff6915bc4f3cc30801776370bce8097b53bc4e72568d4801fb7f092ebc0103ec0f625a0297d8ab5a43dcaa84d59f7145ea87610a7bc855f79
 AUX rocm-opencl-runtime-3.9.0-add-rocclr-include-directories.patch 576 BLAKE2B adf9f72b83b57ca9a0205d520b8ffefd44b9b6ea13bae37ba3289ed39ad8bf7a93a1ca4c640c15dd79297fdaee34ca8b8c0f2f95c670d1a26873a73b7b2d02a7 SHA512 e3c673c649ed9a1e4c90c1d51e3f05431f61ea07287056f80879ae24b917474ebb9665ad83c361bbf2c3ca5a01b0ecc1d3d51b845a1c6e5c755fa40f7d92aaaf
 AUX rocm-opencl-runtime-4.2.0-opencl3-header.patch 3227 BLAKE2B f9a23194e9531da59839e3b6636a523a1e50a20bc57af9615f49ad390912af1032131d67ea3c157c76c35529d4776f26fd3c1806342e2b67a71737cc9bd108ae SHA512 4364cad8e0f20dd2df1c3e23d6099be6e96ff585d95fe665e63d926b37e5d03aa4e5729af53e1575066e501230c1c766cebb86da47052d0d9f4dc23da7069b83
+AUX rocm-opencl-runtime-4.5.2-remove-clinfo.patch 577 BLAKE2B e8d57ae30b3ad97721f3afc254d780262c6f73259731d226445a320d7fc620c00398c781c5309bd4b43327ce45a747b5add3421c3abab0600d9e07c46cc20549 SHA512 83b7e1ef6d14f0cfefc2498fe5df191f2442b0265139cc3f2661346b55ff3621cf590a40476e156e729604fffb1285243df705010191b343596cbe3d67ee8c64
+DIST rocclr-4.5.2.tar.gz 846950 BLAKE2B beefc6a98d9a8a1a6c00b03cbfd960215888201002f7d4a0ee079db1fc29f2faa9f53326d49c1ad00f2c3a507d5047aae8175a3abb50ae0a74ba36fdc7df9e22 SHA512 121cfb711172596d9e4d429a38fb333bbb10e427ad49cf337324dc187a04adcd99e94521cda65ba21b6ac3bfd7837f607e4c0fe38c6ebca3d58bb090128d0a43
 DIST rocm-opencl-runtime-3.10.0.tar.gz 1004148 BLAKE2B 3d2539d24f8b3fd039424d606ebe36d7d8d1db2425f646d093a1a48d95c1c8b1c20821674fc628e622c2a5e7cbb30547805c3b84af16ad53f860f1064efa572b SHA512 121d0f310b4b235adf5f34dbf1989016b4c875bb47779b18d35fd9fab01c2118d1860e520cc6202a6fc3405b4c7897f491f611193c992cc25fe48e12bdd9f83f
 DIST rocm-opencl-runtime-3.8.0.tar.gz 1004339 BLAKE2B 966a5bd1d4d188004b15fe4263f2c18f6dad6a07f4bc264a5afa010f6035fbf73288966cd624e6e31e1ba584ba322d93343e3482177e6480c4a57a4150546f5a SHA512 bb4e3568e32bf6acc3c4812d7db169396a01bf90d079dc420ffb7df4bd4146d39938e76e9b386548fe64276bbf938a545c898de599113f20cc73ae98268c3d6a
 DIST rocm-opencl-runtime-3.9.0.tar.gz 1004372 BLAKE2B f5485dfbc615826214e1071485636e94bc83d12d4412da912455cb0ddd39ede3429a749a16428cb3c10775e652ffbe31a63ad00b3ea38a7fa43a120776a12bfe SHA512 e8149e99a7116a2c2af0d04dde55290c35dd5c6c26d95da8c8a04fcfccdb23f6617ab8348f9fc201b6d9fde7202de4ede480d7ac547ae2471c6ae10897e1795e
@@ -12,6 +14,7 @@ DIST rocm-opencl-runtime-4.0.0.tar.gz 1004149 BLAKE2B a41ca63bdac1930599fd808d0a
 DIST rocm-opencl-runtime-4.1.0.tar.gz 1005255 BLAKE2B 5833cc4bae3ecd5c9a3f601334424d03596bfe798bfc7c11ffa9d66b23d36f3fe6cfb1dbfd38c208a63ba824d6c5634f69448ace29ada6728c8ef544afcf1c0e SHA512 228c1bb337778b32c86d645fb874d03e9d6ee39ebfad23c813c0b2221a0421225aca63b2526d60c34d84f64147daad3e9324c2063db4b112aa30250359babbd2
 DIST rocm-opencl-runtime-4.2.0.tar.gz 1005604 BLAKE2B 09e100081295e8c3da1f8b6b4371d372bcde8dade66ba2718111044364ab6a9cf1c598bd650c57670759def20aa7e638c5ecfe2076191b51a76d68e57b536605 SHA512 49b07a07949506dfd74a047d01a0bd9e2f719f6a618b4e4786861f9d59a77ddf15e06e1d13e6bda08866e096f5bd73be8656eae3ad9806661149d20cfdd68566
 DIST rocm-opencl-runtime-4.3.0.tar.gz 1006792 BLAKE2B 29fd5843bb0153c7d3fe5250898f0fbdd089db6304122698c9ec9a5436e3a6845916f241f1a1e79a614e369f000297ac12413620edec0660d859ccddaa978d07 SHA512 a514d626700350f2c663db468427479eaa9e39dd912266ac2db6830d712351ffbc18737b208fd37f7ab5afdc2c9f6412d8d765973d6c72759bf51f864fc6bf1d
+DIST rocm-opencl-runtime-4.5.2.tar.gz 998488 BLAKE2B f5b92fca4b8aec8a709fccf6817bb3c6a1074f90a0ca8d38c23efe614672daf597f03e947dffbeca715619595878518e1eb7b8d3e3fd00dd02cdf076135fe626 SHA512 6c26b5517bebb2c3096efaec42bfdcb7485e13551b75397f029fa9b4925fe85201e749b91e3a068705cdf4284895d1d996b2819faf4013e1ed34a10319240452
 EBUILD rocm-opencl-runtime-3.10.0.ebuild 1959 BLAKE2B 55455b2b6c94f4c48f29b49873ad15fa2409441b184c6b6adf679f7e8656f373705b115d6b5a4c6563c75385d0b418590a2041ab69c6948a42950319e1abd85b SHA512 3c4f68ed353c7eef6f44b6f0f81549c4cdc2fa8d0a652a2d84157b29ae5a5b63583744192384d21af2cd5e93fded4fa0886fdfa0ac57b9af090415080881e00b
 EBUILD rocm-opencl-runtime-3.8.0.ebuild 1958 BLAKE2B d9aa4e4227e5e9d9fc7d590f9c1e03c6a408fd910aa070833e0fc6b9f344c0c3470b3d4be6bf8fcc67d96d286814ec366dab5c758e76ead4b9b5b5f21d77849f SHA512 cb7e217a3a416bdf55ed756bb19d27cbf6b15b49ccc7482f0b611d210368e3d6bbb983cb9a1e684efb3df273297c12e90047d766a2195d67a36095435d9b3507
 EBUILD rocm-opencl-runtime-3.9.0.ebuild 1958 BLAKE2B df047f8b49eabf718ad126e9c14ae9313d51ab1fa4c32895229987e375499500c97549ff7f620b6bbdb1b47abe8e7cc2c2f85bd9622cc5ee2132c03385ae7707 SHA512 ff9e05cd503d218f65b5749d056832e543f74ece0f7585d4e89b43b8a450532864dfb44f09e16cbea9b18083cc0460347a9cbdd3eaeabfa3d1268a5265bb856f
@@ -19,4 +22,5 @@ EBUILD rocm-opencl-runtime-4.0.0.ebuild 1723 BLAKE2B c9d75c187aac9926441f35c3fe8
 EBUILD rocm-opencl-runtime-4.1.0.ebuild 1723 BLAKE2B c9d75c187aac9926441f35c3fe8da16f2f908a42e979a3f1fe996f1d8297f157620d7f636ae78220f2a5b73c21f140cd90c471d8fc874c75ab9ba6fc9374b59c SHA512 08b5304d7b9c1b3d11cb811c2bb2a114f3b02cff622d9d5f03ee1d82176b910ac6619b0183f375f0a4a7a6fa27d237a6a1fd4ce1da9c7502c801d053d428472c
 EBUILD rocm-opencl-runtime-4.2.0.ebuild 1764 BLAKE2B 05fa06033a0ee255ebda6bc17c9341b7b08a8b3f086c29f3104c07a8d78db105ce8d28c83b21ed259569b4d0c5bd00851e0553d84bc2650bd2c9b0f77aec7461 SHA512 88f7343cc137f039b5b374092a5f81cfb1e1223c36b9da9ee3b471e05fd770d9cde6b7d68f9c4288d421d4aa9350e2fa16b02e976411efc790ab4fa86e6e5dbf
 EBUILD rocm-opencl-runtime-4.3.0.ebuild 1771 BLAKE2B 6f89d392b1fa396abbff5bf4c72c874d759128eebd8ecdf9460750b654447f0f2b0e09f9d7bf1c7a468754e055b533f05f679439c0f1fd10c08f8dfbec1aca29 SHA512 a1132d242d3c5fe6718bb207a4a5430b036e77958267dbfe2485dce7d29ff1714bd7984f92c428b5e47cdf246bed1ced6fea1d01d9c1ff2f0b411dd5851b2bde
+EBUILD rocm-opencl-runtime-4.5.2.ebuild 2098 BLAKE2B 927e8c40f12b2dc9648b54af826e0ffa38f28a47dbbf33f3dc5f6504a1201d3a11abf8620486f7df5984dd7388a1160029be2e0d1c9a4f1bc2663d3fed852b34 SHA512 6bb18a36e3a77d83035306273685e3ab6397b91e2d311276e4f3bf469039e6c0b3ab70a73c29f30318fe2dd959244c449334e138e64ec3327c4b9870d5bafe5c
 MISC metadata.xml 381 BLAKE2B fbd9237f4928b42544799482f55fc0e72e872a554bf96c3066ea59213e7d840d432c320f834cc333a09498d6deabb0fc751657ad0e861be7997fba6f1788ffac SHA512 8d05a33637e38b0596a98f5dfee096a91bba41ca16c4eba5f5e93f05f800290c480a0393bf4d5a7ce70cbff0a541b95e52d3c95b02cc7a079343c8f740b8e479
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-4.5.2-remove-clinfo.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-4.5.2-remove-clinfo.patch
new file mode 100644
index 000000000000..e466c14b2a08
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-4.5.2-remove-clinfo.patch
@@ -0,0 +1,11 @@
+diff -ruN ROCm-OpenCL-Runtime-rocm-4.5.2.old/CMakeLists.txt ROCm-OpenCL-Runtime-rocm-4.5.2/CMakeLists.txt
+--- ROCm-OpenCL-Runtime-rocm-4.5.2.old/CMakeLists.txt	2021-09-27 18:33:06.000000000 +0200
++++ ROCm-OpenCL-Runtime-rocm-4.5.2/CMakeLists.txt	2021-12-15 19:04:23.315989714 +0100
+@@ -14,7 +14,6 @@
+ set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_LIST_DIR}/khronos/headers/opencl2.2" CACHE PATH "")
+ add_subdirectory(khronos/icd)
+ add_subdirectory(amdocl)
+-add_subdirectory(tools/clinfo)
+ add_subdirectory(tools/cltrace)
+ if(BUILD_TESTS)
+   add_subdirectory(tests/ocltst)
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.5.2.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.5.2.ebuild
new file mode 100644
index 000000000000..a90a016047af
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-4.5.2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic prefix
+
+DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
+HOMEPAGE="https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime"
+SRC_URI="https://github.com/ROCm-Developer-Tools/ROCclr/archive/rocm-${PV}.tar.gz -> rocclr-${PV}.tar.gz
+	https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/archive/rocm-${PV}.tar.gz -> rocm-opencl-runtime-${PV}.tar.gz"
+
+LICENSE="Apache-2.0 MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}
+	>=dev-libs/rocm-comgr-${PV}
+	>=dev-libs/rocm-device-libs-${PV}
+	>=virtual/opencl-3
+	media-libs/mesa"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/rocm-cmake-${PV}
+	media-libs/glew
+	"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.5.2-remove-clinfo.patch"
+	"${FILESDIR}/${PN}-3.5.0-do-not-install-libopencl.patch"
+)
+
+S="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
+S1="${WORKDIR}/ROCclr-rocm-${PV}"
+
+CMAKE_BUILD_TYPE=Release
+
+src_prepare() {
+	# Remove "clinfo" - use "dev-util/clinfo" instead
+	[ -d tools/clinfo ] && rm -rf tools/clinfo || die
+
+	cmake_src_prepare
+
+	hprefixify amdocl/CMakeLists.txt
+
+	local S="${S1}"
+	local CMAKE_USE_DIR="${S1}"
+	# Bug #753377
+	local PATCHES=()
+	BUILD_DIR="${S1}_build" cmake_src_prepare
+}
+
+src_configure() {
+	# configure ROCclr
+	CMAKE_USE_DIR="${S1}"
+	local mycmakeargs=(
+		-Wno-dev
+		-DAMD_OPENCL_PATH="${WORKDIR}/ROCm-OpenCL-Runtime-rocm-${PV}"
+	)
+	BUILD_DIR="${S1}_build" cmake_src_configure
+
+	# Reported upstream: https://github.com/RadeonOpenCompute/ROCm-OpenCL-Runtime/issues/120
+	append-cflags -fcommon
+
+	CMAKE_USE_DIR="${S}"
+	local mycmakeargs=(
+		-Wno-dev
+		-DROCCLR_PATH="${S1}"
+		-DAMD_OPENCL_PATH="${S}"
+		-DROCM_PATH="${EPREFIX}/usr"
+	)
+	cmake_src_configure
+}
+
+src_compile() {
+	local S="${S1}"
+	BUILD_DIR="${S1}_build" cmake_src_compile
+
+	local S="${S}"
+	cmake_src_compile
+}
+
+src_install() {
+	insinto /etc/OpenCL/vendors
+	doins config/amdocl64.icd
+
+	cd "${BUILD_DIR}" || die
+	insinto /usr/lib64
+	doins amdocl/libamdocl64.so
+	doins tools/cltrace/libcltrace.so
+}