public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/
Date: Fri, 28 Jun 2024 17:00:45 +0000 (UTC)	[thread overview]
Message-ID: <1719593997.346e44ed6db289af634a9f88a5624430ca13f3aa.sam@gentoo> (raw)

commit:     346e44ed6db289af634a9f88a5624430ca13f3aa
Author:     Aliaksei Urbanski <aliaksei.urbanski <AT> gmail <DOT> com>
AuthorDate: Wed Jun 26 03:54:29 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Jun 28 16:59:57 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=346e44ed

media-libs/oidn: fix missing ROCm in 2.x

Closes: https://bugs.gentoo.org/930391
Signed-off-by: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/oidn/oidn-2.1.0.ebuild | 10 ++++++++++
 media-libs/oidn/oidn-2.2.2.ebuild |  6 ++++++
 2 files changed, 16 insertions(+)

diff --git a/media-libs/oidn/oidn-2.1.0.ebuild b/media-libs/oidn/oidn-2.1.0.ebuild
index f3b63b4ce34d..6f9b87d1f737 100644
--- a/media-libs/oidn/oidn-2.1.0.ebuild
+++ b/media-libs/oidn/oidn-2.1.0.ebuild
@@ -43,6 +43,16 @@ PATCHES=(
 	"${FILESDIR}/${PN}-2.1.0-amdgpu-targets.patch"
 )
 
+src_prepare() {
+	if use hip; then
+		# https://bugs.gentoo.org/930391
+		sed "/-Wno-unused-result/s:): --rocm-path=${EPREFIX}/usr/lib):" \
+			-i devices/hip/CMakeLists.txt || die
+	fi
+
+	cmake_src_prepare
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DOIDN_DEVICE_CUDA=$(usex cuda)

diff --git a/media-libs/oidn/oidn-2.2.2.ebuild b/media-libs/oidn/oidn-2.2.2.ebuild
index 4dcd0fbebb18..1d059c48a8b6 100644
--- a/media-libs/oidn/oidn-2.2.2.ebuild
+++ b/media-libs/oidn/oidn-2.2.2.ebuild
@@ -50,6 +50,12 @@ src_prepare() {
 		addpredict "/proc/self/task/"
 	fi
 
+	if use hip; then
+		# https://bugs.gentoo.org/930391
+		sed "/-Wno-unused-result/s:): --rocm-path=${EPREFIX}/usr/lib):" \
+			-i devices/hip/CMakeLists.txt || die
+	fi
+
 	sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die
 
 	cmake_src_prepare


             reply	other threads:[~2024-06-28 17:00 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-06-28 17:00 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-05-22 16:08 [gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/ Sam James
2025-04-28 14:01 Sam James
2025-03-07 13:22 Sam James
2025-03-07 13:22 Sam James
2025-01-05 17:49 Arthur Zamarin
2024-09-05  2:12 Sam James
2024-06-28 17:00 Sam James
2024-06-28 17:00 Sam James
2024-03-25 18:57 Sam James
2024-03-25 18:57 Sam James
2023-05-01  0:47 Sam James
2023-04-09 12:35 Arthur Zamarin
2022-12-24 14:06 Andreas Sturmlechner
2022-07-09  5:57 Sam James
2022-06-07  8:26 Jakov Smolić
2022-01-02  3:29 Sam James
2021-10-31  5:53 Sam James
2021-10-29 22:23 Sam James
2021-09-19  3:30 Sam James
2021-09-19  3:09 Sam James
2021-09-19  3:09 Sam James
2021-08-18 23:34 Sam James
2021-08-18 23:34 Sam James
2021-06-10  0:51 Sam James

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1719593997.346e44ed6db289af634a9f88a5624430ca13f3aa.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox