gentoo auto-resync : 29:06:2024 - 08:00:25

5 files changed, 129 insertions, 5 deletions

diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest
index 049d78f07762..a44a14da182e 100644
--- a/media-libs/oidn/Manifest
+++ b/media-libs/oidn/Manifest
@@ -4,8 +4,10 @@ DIST oidn-1.4.2.tar.gz 54221996 BLAKE2B bb6593e2e15877f65d9224fc93dac72aff6d567a
 DIST oidn-1.4.3.tar.gz 54222682 BLAKE2B f9b585c318258fd78e221a453b64e83965a3e5035a912baa49e4d5b48466441bf1d3c15291de2cd4d36e9da187ff7a643bb9d4af5282cdbb8b6bc99fb3cda0d0 SHA512 6fbdf347763c0734140195a523cf0878b1dbd91d4943c9ce4928f6991549f8b3d5ab4d57b90e20a8d04a87d00e3a1554ce73a3a3c1e64fcb016a3c1f8aa07982
 DIST oidn-2.1.0.tar.gz 48977314 BLAKE2B 0fc32697df7fc6b8b367a78312a5b16ab68a5c88a2d19a8780e9de87c7e7096d7fe43dbd07928f2eba44c62fb4545338fc92f918dd4c33623259d0088a06a854 SHA512 508cb100f1a0a825774c2c01e0fc983e697341745fa0bfa48a99bfa70fc431f66fcdf17c3f170e40baefd7c3796a25d147f49cb17efbf1a1886556367c5c4566
 DIST oidn-2.2.2.tar.gz 49006605 BLAKE2B e3d32cc2112ded280e642c5d69fb2ef14db59df4f5224bff79e82ede207899c9dbfa43dc663ad9ccc15a6497e363df0b91b43660729962c410b7ec75ac1b3465 SHA512 eca18e9e22a40bc1381e75985e5f5e79f48cc6d168a2a703e54540967646487d347db290459e9a612d8ab4924e8d3c83d84664fd5318cca4f17745da1e47cf50
+DIST oidn-2.3.0.tar.gz 75300547 BLAKE2B 88a5922b4db63c48ab69047dca8d1077205a6d7a2112971badb0cd35e0b770017f5cdcc95d2ef07016fe2e990e3e5806ac6a0800b67086b958948c542f0dff6f SHA512 4f68ce3b0da37e1861090d60d7cd823046f325c45a8e2c3f4098eb3b4f7ec676d2acbb9c138ff60a9f83188dd0dcbaba42106aad96beafc5e65045c77c00f2f8
 EBUILD oidn-1.4.2.ebuild 707 BLAKE2B c8c98d1a61c78ae0524100200c9eb02c5d700e6afe043084d30910f822b1e5fb06c41d915ad4c85d213807484199d1d89ae72e86bc723a807015f9a76268f5b7 SHA512 06b247c86ffab4c4bb7ca0e9c9ebb6a20057a3eff294995eb9062c086b7d7e41f3d9e39e1e89c69924a76d5aaea41c5a8e1319a18f77e1a53b6d9bd9e58ea874
 EBUILD oidn-1.4.3.ebuild 709 BLAKE2B 83d6551d7c82d920a8339ff43a7ec966e4cd0179b5c0077624b889b600e9123de4cbb690003fffceed311928c333059c22e8f5e397c20763bdfeac47a2f32843 SHA512 90bcc6567182303fc1d15aee57784538e784c5eaae4c80abbc6d0d195162ffb9dd0b0dcfdd05bacea5895df060cd3946d34de2d01ae3f76dfdcc6cc80476d5f3
-EBUILD oidn-2.1.0.ebuild 1541 BLAKE2B 4acca5cb50fb55ca815cf9223f4369222b7e52d0ffe2a32e9a8ae07d73590abc606e7d766d575c651e56995e54d29fcd7fe62fb4a3982148f29a49191a3cb2ff SHA512 4b0a917c7c4bcf58cbe2c2bfff6a45cdf57a2b5d4828ef4b8ee1ee74e145593a4b0418181483e36eb3bf83061643ba62fb2c19b40220e0dccc37356ae6de016a
-EBUILD oidn-2.2.2.ebuild 1999 BLAKE2B a9622bdf44c181f3199e21b5fc79cc14b18169120b7d5fb0e317ea5262eb60c13971f34dd86b45bf4945b805c8ee5397ebcad86f2ebea45ea10b5e53d79a0677 SHA512 a4ccce38b7caf2e09a54bdcea667a81a5dc22439e3e953a484707d8d7dd0c126e7a4b806520af30d0a21eebb02d44bf8e078825c0b511a788ead4cd446ce8c25
-MISC metadata.xml 1002 BLAKE2B 09f5331ff0755f9d90597922ee23547ba27ba799bc75e7371bc43c9127e5d9b04954fb9741adb8df264b151afac78e1f51d157fdd2a917b3fd7bd4247fe0bf90 SHA512 8facceffdbe156e4216d70cce518d0bc4806b82fa58aa23f1a2feab7f29543d53cb79f91e525f67cd994e5d328a646cf47321fd054a4d37a2b2dcfb35aa2c318
+EBUILD oidn-2.1.0.ebuild 1745 BLAKE2B 623facc91063e88b56fdc80546e9b1b233a9b245f2441ba20277d11a11959d27a2d5277848530231b26b5b91cd583a43ac3c3a26bc9434678192510ece924ba5 SHA512 42ce153e58919b7addc88adacc11c30c8b7de2813b9f5d6a15dbdfa9b31b2ac39b097077a598bd2f7b2bc693892d64e8111e93e5de30cea39a712fdea1c87a17
+EBUILD oidn-2.2.2.ebuild 2191 BLAKE2B eb83d6bd78509557526685805f24fb64b3e422cd4b3e3fbc3011196a16a6a9386587f056bda509779a01d55e41b4bf5a497fb96cbdc078f98bd1b518aa3dbffe SHA512 3c81dab899bd07b05e2bd97764217e24eeb8e6644f47c9bc75f663c4d8b31f657af72b811bbec39b3024db49ea5ebc1108446b60431edcc9878ef736b8c6139a
+EBUILD oidn-2.3.0.ebuild 2192 BLAKE2B 43a1e3fa26d2245721072dfc2471e2b5a767314d56a5806b1233f22d75434dadf7bb160f4faf2f46ed71eb844bbe569012c0cb072ac8d789ad1007a150bc7570 SHA512 b774dafdca5a616fd04127442d2e40cb7c0486fbe0aa6269ab13cfec1eb7ccd20536d806d115bbd20962b650ad7596c0a3122edff1bfccd070cfea701bef4fc1
+MISC metadata.xml 995 BLAKE2B e4acf06e236b5d7497d7e19f20ccc961ea25da8dc3180d51ff76decd6f92cf4c927d6dbf96876ed47cb02e2ad7a42aa2571aa98d65e6b90afbe8a8142a3f090b SHA512 7f3b6cce23de7b0aade535b1fe1cb5af8bf622347731837e87cebcf28471a782825a599be79bf96bb69cd1ce5d36c9a9531d51cde1267cfc86453f94beb70d34
diff --git a/media-libs/oidn/metadata.xml b/media-libs/oidn/metadata.xml
index 228559585b99..eb65b09493a5 100644
--- a/media-libs/oidn/metadata.xml
+++ b/media-libs/oidn/metadata.xml
@@ -26,6 +26,6 @@
 		</flag>
 	</use>
 	<upstream>
-		<remote-id type="github">OpenImageDenoise/oidn</remote-id>
+		<remote-id type="github">RenderKit/oidn</remote-id>
 	</upstream>
 </pkgmetadata>
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 224f56744910..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
@@ -58,7 +64,6 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DOIDN_APPS="$(usex apps)"
-		-DOIDN_APPS_OPENIMAGEIO="$(usex apps "$(usex openimageio)")"
 
 		-DOIDN_DEVICE_CPU="yes"
 		-DOIDN_DEVICE_CUDA="$(usex cuda)"
@@ -66,6 +71,10 @@ src_configure() {
 		# -DOIDN_DEVICE_SYCL="$(usex sycl)"
 	)
 
+	if use apps; then
+		mycmakeargs+=( -DOIDN_APPS_OPENIMAGEIO="$(usex openimageio)" )
+	fi
+
 	if use cuda; then
 		export CUDAHOSTCXX="$(cuda_gccdir)"
 	fi
diff --git a/media-libs/oidn/oidn-2.3.0.ebuild b/media-libs/oidn/oidn-2.3.0.ebuild
new file mode 100644
index 000000000000..0dd6f000d711
--- /dev/null
+++ b/media-libs/oidn/oidn-2.3.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..13} )
+LLVM_COMPAT=( {15..17} )
+ROCM_VERSION=5.7
+
+inherit cmake cuda llvm-r1 python-any-r1 rocm
+
+DESCRIPTION="Intel® Open Image Denoise library"
+HOMEPAGE="https://www.openimagedenoise.org https://github.com/RenderKit/oidn"
+
+if [[ ${PV} = *9999 ]]; then
+	EGIT_REPO_URI="https://github.com/RenderKit/oidn.git"
+	EGIT_BRANCH="master"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RenderKit/${PN}/releases/download/v${PV}/${P}.src.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+REQUIRED_USE="
+	test? ( apps )
+"
+IUSE="apps cuda hip openimageio test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	dev-cpp/tbb:=
+	dev-lang/ispc
+	cuda? ( dev-util/nvidia-cuda-toolkit )
+	hip? ( dev-util/hip )
+	openimageio? ( media-libs/openimageio:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${PYTHON_DEPS}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.2-amdgpu-targets.patch"
+)
+
+src_prepare() {
+	if use cuda; then
+		cuda_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
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DOIDN_APPS="$(usex apps)"
+
+		-DOIDN_DEVICE_CPU="yes"
+		-DOIDN_DEVICE_CUDA="$(usex cuda)"
+		-DOIDN_DEVICE_HIP="$(usex hip)"
+		# -DOIDN_DEVICE_SYCL="$(usex sycl)"
+	)
+
+	if use apps; then
+		mycmakeargs+=( -DOIDN_APPS_OPENIMAGEIO="$(usex openimageio)" )
+	fi
+
+	if use cuda; then
+		export CUDAHOSTCXX="$(cuda_gccdir)"
+	fi
+
+	if use hip; then
+		mycmakeargs+=(
+			-DROCM_PATH="${EPREFIX}/usr"
+			-DOIDN_DEVICE_HIP_COMPILER="$(get_llvm_prefix)/bin/clang++" # use HIPHOSTCOMPILER
+			-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_test() {
+	"${BUILD_DIR}"/oidnTest || die "There were test faliures!"
+}
+
+src_install() {
+	cmake_src_install
+
+	if use hip || use cuda ; then
+		# remove garbage in /var/tmp left by subprojects
+		rm -rf "${ED}"/var || die
+	fi
+}