gentoo auto-resync : 26:01:2025 - 22:42:38

5 files changed, 41 insertions, 6 deletions

diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest
index e6ca0a448489..7e1cb8e7b698 100644
--- a/sci-libs/rocFFT/Manifest
+++ b/sci-libs/rocFFT/Manifest
@@ -3,12 +3,13 @@ AUX rocFFT-5.0.2-add-math-header.patch 468 BLAKE2B 66cedbbc2b7aeaa2e42324e02325d
 AUX rocFFT-5.1.3-add-stdexcept-header.patch 340 BLAKE2B b21454151dd2c41948e00b50360b3adbc93c08e7e849b11c032ba0b8dc76d1159883349065d7c87bf3098d0e67d4da48db220b58934de39fcb3c4d006a902a5e SHA512 a49f2bad5ea87f67a7d5dc7adb820a42ab2b92b0f1436a564c3906dcc4598de154d18247d8b4e8f3e12c3947da05890a4a9ba6f76852bebd1fcf26928ee48e0c
 AUX rocFFT-5.1.3-unbundle-sqlite.patch 2326 BLAKE2B 5a08f2ec7486f0687c4af46e09a01678e8255254bb78ae864436353d10017f86f1b3b557527a32771de43fa24148c3be5d233639bdf3e6746b2d120623bf934d SHA512 c545053741c55abf1dbcda89e9ece1bccb42a5db86c0329499b332299c5c7b73150650634cc7506bef2ee7e16a25bf1aacd5477bf13884e2cb01c48a113b33ab
 AUX rocFFT-5.7.1-fix-rocm-link-path.patch 492 BLAKE2B daf4d865d8b2b5f3dc97a845f262c266588da910f517e31a10cf7896c6bc1c4fd794c01be39c7aa74d5eb80e4066b8d3dd8a8841210e0075ad4e593dc0f85f66 SHA512 b715c08515b6d289f1b045db7053ff08a27aa9cf940beacba47167a72f168d75f4652d98b33fc2bef303832f0689cf51d71f893e415ba4b4cd7a0f21c677de69
+AUX rocFFT-6.1.1-find-hip-use-config.patch 1108 BLAKE2B 9ae46c2dc754d3a9d68863012c46b6642c71459facd75a4425f8942fad1df1df15d3030255e1b54c537152b521ca4becdc8426003e05aceedc92087aeffd14bf SHA512 02322003c1e6385fb4cff1049a9554baa91d2eca75bc0c9869b92e95c6c579d7f5e361b5b2ce98ca2ab5613891c24230833ae13f13a814f863510ef4340b9260
 DIST rocFFT-5.1.3.tar.gz 845470 BLAKE2B 86060ce4f8612869fedc5bc92ed6a5bb7fbc539b26c7f5ab0ded5406ab6c340f64116782285d040824e54557af87d9ddb6f907fd1550b80c3da903d3c1d5e5c0 SHA512 175402856bd4753e74ce14326569be99221e21d0ce675e007900f6982c53e1566ad0b060eec545e0f17ff4dc4811688cc1003dc986226205ee95ee6f22d1ca43
 DIST rocFFT-5.7.1.tar.gz 1192841 BLAKE2B 58f880f7ff866f85af70666d17e8b1a3ac8e63e853520546f746d74cecd805687fd689367a09d2b1ec4e1059b44b858377dce362cd4cae91cb85aad7c3185c00 SHA512 48467589cb4bc1334a4074bacc6a726c850dc2a79ef82622301d61c4269fb81c0b2b9fce56d72bddca584d1797a8634d243a9a6b8cf943e687b2b0f5c931116f
 DIST rocFFT-6.1.1.tar.gz 1257210 BLAKE2B 01d383d32bb91a9cd1d68a3b1ef2c6d71b33a9a49389c558adca2673ce4a74aab9f0a420977d4f4d5e8b8e72f3d9bfe3a8019e137968b58984edac4f2e1a9146 SHA512 fb35b4d21b8bd598702f79707cdf19b7c30a9e62176f5f7a71b93076f904a98446dac4fa8bffcd7ba20ecb797aec727e730c8232de881a52d519c0c00a907bf9
 DIST rocFFT-6.3.0.tar.gz 1386056 BLAKE2B 1aab60818328cb3a6448f6d555faf2db3b3839e2b3abd7a37cc48054e67321e7c98c319b2f078dfd351f56263c35731608ae65fca427fc3eaaf06c8410b99d89 SHA512 4ac2dac24e77a9d767fa08a9d393cb2c94bc2a8ca32cb75ea53dd83011989bd344ae3c11c9bfc557e71c645ebea34c53a5e050ce6810259f84287e6baf829c08
 EBUILD rocFFT-5.1.3-r1.ebuild 3926 BLAKE2B ef9cf52ee86139887f87b96f02d28bcb80420af8d3538060596a51b3b8b7369eee5da63d90e8132935acf32cba06024840427cf2e5a2b7662388e75c1b1b4272 SHA512 3a34f05845f726fd6cb71d0315ee6338e1e381910a8dca2d6c655ae80e1ba3f1765a2313f2795be8eb737195fa23e2597bcda89a1e6db778cfddf35485462beb
-EBUILD rocFFT-5.7.1-r2.ebuild 3950 BLAKE2B ecd5ec8e81290c4bc83dd413c7b0dc292712244bbc6a432f593ddb868dfe24a5486acd590315b12ec9e3a074746aa4d84b0c8376aa1db490e8ea96867b7a3fd1 SHA512 48cb8edd4005f616d4e6886dce3b48bcb972b05ba35dc67739bfdca193a19fccba464bd275ca07bd98dff70fe7a237d256e2a45e4c2910ebe8f26648a262a555
-EBUILD rocFFT-6.1.1.ebuild 3747 BLAKE2B 13cf175e01205c53fb7b2541eb00cf1d9326a0eae51e26b96273ca70dc2917294a52414ef1bc2faee3383790e1ce3ac4ca8fac86a7eaf8b052728f779f31fceb SHA512 500a4a7ac83004b143c6742cfc319d6fecda12dc3d56282e0ae940e7ef2be67b14dab3a68dfdc1a6d1ffa24e76cd12ee4621b43434dba8e9a87fc39292321460
-EBUILD rocFFT-6.3.0.ebuild 3721 BLAKE2B 38d1079f818fc86d0c446ce9ab7f80c75ccf579fd05d9627a613ea2ecf0daa2cd9d98eab2fb54f3749901a9784a9bb53bb69e4c12d733692b692e17f2d7f2cd7 SHA512 1095e37ca4808e7ef9cda0bd9e57d09cb3176e1b2b74ce9fa28d553a1195d42f4b302dcf9512bfa2f803369b40b5bab575adb0ebc9271b0b287fa1bfb56edb60
+EBUILD rocFFT-5.7.1-r2.ebuild 4003 BLAKE2B ec65bb2120e61d38bc2a3d8f920c5d1553c4658b99f4171dbdb5b1f6b233652432aa45bc36b61b2c842ff20a20ab288c8b7236cbb6b972ab12647d127dbdabf4 SHA512 12ceadc7a10d718d36aeee65179335f7335a4db15f55b2da6bd6f0df8de3037d021a166c86dc35228efb18cafdd33f0209702e05e2e4ca80d0b9b960c76a0bfa
+EBUILD rocFFT-6.1.1.ebuild 3800 BLAKE2B 54624734bdc9c4583c50dac8f802f3ef648734146a70e5b1fae26f77556e60f97b9a5a7fff2a73782dae3eec8df4578650f0ecf2c6608a3009f5e645ab0bdd2a SHA512 77b86a3ac007c317f6aae00a6fb9895ab1cda1fad9ca4c889812134fa8368e26d2d1f943288c39342977ecf54ae71463a97e449cbc82a102825590cd4d670255
+EBUILD rocFFT-6.3.0.ebuild 3774 BLAKE2B 5dc6cba52c92afc16321ce3ede491a7aceb502a1228a9cf755be11fca6510a7d9330ef9f4e868f246608e0eec321ceba7467864f90a994bf064160093960e9de SHA512 789b6ad1e5ff3a95bdaf32c1aacbfd2495713e5b3c1af77459b5a0f36e1b2ae72601741e05bce8ecbca6f7fc10286bf2e62c4b841cc0365ecfd7b119d04e2ee1
 MISC metadata.xml 764 BLAKE2B 0490d64e75e9269408f31d4ac87f4845f01a306adf829d57d89401cab19c84412896f351c1dc9f6a918679447f1fe62a7fc958bff9c98f1990fe021f99b35e01 SHA512 0135bae193ac9439a86dca5e26a32366eae7b67175c955aace1a1d620f1df5176a3e3a302a5e6f1e6473777e5b51ab772aa67a01ba023e9c8bbb180352ae8e0b
diff --git a/sci-libs/rocFFT/files/rocFFT-6.1.1-find-hip-use-config.patch b/sci-libs/rocFFT/files/rocFFT-6.1.1-find-hip-use-config.patch
new file mode 100644
index 000000000000..27353eee35d1
--- /dev/null
+++ b/sci-libs/rocFFT/files/rocFFT-6.1.1-find-hip-use-config.patch
@@ -0,0 +1,31 @@
+Upstream PR: https://github.com/ROCm/rocFFT/pull/530
+From b29c984bfaaec9d372fb566f5136fe3c473ff22d Mon Sep 17 00:00:00 2001
+From: Yiyang Wu <xgreenlandforwyy@gmail.com>
+Date: Sun, 20 Oct 2024 23:22:50 +0800
+Subject: [PATCH] Require rocFFT use hip-config.cmake to find HIP
+
+Sometimes rocFFT use FindHIP.cmake which is not desired -- it does not
+have hip::device and hip::host target imported and result in cmake
+generating error.
+
+Reference: https://bugs.gentoo.org/932155
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bcb9819c..da697834 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -186,7 +186,7 @@ set(AMDGPU_TARGETS "${DEFAULT_GPUS}" CACHE STRING "Target default GPUs if AMDGPU
+ rocm_check_target_ids(AMDGPU_TARGETS TARGETS "${AMDGPU_TARGETS}")
+   
+ # HIP is required - library and clients use HIP to access the device
+-find_package( HIP REQUIRED )
++find_package( HIP REQUIRED CONFIG )
+ 
+ # The nvidia backend can be used to compile for CUDA devices.
+ # Specify the CUDA prefix in the CUDA_PREFIX variable.
+-- 
+2.45.2
+
diff --git a/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild
index 0c383fa01164..35da60ceea6b 100644
--- a/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild
+++ b/sci-libs/rocFFT/rocFFT-5.7.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -61,6 +61,7 @@ S="${WORKDIR}/rocFFT-rocm-${PV}"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch
+	"${FILESDIR}"/${PN}-6.1.1-find-hip-use-config.patch
 )
 
 required_mem() {
diff --git a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
index d1289f597217..da1508311eb7 100644
--- a/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
+++ b/sci-libs/rocFFT/rocFFT-6.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -59,6 +59,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch
+	"${FILESDIR}"/${PN}-6.1.1-find-hip-use-config.patch
 )
 
 required_mem() {
diff --git a/sci-libs/rocFFT/rocFFT-6.3.0.ebuild b/sci-libs/rocFFT/rocFFT-6.3.0.ebuild
index c1a62e09e1a5..474f33952068 100644
--- a/sci-libs/rocFFT/rocFFT-6.3.0.ebuild
+++ b/sci-libs/rocFFT/rocFFT-6.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -59,6 +59,7 @@ RESTRICT="!test? ( test )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.7.1-fix-rocm-link-path.patch
+	"${FILESDIR}"/${PN}-6.1.1-find-hip-use-config.patch
 )
 
 required_mem() {