dev-libs/rocm-opencl-runtime: add 6.3.0, drop 6.2.4

Apply must patch to 6.1.2 to fix compilation there too.

Closes: https://bugs.gentoo.org/939920
Signed-off-by: Sv. Lockal <lockalsash@gmail.com>
Signed-off-by: Sam James <sam@gentoo.org>

6 files changed, 59 insertions, 11 deletions

diff --git a/dev-libs/rocm-opencl-runtime/Manifest b/dev-libs/rocm-opencl-runtime/Manifest
index 9c99f5c85dcf..931e5e868bc8 100644
--- a/dev-libs/rocm-opencl-runtime/Manifest
+++ b/dev-libs/rocm-opencl-runtime/Manifest
@@ -5,7 +5,7 @@ DIST rocclr-5.5.1.tar.gz 634330 BLAKE2B e6383a6b6b09f274a944d66effd345e38a191ec7
 DIST rocm-clr-5.7.1.tar.gz 2008647 BLAKE2B 3db0760d6f83504e60caf88a2dd5e0bc02c7db9d6f263ad0eb2cfc79aa0f88a3699c412844a0158a796d9d02e79660287e791edad787d814eefffea4fd2298b4 SHA512 d79323481d82fc02c12a32cdcc0d14437d512af023e7737db0387b7eecb27fe6e4ae7c71d6adce57932a04bb24c880440d9dc10aeb5af11a4f2ca64d44330965
 DIST rocm-clr-6.1.1.tar.gz 2031034 BLAKE2B b0485bb015d31986f4988d1db0c029c826856e50b5bb1b58fac2097c14b3966668f1b8d41ec198889e27ac860497a8b3c081ec31d52390d5c9ff5db092bf7cce SHA512 86925e8b9a9e77b06a57daefbc7279887b4ef7c6a79c3717bc2f2d3bf29926281c60063fd17e21c65d7def520d9f579bf88f69051d053a38750ba968f69ca3fc
 DIST rocm-clr-6.1.2.tar.gz 2031283 BLAKE2B d51d32a77794ea97f1a3817786c9fd6b482106b665eea6e2c9b4c11e4dce19a3486386eb5ba111554c2d82c30e2a93add7502eed5768caf3fb709fb5fbb2e71b SHA512 e97224451864efe0084c4117f54893c9624a6a9f365a0b4abad08fd9635f008dea742dc589429fbb714e1b8177d06362c0f5a741f6c4a050d0fd4d48da72d54b
-DIST rocm-clr-6.2.4.tar.gz 2078004 BLAKE2B 28fdd2a81a5b831e157d781d6d869c02a288d9b8dc47a8a1d0a9f3b7ed99393c06f9b2bbc8d7dc2b2173a1b8c57fa1328b0fd6a7f24e759ace77e8c1ae777442 SHA512 74a198595929003248a3684fb5d83c20a8769eef237fcc07371f4385380f347917d6beaca15527334d06ea19bc446a03fca7251e5b2782f05547a36ccd1dfa49
+DIST rocm-clr-6.3.0.tar.gz 2093572 BLAKE2B 14f75f9f5dc4000a2abf28e523659def8cd96112c9c8b95abb634c33433077faa3ddab3fbe659e0ed2e1f309f63a93b7eb03fa6f246b4cea06ca8c512c13308a SHA512 f005baaf2a8f63946811db990e2d373906b31a4085a51427d407c9e4c1d877a14aeb713190a285953cadb960b5517570941c60e2f998adb2b1f9833f1d2f5925
 DIST rocm-opencl-runtime-5.1.3.tar.gz 1004765 BLAKE2B 64d9b42026d2be1d0e4aa666785699f6b4ec0584a927904a94bf830883050943503f8bdd7c97438a2fb11c71686a330d526f633959916c5c6c8da2e037841e79 SHA512 b83c3ae0bfad80f867bacce36710a8964f6dd7e64bf50da3ec6ce842217d6de63299d9ceaab9dc25a22252484520a85d02859809463dad5dda9b1f00a86863e0
 DIST rocm-opencl-runtime-5.3.3.tar.gz 1007773 BLAKE2B a3f600a68183337f92b152a123241cb7025889cca2ef6814d9d5b5a2146a78703b171d20bcb432bc7a2cdd1f24ad349408c17816b25a66702e9f0f5345af9082 SHA512 391f0f244b7f02972df8cada821e69ee8d81d96b9cff3c14f1d0838da583d8fb136ec4bd5ee820f6dd261968e9eef5e9a5b10b7bb76b1b64625c399d79bcb03f
 DIST rocm-opencl-runtime-5.4.3.tar.gz 1005268 BLAKE2B f9398e4c2b0f045f1b5d8df9f31b7f2bef6a9201885aa6ee5fc5d71632cfde26a078d9a5ea38c3da12d3c187faf04c7bdcf1a8ecb9927cdba56b1efdfcdc44ee SHA512 f65d4622ce8721a6b91ab5b5b306d142ba507d3e631ac3ab0b76c5bc6d8d18455e02debd954c82e7eb609f232b509f1ec1a013dc2fad467c2c2ad31fdf15755d
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-6.1.2-musl.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-6.1.2-musl.patch
new file mode 100644
index 000000000000..424cd0dde119
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-6.1.2-musl.patch
@@ -0,0 +1,24 @@
+Fix "basename" and "__cpu_mask" definitions for musl
+
+Upstream PR: https://github.com/ROCm/clr/pull/83
+--- a/rocclr/os/os.hpp
++++ b/rocclr/os/os.hpp
+@@ -29,6 +29,7 @@
+ 
+ #if defined(__linux__)
+ #include <sched.h>
++#include <libgen.h>
+ #endif
+ 
+ #ifdef _WIN32
+@@ -377,6 +378,10 @@ ALWAYSINLINE address Os::currentStackPtr() {
+ 
+ #if defined(__linux__)
+ 
++#ifndef __GLIBC__
++typedef unsigned long int __cpu_mask;
++#endif
++
+ inline void Os::ThreadAffinityMask::init() { CPU_ZERO(&mask_); }
+ 
+ inline void Os::ThreadAffinityMask::set(uint cpu) { CPU_SET(cpu, &mask_); }
diff --git a/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-6.2.4-fix-lib-version.patch b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-6.2.4-fix-lib-version.patch
new file mode 100644
index 000000000000..17c6ebcc6f6e
--- /dev/null
+++ b/dev-libs/rocm-opencl-runtime/files/rocm-opencl-runtime-6.2.4-fix-lib-version.patch
@@ -0,0 +1,13 @@
+There is no ROCM_LIBPATCH_VERSION outside of AMD farm.
+Upstream bug: https://github.com/ROCm/clr/issues/112
+--- a/opencl/amdocl/CMakeLists.txt
++++ b/opencl/amdocl/CMakeLists.txt
+@@ -66,6 +66,8 @@ set(AMDOCL_LIB_VERSION_MAJOR "2")
+ set(AMDOCL_LIB_VERSION_MINOR "1")
+ if(DEFINED ENV{ROCM_LIBPATCH_VERSION})
+   set(AMDOCL_LIB_VERSION_PATCH "${AMDOCL_LIB_VERSION_MAJOR}.${AMDOCL_LIB_VERSION_MINOR}.$ENV{ROCM_LIBPATCH_VERSION}")
++else()
++  set(AMDOCL_LIB_VERSION_PATCH "${AMDOCL_LIB_VERSION_MAJOR}.${AMDOCL_LIB_VERSION_MINOR}")
+ endif()
+ 
+ set_target_properties(amdocl PROPERTIES
diff --git a/dev-libs/rocm-opencl-runtime/metadata.xml b/dev-libs/rocm-opencl-runtime/metadata.xml
index c815e421fb36..1b835a209717 100644
--- a/dev-libs/rocm-opencl-runtime/metadata.xml
+++ b/dev-libs/rocm-opencl-runtime/metadata.xml
@@ -10,6 +10,6 @@
         <name>Yiyang Wu</name>
     </maintainer>
     <upstream>
-        <remote-id type="github">RadeonOpenCompute/ROCm-OpenCL-Runtime</remote-id>
+        <remote-id type="github">ROCm/ROCm-OpenCL-Runtime</remote-id>
     </upstream>
 </pkgmetadata>
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.1.2-r1.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.1.2-r1.ebuild
index 540038443185..ff5b6f1635e8 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.1.2-r1.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.1.2-r1.ebuild
@@ -29,7 +29,10 @@ BDEPEND=">=dev-build/rocm-cmake-5.3
 	test? ( >=x11-apps/mesa-progs-8.5.0[X] )
 "
 
-PATCHES=( "${FILESDIR}/rocm-opencl-runtime-6.1.2-fix-segfault.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-6.1.2-fix-segfault.patch"
+	"${FILESDIR}/${PN}-6.1.2-musl.patch"
+)
 
 src_configure() {
 	# -Werror=strict-aliasing
diff --git a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.2.4.ebuild b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.3.0.ebuild
index 465e3a2ddc66..9b71c076cb2d 100644
--- a/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.2.4.ebuild
+++ b/dev-libs/rocm-opencl-runtime/rocm-opencl-runtime-6.3.0.ebuild
@@ -7,9 +7,9 @@ ROCM_SKIP_GLOBALS=1
 inherit cmake edo flag-o-matic rocm
 
 DESCRIPTION="Radeon Open Compute OpenCL Compatible Runtime"
-HOMEPAGE="https://github.com/ROCm-Developer-Tools/clr"
+HOMEPAGE="https://github.com/ROCm/clr"
 
-SRC_URI="https://github.com/ROCm-Developer-Tools/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz"
+SRC_URI="https://github.com/ROCm/clr/archive/refs/tags/rocm-${PV}.tar.gz -> rocm-clr-${PV}.tar.gz"
 S="${WORKDIR}/clr-rocm-${PV}/"
 
 LICENSE="Apache-2.0 MIT"
@@ -18,17 +18,25 @@ KEYWORDS="~amd64"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
-RDEPEND=">=dev-libs/rocr-runtime-6.0
-	>=dev-libs/rocm-comgr-6.0
-	>=dev-libs/rocm-device-libs-6.0
+RDEPEND="
+	dev-libs/rocr-runtime:${SLOT}
+	dev-libs/rocm-comgr:${SLOT}
+	dev-libs/rocm-device-libs:${SLOT}
 	>=virtual/opencl-3
-	media-libs/mesa[-opencl]"
+	media-libs/mesa[-opencl]
+"
 DEPEND="${RDEPEND}"
-BDEPEND=">=dev-build/rocm-cmake-5.3
+BDEPEND="
+	>=dev-build/rocm-cmake-6.0
 	media-libs/glew
 	test? ( >=x11-apps/mesa-progs-8.5.0[X] )
 "
 
+PATCHES=(
+	"${FILESDIR}/${PN}-6.2.4-fix-lib-version.patch"
+	"${FILESDIR}/${PN}-6.1.2-musl.patch"
+)
+
 src_configure() {
 	# -Werror=strict-aliasing
 	# https://bugs.gentoo.org/856088
@@ -62,7 +70,7 @@ src_install() {
 
 	cd "${BUILD_DIR}"/opencl || die
 	insinto /usr/lib64
-	doins amdocl/libamdocl64.so
+	doins amdocl/libamdocl64.so*
 	doins tools/cltrace/libcltrace.so
 }