[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2024-09-04 Thread Sam James
commit: 1d77a56c1525bfadacdebfb7f36e3d44e2076bce
Author: Paul Zander  gmail  com>
AuthorDate: Wed Sep  4 11:03:36 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Sep  5 02:11:29 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1d77a56c

media-libs/oidn: add clang/llvm dependency

https://bugs.gentoo.org/936899
Signed-off-by: Paul Zander  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-libs/oidn/oidn-2.2.2.ebuild | 9 +++--
 media-libs/oidn/oidn-2.3.0.ebuild | 9 +++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/media-libs/oidn/oidn-2.2.2.ebuild 
b/media-libs/oidn/oidn-2.2.2.ebuild
index 1d059c48a8b6..193b91c619d1 100644
--- a/media-libs/oidn/oidn-2.2.2.ebuild
+++ b/media-libs/oidn/oidn-2.2.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..12} )
-LLVM_COMPAT=( {15..17} )
+LLVM_COMPAT=( {15..18} )
 ROCM_VERSION=5.7
 
 inherit cuda cmake python-single-r1 llvm-r1 rocm
@@ -38,7 +38,12 @@ RDEPEND="
hip? ( dev-util/hip )
openimageio? ( media-libs/openimageio:= )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+   $(llvm_gen_dep '
+   sys-devel/clang:${LLVM_SLOT}=
+   sys-devel/llvm:${LLVM_SLOT}=
+   ')
+"
 
 PATCHES=(
"${FILESDIR}/${PN}-2.2.2-amdgpu-targets.patch"

diff --git a/media-libs/oidn/oidn-2.3.0.ebuild 
b/media-libs/oidn/oidn-2.3.0.ebuild
index 0dd6f000d711..3ff4eb5cf3fc 100644
--- a/media-libs/oidn/oidn-2.3.0.ebuild
+++ b/media-libs/oidn/oidn-2.3.0.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{10..13} )
-LLVM_COMPAT=( {15..17} )
+LLVM_COMPAT=( {15..18} )
 ROCM_VERSION=5.7
 
 inherit cmake cuda llvm-r1 python-any-r1 rocm
@@ -36,7 +36,12 @@ RDEPEND="
hip? ( dev-util/hip )
openimageio? ( media-libs/openimageio:= )
 "
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+   $(llvm_gen_dep '
+   sys-devel/clang:${LLVM_SLOT}=
+   sys-devel/llvm:${LLVM_SLOT}=
+   ')
+"
 BDEPEND="${PYTHON_DEPS}"
 
 PATCHES=(



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2024-06-28 Thread Sam James
commit: 5728ebf0357d4c4e2af6131d90eb66ce5f832cd3
Author: Aliaksei Urbanski  gmail  com>
AuthorDate: Wed Jun 26 03:55:47 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 28 16:59:58 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5728ebf0

media-libs/oidn: add 2.3.0

Release:
  - https://github.com/RenderKit/oidn/releases/tag/v2.3.0

These changes also:
  - migrate from python-single-r1 to python-any-r1 eclass
  - add a repository url to the HOMEPAGE
  - update the remote-id

Signed-off-by: Aliaksei Urbanski  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/37305
Signed-off-by: Sam James  gentoo.org>

 media-libs/oidn/Manifest  |   1 +
 media-libs/oidn/metadata.xml  |   2 +-
 media-libs/oidn/oidn-2.3.0.ebuild | 103 ++
 3 files changed, 105 insertions(+), 1 deletion(-)

diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest
index 6fd58c05f4a3..ddfbcf30a9c5 100644
--- a/media-libs/oidn/Manifest
+++ b/media-libs/oidn/Manifest
@@ -2,3 +2,4 @@ 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

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 @@



-   OpenImageDenoise/oidn
+   RenderKit/oidn

 

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 ..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} = * ]]; 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
+   ex

[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2024-06-28 Thread Sam James
commit: 346e44ed6db289af634a9f88a5624430ca13f3aa
Author: Aliaksei Urbanski  gmail  com>
AuthorDate: Wed Jun 26 03:54:29 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 28 16:59:57 2024 +
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



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2024-06-28 Thread Sam James
commit: 38a03982ee1842298b6ec3fd262113a166b70e84
Author: Aliaksei Urbanski  gmail  com>
AuthorDate: Wed Jun 26 03:32:46 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 28 16:59:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38a03982

media-libs/oidn: fix a not used CMake variable in 2.2.2

Closes: https://bugs.gentoo.org/928424
Signed-off-by: Aliaksei Urbanski  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-libs/oidn/oidn-2.2.2.ebuild | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-libs/oidn/oidn-2.2.2.ebuild 
b/media-libs/oidn/oidn-2.2.2.ebuild
index 224f56744910..4dcd0fbebb18 100644
--- a/media-libs/oidn/oidn-2.2.2.ebuild
+++ b/media-libs/oidn/oidn-2.2.2.ebuild
@@ -58,7 +58,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 +65,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



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2024-03-25 Thread Sam James
commit: 2707e44b4ffda4c727b8e90082eb135eff78d521
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 25 18:56:35 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 25 18:56:35 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2707e44b

media-libs/oidn: disable py3.9

Signed-off-by: Sam James  gentoo.org>

 media-libs/oidn/oidn-2.1.0.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/oidn/oidn-2.1.0.ebuild 
b/media-libs/oidn/oidn-2.1.0.ebuild
index 4cc4883b6c7f..f3b63b4ce34d 100644
--- a/media-libs/oidn/oidn-2.1.0.ebuild
+++ b/media-libs/oidn/oidn-2.1.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..11} )
 LLVM_MAX_SLOT=17
 ROCM_VERSION=5.7
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2024-03-25 Thread Sam James
commit: 97d8456bc004b597ad85a2e53c605792bfebfa5e
Author: Sebastian Parborg  gmail  com>
AuthorDate: Wed Jan 17 11:40:03 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 25 18:54:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97d8456b

media-libs/oidn: Bump to 2.1.0

Signed-off-by: Sebastian Parborg  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-libs/oidn/Manifest  |  1 +
 media-libs/oidn/metadata.xml  |  8 ++
 media-libs/oidn/oidn-2.1.0.ebuild | 51 +++
 3 files changed, 60 insertions(+)

diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest
index 3de806ec15a7..489f13abaf7b 100644
--- a/media-libs/oidn/Manifest
+++ b/media-libs/oidn/Manifest
@@ -1,2 +1,3 @@
 DIST oidn-1.4.2.tar.gz 54221996 BLAKE2B 
bb6593e2e15877f65d9224fc93dac72aff6d567a00d727b050a88a1add4dc1441e695dc38056dd796e004e20916054b43ed7d0e90f22a16597f6617cf6a119e7
 SHA512 
8b464cedc91ef7a88cfc97c3fde80275b12058cdd26b352718d90f8f20b3462c4ac65b2b1ad5548a520590fbd015fcc8ab9f964633bc8b89d72901fe8a13e352
 DIST oidn-1.4.3.tar.gz 54222682 BLAKE2B 
f9b585c318258fd78e221a453b64e83965a3e5035a912baa49e4d5b48466441bf1d3c15291de2cd4d36e9da187ff7a643bb9d4af5282cdbb8b6bc99fb3cda0d0
 SHA512 
6fbdf347763c0734140195a523cf0878b1dbd91d4943c9ce4928f6991549f8b3d5ab4d57b90e20a8d04a87d00e3a1554ce73a3a3c1e64fcb016a3c1f8aa07982
+DIST oidn-2.1.0.tar.gz 48977314 BLAKE2B 
0fc32697df7fc6b8b367a78312a5b16ab68a5c88a2d19a8780e9de87c7e7096d7fe43dbd07928f2eba44c62fb4545338fc92f918dd4c33623259d0088a06a854
 SHA512 
508cb100f1a0a825774c2c01e0fc983e697341745fa0bfa48a99bfa70fc431f66fcdf17c3f170e40baefd7c3796a25d147f49cb17efbf1a1886556367c5c4566

diff --git a/media-libs/oidn/metadata.xml b/media-libs/oidn/metadata.xml
index e0663448..448ccc40008f 100644
--- a/media-libs/oidn/metadata.xml
+++ b/media-libs/oidn/metadata.xml
@@ -14,6 +14,14 @@
high-quality denoising filters for images rendered with ray 
tracing. Intel
Open Image Denoise is part of the Intel® oneAPI Rendering 
Toolkit and is

+   
+   
+   Build the standalone denoise, self test, and benchmark 
binaries.
+   
+   
+   Build OIDN with AMD HIP support.
+   
+   

OpenImageDenoise/oidn


diff --git a/media-libs/oidn/oidn-2.1.0.ebuild 
b/media-libs/oidn/oidn-2.1.0.ebuild
new file mode 100644
index ..2eab9e4151b6
--- /dev/null
+++ b/media-libs/oidn/oidn-2.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Intel(R) Open Image Denoise library"
+HOMEPAGE="https://www.openimagedenoise.org/";
+
+if [[ ${PV} = * ]]; then
+   EGIT_REPO_URI="https://github.com/OpenImageDenoise/oidn.git";
+   EGIT_BRANCH="master"
+   inherit git-r3
+else
+   
SRC_URI="https://github.com/OpenImageDenoise/${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="
+   ${PYTHON_REQUIRED_USE}
+   test? ( apps )
+"
+IUSE="apps cuda hip test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-cpp/tbb:=
+   dev-lang/ispc
+   cuda? ( dev-util/nvidia-cuda-toolkit )
+   hip? ( dev-util/hip )
+"
+DEPEND="${RDEPEND}"
+
+src_configure() {
+   local mycmakeargs=(
+   -DOIDN_DEVICE_CUDA=$(usex cuda)
+   -DOIDN_DEVICE_HIP=$(usex hip)
+   -DOIDN_APPS=$(usex apps)
+   )
+   cmake_src_configure
+}
+
+src_test() {
+   "${BUILD_DIR}"/oidnTest || die "There were test faliures!"
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/, media-libs/oidn/files/

2024-03-25 Thread Sam James
commit: 24c3de08e5ef07f46d1a887e8ad8a56821012a60
Author: Sv. Lockal  gmail  com>
AuthorDate: Fri Jan 19 21:12:57 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 25 18:54:57 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24c3de08

media-libs/oidn: apply Gentoo-related fixes for hip suport

Signed-off-by: Sv. Lockal  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../oidn/files/oidn-2.1.0-amdgpu-targets.patch | 46 ++
 media-libs/oidn/oidn-2.1.0.ebuild  | 28 -
 2 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/media-libs/oidn/files/oidn-2.1.0-amdgpu-targets.patch 
b/media-libs/oidn/files/oidn-2.1.0-amdgpu-targets.patch
new file mode 100644
index ..90d3c17f38cc
--- /dev/null
+++ b/media-libs/oidn/files/oidn-2.1.0-amdgpu-targets.patch
@@ -0,0 +1,46 @@
+Allow specifying AMDGPU_TARGETS with CMake flags.
+Fix build when main compiler is set to GCC.
+--- a/devices/CMakeLists.txt
 b/devices/CMakeLists.txt
+@@ -123,6 +123,10 @@ if(OIDN_DEVICE_HIP)
+   )
+   mark_as_advanced(OIDN_DEVICE_HIP_COMPILER)
+ 
++  set(AMDGPU_TARGETS 
"gfx1030;gfx1031;gfx1032;gfx1033;gfx1034;gfx1035;gfx1036;gfx1100;gfx1101;gfx1102;gfx1103"
 CACHE STRING "AMD GPU targets to compile for")
++  mark_as_advanced(AMDGPU_TARGETS)
++  message(STATUS "AMD targets: ${AMDGPU_TARGETS}")
++
+   # Add ROCm to CMAKE_PREFIX_PATH
+   set(_hip_prefix_path CMAKE_PREFIX_PATH)
+   list(APPEND _hip_prefix_path ${ROCM_PATH}/hip ${ROCM_PATH})
+@@ -137,7 +141,6 @@ if(OIDN_DEVICE_HIP)
+ CMAKE_CACHE_ARGS
+   -DCMAKE_PREFIX_PATH:STRING=${_hip_prefix_path_str}
+   -DCMAKE_CXX_COMPILER:FILEPATH=${OIDN_DEVICE_HIP_COMPILER}
+-  -DCMAKE_TOOLCHAIN_FILE:FILEPATH=${CMAKE_TOOLCHAIN_FILE}
+   -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
+   -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_CURRENT_BINARY_DIR}/hip/preinstall
+   -DCMAKE_INSTALL_BINDIR:PATH=${CMAKE_INSTALL_BINDIR}
+@@ -149,6 +152,9 @@ if(OIDN_DEVICE_HIP)
+   -DOIDN_API_NAMESPACE:STRING=${OIDN_API_NAMESPACE}
+   -DOIDN_WARN_AS_ERRORS:BOOL=${OIDN_WARN_AS_ERRORS}
+   -DOIDN_SANITIZER:STRING=${OIDN_SANITIZER}
++  -DGPU_TARGETS:STRING=${AMDGPU_TARGETS}
++  -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
++  -G "${CMAKE_GENERATOR}"
+ BUILD_ALWAYS TRUE
+ DEPENDS
+   OpenImageDenoise_core
+--- a/devices/hip/CMakeLists.txt
 b/devices/hip/CMakeLists.txt
+@@ -25,8 +25,8 @@ include(oidn_common_external)
+ # FIXME: The HIP runtime has a bug that causes a crash if the kernels are not 
compiled for all
+ # targets detected in the system. As a workaround, we compile for more 
targets then we actually
+ # support to avoid the crash on systems with dedicated + integrated GPUs.
+-set(GPU_TARGETS 
"gfx1030,gfx1031,gfx1032,gfx1033,gfx1034,gfx1035,gfx1036,gfx1100,gfx1101,gfx1102,gfx1103"
 CACHE INTERNAL "")
+-set(AMDGPU_TARGETS ${GPU_TARGETS} CACHE INTERNAL "")
++set(GPU_TARGETS 
"gfx1030;gfx1031;gfx1032;gfx1033;gfx1034;gfx1035;gfx1036;gfx1100;gfx1101;gfx1102;gfx1103"
 CACHE STRING "")
++set(AMDGPU_TARGETS ${GPU_TARGETS} CACHE STRING "")
+ 
+ # Find HIP
+ find_package(hip REQUIRED)

diff --git a/media-libs/oidn/oidn-2.1.0.ebuild 
b/media-libs/oidn/oidn-2.1.0.ebuild
index 2eab9e4151b6..4cc4883b6c7f 100644
--- a/media-libs/oidn/oidn-2.1.0.ebuild
+++ b/media-libs/oidn/oidn-2.1.0.ebuild
@@ -1,11 +1,13 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
+LLVM_MAX_SLOT=17
+ROCM_VERSION=5.7
 
-inherit cmake python-single-r1
+inherit cmake python-single-r1 llvm rocm
 
 DESCRIPTION="Intel(R) Open Image Denoise library"
 HOMEPAGE="https://www.openimagedenoise.org/";
@@ -37,15 +39,37 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+   "${FILESDIR}/${PN}-2.1.0-amdgpu-targets.patch"
+)
+
 src_configure() {
local mycmakeargs=(
-DOIDN_DEVICE_CUDA=$(usex cuda)
-DOIDN_DEVICE_HIP=$(usex hip)
-DOIDN_APPS=$(usex apps)
)
+
+   if use hip; then
+   mycmakeargs+=(
+   -DROCM_PATH="${EPREFIX}/usr"
+   -DOIDN_DEVICE_HIP_COMPILER="$(get_llvm_prefix 
${LLVM_MAX_SLOT})/bin/clang++"
+   -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
+}



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2023-04-30 Thread Sam James
commit: 297571f6f41b886c316c68a55c04b27bf926397c
Author: Sam James  gentoo  org>
AuthorDate: Mon May  1 00:46:50 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 00:46:50 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=297571f6

media-libs/oidn: Stabilize 1.4.3 amd64, #904612

Signed-off-by: Sam James  gentoo.org>

 media-libs/oidn/oidn-1.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/oidn/oidn-1.4.3.ebuild 
b/media-libs/oidn/oidn-1.4.3.ebuild
index a23c3a4e8e35..91c7b0fc2b45 100644
--- a/media-libs/oidn/oidn-1.4.3.ebuild
+++ b/media-libs/oidn/oidn-1.4.3.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = * ]]; then
inherit git-r3
 else

SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="Apache-2.0"



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2023-04-09 Thread Arthur Zamarin
commit: 801be406612d47050cb9a3a64b6a9b58eee1b586
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Sun Apr  9 12:13:16 2023 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Sun Apr  9 12:34:59 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=801be406

media-libs/oidn: enable py3.11

Closes: https://bugs.gentoo.org/897010
Signed-off-by: Arthur Zamarin  gentoo.org>

 media-libs/oidn/oidn-1.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/oidn/oidn-1.4.3.ebuild 
b/media-libs/oidn/oidn-1.4.3.ebuild
index 74df9de28b15..a23c3a4e8e35 100644
--- a/media-libs/oidn/oidn-1.4.3.ebuild
+++ b/media-libs/oidn/oidn-1.4.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit cmake python-single-r1
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2022-12-24 Thread Andreas Sturmlechner
commit: 93c1be909c25e9d128da3c40ac3d7e25c533cadd
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 20 22:10:24 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 24 14:06:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93c1be90

media-libs/oidn: drop 1.3.0-r1, 1.4.1-r1

Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/oidn/Manifest |  3 ---
 media-libs/oidn/oidn-1.3.0-r1.ebuild | 40 
 media-libs/oidn/oidn-1.4.1-r1.ebuild | 37 -
 3 files changed, 80 deletions(-)

diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest
index 141f198a8ef9..3de806ec15a7 100644
--- a/media-libs/oidn/Manifest
+++ b/media-libs/oidn/Manifest
@@ -1,5 +1,2 @@
-DIST oidn-1.3.0-glibc.patch.bz2 6359 BLAKE2B 
743cd87f92bc89182de716254f89136e6907bd18ec0d589b3338e7e89a364797cecd8d398c90acca0df74a1390d06ece7c44864710c9819c370b3922843a6300
 SHA512 
b1f132fbdadef9b5efa3769dcceba34b7c2619030a79314146861b58e81e5757f3beed247670ccea8886f3a32819eba4433481d3bac27cd29031546093ec58d8
-DIST oidn-1.3.0.tar.gz 36763571 BLAKE2B 
395d7aafd87babf7d2414ed940dd85adf4a488df2138e0e63cc82ac06088dd969879de73d79bead4b35bba0045081ee637b72f2a98770dbfc928ffe7c25da78a
 SHA512 
19de3cf11b9d436ee6f33ff020187a4cdc05da5f43c47509f715ca99e4276bfb64425d0a48f3a6f0569c8c6701b46a7e35378f371fdbacc0b6d488e113ffe17c
-DIST oidn-1.4.1.tar.gz 50448597 BLAKE2B 
f5a1dcafa058eb1fa46f1b397599075f45ca0145e51692014a47405e9d1ac2f681a1a23ead50d6bdfcf1750f7504a992218b65d984a6daf2780e829598172f3c
 SHA512 
6551bb038692a1c00a0a408f1682d8609a8c74470a2c4f439af80c1332d4237e723a655a9b7ef95f93c6cbe52fdb3a46a84539f5cdc90073d716afd7b48c3615
 DIST oidn-1.4.2.tar.gz 54221996 BLAKE2B 
bb6593e2e15877f65d9224fc93dac72aff6d567a00d727b050a88a1add4dc1441e695dc38056dd796e004e20916054b43ed7d0e90f22a16597f6617cf6a119e7
 SHA512 
8b464cedc91ef7a88cfc97c3fde80275b12058cdd26b352718d90f8f20b3462c4ac65b2b1ad5548a520590fbd015fcc8ab9f964633bc8b89d72901fe8a13e352
 DIST oidn-1.4.3.tar.gz 54222682 BLAKE2B 
f9b585c318258fd78e221a453b64e83965a3e5035a912baa49e4d5b48466441bf1d3c15291de2cd4d36e9da187ff7a643bb9d4af5282cdbb8b6bc99fb3cda0d0
 SHA512 
6fbdf347763c0734140195a523cf0878b1dbd91d4943c9ce4928f6991549f8b3d5ab4d57b90e20a8d04a87d00e3a1554ce73a3a3c1e64fcb016a3c1f8aa07982

diff --git a/media-libs/oidn/oidn-1.3.0-r1.ebuild 
b/media-libs/oidn/oidn-1.3.0-r1.ebuild
deleted file mode 100644
index d4457dbdc0d2..
--- a/media-libs/oidn/oidn-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="Intel(R) Open Image Denoise library"
-HOMEPAGE="http://www.openimagedenoise.org/";
-
-if [[ ${PV} = * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/OpenImageDenoise/oidn.git";
-   EGIT_BRANCH="master"
-else
-   
SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz
 -> ${P}.tar.gz"
-   SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-glibc.patch.bz2";
-   KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="Apache-2.0"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-cpp/tbb:=
-   dev-lang/ispc"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-util/cmake"
-
-CMAKE_BUILD_TYPE=Release
-
-PATCHES=( "${WORKDIR}"/oidn-1.3.0-glibc.patch )
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-}

diff --git a/media-libs/oidn/oidn-1.4.1-r1.ebuild 
b/media-libs/oidn/oidn-1.4.1-r1.ebuild
deleted file mode 100644
index 0583a3ff6201..
--- a/media-libs/oidn/oidn-1.4.1-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="Intel(R) Open Image Denoise library"
-HOMEPAGE="http://www.openimagedenoise.org/";
-
-if [[ ${PV} = * ]]; then
-   inherit git-r3
-   EGIT_REPO_URI="https://github.com/OpenImageDenoise/oidn.git";
-   EGIT_BRANCH="master"
-else
-   
SRC_URI="https://github.com/OpenImageDenoise/${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="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-   ${PYTHON_DEPS}
-   dev-cpp/tbb:=
-   dev-lang/ispc"
-DEPEND="${RDEPEND}"
-BDEPEND="dev-util/cmake"
-
-CMAKE_BUILD_TYPE=Release
-
-pkg_setup() {
-   python-single-r1_pkg_setup
-}



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2022-07-08 Thread Sam James
commit: ff2c1a9fcb61e26539a07cfa2cc7c498d04fb205
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul  9 05:37:56 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul  9 05:57:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff2c1a9f

media-libs/oidn: add 1.4.3

Signed-off-by: Sam James  gentoo.org>

 media-libs/oidn/Manifest  |  1 +
 media-libs/oidn/oidn-1.4.3.ebuild | 29 +
 2 files changed, 30 insertions(+)

diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest
index a88626757117..141f198a8ef9 100644
--- a/media-libs/oidn/Manifest
+++ b/media-libs/oidn/Manifest
@@ -2,3 +2,4 @@ DIST oidn-1.3.0-glibc.patch.bz2 6359 BLAKE2B 
743cd87f92bc89182de716254f89136e690
 DIST oidn-1.3.0.tar.gz 36763571 BLAKE2B 
395d7aafd87babf7d2414ed940dd85adf4a488df2138e0e63cc82ac06088dd969879de73d79bead4b35bba0045081ee637b72f2a98770dbfc928ffe7c25da78a
 SHA512 
19de3cf11b9d436ee6f33ff020187a4cdc05da5f43c47509f715ca99e4276bfb64425d0a48f3a6f0569c8c6701b46a7e35378f371fdbacc0b6d488e113ffe17c
 DIST oidn-1.4.1.tar.gz 50448597 BLAKE2B 
f5a1dcafa058eb1fa46f1b397599075f45ca0145e51692014a47405e9d1ac2f681a1a23ead50d6bdfcf1750f7504a992218b65d984a6daf2780e829598172f3c
 SHA512 
6551bb038692a1c00a0a408f1682d8609a8c74470a2c4f439af80c1332d4237e723a655a9b7ef95f93c6cbe52fdb3a46a84539f5cdc90073d716afd7b48c3615
 DIST oidn-1.4.2.tar.gz 54221996 BLAKE2B 
bb6593e2e15877f65d9224fc93dac72aff6d567a00d727b050a88a1add4dc1441e695dc38056dd796e004e20916054b43ed7d0e90f22a16597f6617cf6a119e7
 SHA512 
8b464cedc91ef7a88cfc97c3fde80275b12058cdd26b352718d90f8f20b3462c4ac65b2b1ad5548a520590fbd015fcc8ab9f964633bc8b89d72901fe8a13e352
+DIST oidn-1.4.3.tar.gz 54222682 BLAKE2B 
f9b585c318258fd78e221a453b64e83965a3e5035a912baa49e4d5b48466441bf1d3c15291de2cd4d36e9da187ff7a643bb9d4af5282cdbb8b6bc99fb3cda0d0
 SHA512 
6fbdf347763c0734140195a523cf0878b1dbd91d4943c9ce4928f6991549f8b3d5ab4d57b90e20a8d04a87d00e3a1554ce73a3a3c1e64fcb016a3c1f8aa07982

diff --git a/media-libs/oidn/oidn-1.4.3.ebuild 
b/media-libs/oidn/oidn-1.4.3.ebuild
new file mode 100644
index ..ac7878513748
--- /dev/null
+++ b/media-libs/oidn/oidn-1.4.3.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Intel(R) Open Image Denoise library"
+HOMEPAGE="https://www.openimagedenoise.org/";
+
+if [[ ${PV} = * ]]; then
+   EGIT_REPO_URI="https://github.com/OpenImageDenoise/oidn.git";
+   EGIT_BRANCH="master"
+   inherit git-r3
+else
+   
SRC_URI="https://github.com/OpenImageDenoise/${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="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+   dev-cpp/tbb:=
+   dev-lang/ispc"
+DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2022-06-07 Thread Jakov Smolić
commit: b8bdc220450bb667115fdcd45aae349fe25dcda8
Author: Jakov Smolić  gentoo  org>
AuthorDate: Tue Jun  7 08:25:36 2022 +
Commit: Jakov Smolić  gentoo  org>
CommitDate: Tue Jun  7 08:25:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8bdc220

media-libs/oidn: Stabilize 1.4.2 amd64, #850253

Signed-off-by: Jakov Smolić  gentoo.org>

 media-libs/oidn/oidn-1.4.2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/oidn/oidn-1.4.2.ebuild 
b/media-libs/oidn/oidn-1.4.2.ebuild
index 7768a0e3ea4b..d145282c1371 100644
--- a/media-libs/oidn/oidn-1.4.2.ebuild
+++ b/media-libs/oidn/oidn-1.4.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = * ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="Apache-2.0"



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2022-01-01 Thread Sam James
commit: 2fcac46033a4bef98277bc88be618c83d08c8e23
Author: Sam James  gentoo  org>
AuthorDate: Sun Jan  2 03:28:22 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan  2 03:28:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fcac460

media-libs/oidn: add 1.4.2

Closes: https://bugs.gentoo.org/830421
Signed-off-by: Sam James  gentoo.org>

 media-libs/oidn/Manifest  |  1 +
 media-libs/oidn/oidn-1.4.2.ebuild | 29 +
 2 files changed, 30 insertions(+)

diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest
index 8d62d7ab2a69..a88626757117 100644
--- a/media-libs/oidn/Manifest
+++ b/media-libs/oidn/Manifest
@@ -1,3 +1,4 @@
 DIST oidn-1.3.0-glibc.patch.bz2 6359 BLAKE2B 
743cd87f92bc89182de716254f89136e6907bd18ec0d589b3338e7e89a364797cecd8d398c90acca0df74a1390d06ece7c44864710c9819c370b3922843a6300
 SHA512 
b1f132fbdadef9b5efa3769dcceba34b7c2619030a79314146861b58e81e5757f3beed247670ccea8886f3a32819eba4433481d3bac27cd29031546093ec58d8
 DIST oidn-1.3.0.tar.gz 36763571 BLAKE2B 
395d7aafd87babf7d2414ed940dd85adf4a488df2138e0e63cc82ac06088dd969879de73d79bead4b35bba0045081ee637b72f2a98770dbfc928ffe7c25da78a
 SHA512 
19de3cf11b9d436ee6f33ff020187a4cdc05da5f43c47509f715ca99e4276bfb64425d0a48f3a6f0569c8c6701b46a7e35378f371fdbacc0b6d488e113ffe17c
 DIST oidn-1.4.1.tar.gz 50448597 BLAKE2B 
f5a1dcafa058eb1fa46f1b397599075f45ca0145e51692014a47405e9d1ac2f681a1a23ead50d6bdfcf1750f7504a992218b65d984a6daf2780e829598172f3c
 SHA512 
6551bb038692a1c00a0a408f1682d8609a8c74470a2c4f439af80c1332d4237e723a655a9b7ef95f93c6cbe52fdb3a46a84539f5cdc90073d716afd7b48c3615
+DIST oidn-1.4.2.tar.gz 54221996 BLAKE2B 
bb6593e2e15877f65d9224fc93dac72aff6d567a00d727b050a88a1add4dc1441e695dc38056dd796e004e20916054b43ed7d0e90f22a16597f6617cf6a119e7
 SHA512 
8b464cedc91ef7a88cfc97c3fde80275b12058cdd26b352718d90f8f20b3462c4ac65b2b1ad5548a520590fbd015fcc8ab9f964633bc8b89d72901fe8a13e352

diff --git a/media-libs/oidn/oidn-1.4.2.ebuild 
b/media-libs/oidn/oidn-1.4.2.ebuild
new file mode 100644
index ..7768a0e3ea4b
--- /dev/null
+++ b/media-libs/oidn/oidn-1.4.2.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+inherit cmake python-single-r1
+
+DESCRIPTION="Intel(R) Open Image Denoise library"
+HOMEPAGE="http://www.openimagedenoise.org/";
+
+if [[ ${PV} = * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/OpenImageDenoise/oidn.git";
+   EGIT_BRANCH="master"
+else
+   
SRC_URI="https://github.com/OpenImageDenoise/${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="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+   dev-cpp/tbb:=
+   dev-lang/ispc"
+DEPEND="${RDEPEND}"



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2021-10-30 Thread Sam James
commit: dd44c967d809e6c159dce53898d30d02b3d64eb7
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 31 05:53:36 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 31 05:53:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd44c967

media-libs/oidn: Stabilize 1.4.1-r1 amd64, #803884

Signed-off-by: Sam James  gentoo.org>

 media-libs/oidn/oidn-1.4.1-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/oidn/oidn-1.4.1-r1.ebuild 
b/media-libs/oidn/oidn-1.4.1-r1.ebuild
index a82182a13ef..0583a3ff620 100644
--- a/media-libs/oidn/oidn-1.4.1-r1.ebuild
+++ b/media-libs/oidn/oidn-1.4.1-r1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = * ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+   KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="Apache-2.0"



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2021-10-29 Thread Sam James
commit: 0525d5f3807029efc833314b978751b3d8430ff2
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 29 22:15:55 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 29 22:22:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0525d5f3

media-libs/oidn: add tbb subslot operator

Signed-off-by: Sam James  gentoo.org>

 media-libs/oidn/{oidn-1.3.0.ebuild => oidn-1.3.0-r1.ebuild} | 7 +++
 media-libs/oidn/{oidn-1.4.1.ebuild => oidn-1.4.1-r1.ebuild} | 7 +++
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/media-libs/oidn/oidn-1.3.0.ebuild 
b/media-libs/oidn/oidn-1.3.0-r1.ebuild
similarity index 93%
rename from media-libs/oidn/oidn-1.3.0.ebuild
rename to media-libs/oidn/oidn-1.3.0-r1.ebuild
index 9a557e648b0..d4457dbdc0d 100644
--- a/media-libs/oidn/oidn-1.3.0.ebuild
+++ b/media-libs/oidn/oidn-1.3.0-r1.ebuild
@@ -26,11 +26,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
${PYTHON_DEPS}
-   dev-cpp/tbb
+   dev-cpp/tbb:=
dev-lang/ispc"
-BDEPEND="
-   ${RDEPEND}
-   dev-util/cmake"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/cmake"
 
 CMAKE_BUILD_TYPE=Release
 

diff --git a/media-libs/oidn/oidn-1.4.1.ebuild 
b/media-libs/oidn/oidn-1.4.1-r1.ebuild
similarity index 92%
rename from media-libs/oidn/oidn-1.4.1.ebuild
rename to media-libs/oidn/oidn-1.4.1-r1.ebuild
index 86732c4f1ae..a82182a13ef 100644
--- a/media-libs/oidn/oidn-1.4.1.ebuild
+++ b/media-libs/oidn/oidn-1.4.1-r1.ebuild
@@ -25,11 +25,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
${PYTHON_DEPS}
-   dev-cpp/tbb
+   dev-cpp/tbb:=
dev-lang/ispc"
-BDEPEND="
-   ${RDEPEND}
-   dev-util/cmake"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/cmake"
 
 CMAKE_BUILD_TYPE=Release
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2021-09-18 Thread Sam James
commit: 7c4568505b57715025d849451eb873a36aee11fa
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 19 03:29:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 19 03:29:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c456850

media-libs/oidn: Keyword 1.4.1 ppc64, #795279

Signed-off-by: Sam James  gentoo.org>

 media-libs/oidn/oidn-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/oidn/oidn-1.4.1.ebuild 
b/media-libs/oidn/oidn-1.4.1.ebuild
index a824c2b3da9..86732c4f1ae 100644
--- a/media-libs/oidn/oidn-1.4.1.ebuild
+++ b/media-libs/oidn/oidn-1.4.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = * ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 fi
 
 LICENSE="Apache-2.0"



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2021-09-18 Thread Sam James
commit: c47bbea374c97132bcda5597a206505ddec69a28
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 19 03:08:14 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 19 03:08:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c47bbea3

media-libs/oidn: Keyword 1.4.1 arm, #795279

Signed-off-by: Sam James  gentoo.org>

 media-libs/oidn/oidn-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/oidn/oidn-1.4.1.ebuild 
b/media-libs/oidn/oidn-1.4.1.ebuild
index 5d5194d1eff..a824c2b3da9 100644
--- a/media-libs/oidn/oidn-1.4.1.ebuild
+++ b/media-libs/oidn/oidn-1.4.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = * ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~arm64 ~x86"
+   KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 fi
 
 LICENSE="Apache-2.0"



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2021-09-18 Thread Sam James
commit: 999d2289e23f5892424fe211ce702ff7ae613da1
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 19 03:08:03 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 19 03:08:03 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=999d2289

media-libs/oidn: Keyword 1.4.1 arm64, #795279

Signed-off-by: Sam James  gentoo.org>

 media-libs/oidn/oidn-1.4.1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/oidn/oidn-1.4.1.ebuild 
b/media-libs/oidn/oidn-1.4.1.ebuild
index c93dbc1e24a..5d5194d1eff 100644
--- a/media-libs/oidn/oidn-1.4.1.ebuild
+++ b/media-libs/oidn/oidn-1.4.1.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = * ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz
 -> ${P}.tar.gz"
-   KEYWORDS="~amd64 ~x86"
+   KEYWORDS="~amd64 ~arm64 ~x86"
 fi
 
 LICENSE="Apache-2.0"



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2021-08-18 Thread Sam James
commit: 099079fe4f9bc6f20ef5cd2790c2298f784920b1
Author: Sebastian Parborg  gmail  com>
AuthorDate: Sun Aug 15 12:15:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 18 23:34:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=099079fe

media-libs/oidn: Version bump

Signed-off-by: Sebastian Parborg  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-libs/oidn/Manifest |  1 +
 media-libs/oidn/oidn-1.3.0.ebuild|  7 +++
 media-libs/oidn/{oidn-1.3.0.ebuild => oidn-1.4.1.ebuild} | 10 +++---
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest
index be014d08b06..8d62d7ab2a6 100644
--- a/media-libs/oidn/Manifest
+++ b/media-libs/oidn/Manifest
@@ -1,2 +1,3 @@
 DIST oidn-1.3.0-glibc.patch.bz2 6359 BLAKE2B 
743cd87f92bc89182de716254f89136e6907bd18ec0d589b3338e7e89a364797cecd8d398c90acca0df74a1390d06ece7c44864710c9819c370b3922843a6300
 SHA512 
b1f132fbdadef9b5efa3769dcceba34b7c2619030a79314146861b58e81e5757f3beed247670ccea8886f3a32819eba4433481d3bac27cd29031546093ec58d8
 DIST oidn-1.3.0.tar.gz 36763571 BLAKE2B 
395d7aafd87babf7d2414ed940dd85adf4a488df2138e0e63cc82ac06088dd969879de73d79bead4b35bba0045081ee637b72f2a98770dbfc928ffe7c25da78a
 SHA512 
19de3cf11b9d436ee6f33ff020187a4cdc05da5f43c47509f715ca99e4276bfb64425d0a48f3a6f0569c8c6701b46a7e35378f371fdbacc0b6d488e113ffe17c
+DIST oidn-1.4.1.tar.gz 50448597 BLAKE2B 
f5a1dcafa058eb1fa46f1b397599075f45ca0145e51692014a47405e9d1ac2f681a1a23ead50d6bdfcf1750f7504a992218b65d984a6daf2780e829598172f3c
 SHA512 
6551bb038692a1c00a0a408f1682d8609a8c74470a2c4f439af80c1332d4237e723a655a9b7ef95f93c6cbe52fdb3a46a84539f5cdc90073d716afd7b48c3615

diff --git a/media-libs/oidn/oidn-1.3.0.ebuild 
b/media-libs/oidn/oidn-1.3.0.ebuild
index 707a8eebfe2..9a557e648b0 100644
--- a/media-libs/oidn/oidn-1.3.0.ebuild
+++ b/media-libs/oidn/oidn-1.3.0.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
-inherit cmake python-single-r1 eutils
+inherit cmake python-single-r1
 
 DESCRIPTION="Intel(R) Open Image Denoise library"
 HOMEPAGE="http://www.openimagedenoise.org/";
@@ -22,14 +22,13 @@ fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
${PYTHON_DEPS}
dev-cpp/tbb
dev-lang/ispc"
-DEPEND="
+BDEPEND="
${RDEPEND}
dev-util/cmake"
 

diff --git a/media-libs/oidn/oidn-1.3.0.ebuild 
b/media-libs/oidn/oidn-1.4.1.ebuild
similarity index 74%
copy from media-libs/oidn/oidn-1.3.0.ebuild
copy to media-libs/oidn/oidn-1.4.1.ebuild
index 707a8eebfe2..c93dbc1e24a 100644
--- a/media-libs/oidn/oidn-1.3.0.ebuild
+++ b/media-libs/oidn/oidn-1.4.1.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 
-inherit cmake python-single-r1 eutils
+inherit cmake python-single-r1
 
 DESCRIPTION="Intel(R) Open Image Denoise library"
 HOMEPAGE="http://www.openimagedenoise.org/";
@@ -16,27 +16,23 @@ if [[ ${PV} = * ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz
 -> ${P}.tar.gz"
-   SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-glibc.patch.bz2";
KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 RDEPEND="
${PYTHON_DEPS}
dev-cpp/tbb
dev-lang/ispc"
-DEPEND="
+BDEPEND="
${RDEPEND}
dev-util/cmake"
 
 CMAKE_BUILD_TYPE=Release
 
-PATCHES=( "${WORKDIR}"/oidn-1.3.0-glibc.patch )
-
 pkg_setup() {
python-single-r1_pkg_setup
 }



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2021-08-18 Thread Sam James
commit: a7e5a7189c28fd8f5ff298e6b6cab3791fbe5150
Author: Sebastian Parborg  gmail  com>
AuthorDate: Sun Aug 15 12:13:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Aug 18 23:34:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e5a718

media-libs/oidn: Fix building with glibc-2.34

Closes: https://bugs.gentoo.org/806514

Signed-off-by: Sebastian Parborg  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-libs/oidn/Manifest  | 1 +
 media-libs/oidn/oidn-1.3.0.ebuild | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest
index d2d55abdbfb..be014d08b06 100644
--- a/media-libs/oidn/Manifest
+++ b/media-libs/oidn/Manifest
@@ -1 +1,2 @@
+DIST oidn-1.3.0-glibc.patch.bz2 6359 BLAKE2B 
743cd87f92bc89182de716254f89136e6907bd18ec0d589b3338e7e89a364797cecd8d398c90acca0df74a1390d06ece7c44864710c9819c370b3922843a6300
 SHA512 
b1f132fbdadef9b5efa3769dcceba34b7c2619030a79314146861b58e81e5757f3beed247670ccea8886f3a32819eba4433481d3bac27cd29031546093ec58d8
 DIST oidn-1.3.0.tar.gz 36763571 BLAKE2B 
395d7aafd87babf7d2414ed940dd85adf4a488df2138e0e63cc82ac06088dd969879de73d79bead4b35bba0045081ee637b72f2a98770dbfc928ffe7c25da78a
 SHA512 
19de3cf11b9d436ee6f33ff020187a4cdc05da5f43c47509f715ca99e4276bfb64425d0a48f3a6f0569c8c6701b46a7e35378f371fdbacc0b6d488e113ffe17c

diff --git a/media-libs/oidn/oidn-1.3.0.ebuild 
b/media-libs/oidn/oidn-1.3.0.ebuild
index 7e79c737d50..707a8eebfe2 100644
--- a/media-libs/oidn/oidn-1.3.0.ebuild
+++ b/media-libs/oidn/oidn-1.3.0.ebuild
@@ -16,6 +16,7 @@ if [[ ${PV} = * ]]; then
EGIT_BRANCH="master"
 else

SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz
 -> ${P}.tar.gz"
+   SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-glibc.patch.bz2";
KEYWORDS="~amd64 ~x86"
 fi
 
@@ -34,6 +35,8 @@ DEPEND="
 
 CMAKE_BUILD_TYPE=Release
 
+PATCHES=( "${WORKDIR}"/oidn-1.3.0-glibc.patch )
+
 pkg_setup() {
python-single-r1_pkg_setup
 }



[gentoo-commits] repo/gentoo:master commit in: media-libs/oidn/

2021-06-09 Thread Sam James
commit: a8f956e915b79218d56b4af2cb3015b0869c3aaa
Author: Sebastian Parborg  gmail  com>
AuthorDate: Tue Apr 27 23:55:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 10 00:19:17 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8f956e9

media-libs/oidn: New package

Intel Open Image Denoise is an open source library of high-performance,
high-quality denoising filters for images rendered with ray tracing.

Signed-off-by: Sebastian Parborg  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-libs/oidn/Manifest  |  1 +
 media-libs/oidn/metadata.xml  | 20 
 media-libs/oidn/oidn-1.3.0.ebuild | 39 +++
 3 files changed, 60 insertions(+)

diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest
new file mode 100644
index 000..d2d55abdbfb
--- /dev/null
+++ b/media-libs/oidn/Manifest
@@ -0,0 +1 @@
+DIST oidn-1.3.0.tar.gz 36763571 BLAKE2B 
395d7aafd87babf7d2414ed940dd85adf4a488df2138e0e63cc82ac06088dd969879de73d79bead4b35bba0045081ee637b72f2a98770dbfc928ffe7c25da78a
 SHA512 
19de3cf11b9d436ee6f33ff020187a4cdc05da5f43c47509f715ca99e4276bfb64425d0a48f3a6f0569c8c6701b46a7e35378f371fdbacc0b6d488e113ffe17c

diff --git a/media-libs/oidn/metadata.xml b/media-libs/oidn/metadata.xml
new file mode 100644
index 000..1787e6d6af0
--- /dev/null
+++ b/media-libs/oidn/metadata.xml
@@ -0,0 +1,20 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   darkdefe...@gmail.com
+   Sebastian Parborg
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   Intel Open Image Denoise is an open source library of 
high-performance,
+   high-quality denoising filters for images rendered with ray 
tracing. Intel
+   Open Image Denoise is part of the Intel® oneAPI Rendering 
Toolkit and is
+   
+   
+   OpenImageDenoise/oidn
+   
+

diff --git a/media-libs/oidn/oidn-1.3.0.ebuild 
b/media-libs/oidn/oidn-1.3.0.ebuild
new file mode 100644
index 000..7e79c737d50
--- /dev/null
+++ b/media-libs/oidn/oidn-1.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+
+inherit cmake python-single-r1 eutils
+
+DESCRIPTION="Intel(R) Open Image Denoise library"
+HOMEPAGE="http://www.openimagedenoise.org/";
+
+if [[ ${PV} = * ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/OpenImageDenoise/oidn.git";
+   EGIT_BRANCH="master"
+else
+   
SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz
 -> ${P}.tar.gz"
+   KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-cpp/tbb
+   dev-lang/ispc"
+DEPEND="
+   ${RDEPEND}
+   dev-util/cmake"
+
+CMAKE_BUILD_TYPE=Release
+
+pkg_setup() {
+   python-single-r1_pkg_setup
+}