From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 324421580EB for ; Thu, 22 May 2025 16:08:30 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 20E103430F7 for ; Thu, 22 May 2025 16:08:30 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id DF82D110480; Thu, 22 May 2025 16:08:24 +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)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id D2D4511047D for ; Thu, 22 May 2025 16:08:24 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7F38D3430F9 for ; Thu, 22 May 2025 16:08:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2181327FD for ; Thu, 22 May 2025 16:08:23 +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: <1747930015.fa8c87fbc4ae5a8c0b45d854cfdb435c8ab64670.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.3.3-r1.ebuild media-libs/oidn/oidn-2.3.3.ebuild X-VCS-Directories: media-libs/oidn/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: fa8c87fbc4ae5a8c0b45d854cfdb435c8ab64670 X-VCS-Branch: master Date: Thu, 22 May 2025 16:08:23 +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: cbb1bdd4-dc65-4c1e-a9cc-5eb19ac19e4c X-Archives-Hash: ff05f567469af56f295951d052dbce0d commit: fa8c87fbc4ae5a8c0b45d854cfdb435c8ab64670 Author: Sebastian Parborg blender org> AuthorDate: Thu May 22 10:48:29 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu May 22 16:06:55 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa8c87fb media-libs/oidn: Fix hip compilation errors Debundling the included sci-libs/composable-kernel lib lead to compilation issues. Because it took over 12 hours to compile sci-libs/composable-kernel on my computer, and less than 10 minutes to compile oidn with the bundled composable-kernel lib, I think it is best to not debundle this library. Closes: https://bugs.gentoo.org/955869 Signed-off-by: Sebastian Parborg gmail.com> Part-of: https://github.com/gentoo/gentoo/pull/42204 Signed-off-by: Sam James gentoo.org> media-libs/oidn/{oidn-2.3.3.ebuild => oidn-2.3.3-r1.ebuild} | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/media-libs/oidn/oidn-2.3.3.ebuild b/media-libs/oidn/oidn-2.3.3-r1.ebuild similarity index 89% rename from media-libs/oidn/oidn-2.3.3.ebuild rename to media-libs/oidn/oidn-2.3.3-r1.ebuild index 99190032032e..bb2f53c3a65c 100644 --- a/media-libs/oidn/oidn-2.3.3.ebuild +++ b/media-libs/oidn/oidn-2.3.3-r1.ebuild @@ -39,7 +39,6 @@ RDEPEND=" ) hip? ( dev-util/hip:= - sci-libs/composable-kernel ) openimageio? ( media-libs/openimageio:= ) " @@ -64,7 +63,10 @@ src_prepare() { # do not fortify source -- bug 895018 sed -e "s/-D_FORTIFY_SOURCE=2//g" -i {cmake/oidn_platform,external/mkl-dnn/cmake/SDL}.cmake || die - rm -r external/{composable_kernel,cutlass,mkl-dnn} || die + # Don't de-bundle composable_kernel for two reasons: + # 1. sci-libs/composable-kernel takes a very long time to compile and oidn only uses a subset of it. + # 2. We've run into compilation issues when trying to debundle it. See #955869 + rm -r external/{cutlass,mkl-dnn} || die cmake_src_prepare }