From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0090A15802E for ; Fri, 28 Jun 2024 17:00:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D4212BC013; Fri, 28 Jun 2024 17:00:48 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 803B32BC013 for ; Fri, 28 Jun 2024 17:00:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 661ED33BEB9 for ; Fri, 28 Jun 2024 17:00:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CF5B21CFB for ; Fri, 28 Jun 2024 17:00:45 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1719593997.346e44ed6db289af634a9f88a5624430ca13f3aa.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/oidn/oidn-2.1.0.ebuild media-libs/oidn/oidn-2.2.2.ebuild X-VCS-Directories: media-libs/oidn/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 346e44ed6db289af634a9f88a5624430ca13f3aa X-VCS-Branch: master Date: Fri, 28 Jun 2024 17:00:45 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3b13c8cf-d323-4154-9c42-4a96b8372780 X-Archives-Hash: 11caef0a859085697135dc5550ca0585 commit: 346e44ed6db289af634a9f88a5624430ca13f3aa Author: Aliaksei Urbanski gmail com> AuthorDate: Wed Jun 26 03:54:29 2024 +0000 Commit: Sam James gentoo 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 gmail.com> Signed-off-by: Sam James 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