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/osl/
Date: Fri, 01 Aug 2025 08:23:40 +0000 (UTC)	[thread overview]
Message-ID: <1754036577.18851e8cf12118f02b735715da5ff9ac3dff1bf8.sam@gentoo> (raw)

commit:     18851e8cf12118f02b735715da5ff9ac3dff1bf8
Author:     Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sun Jul 20 19:17:31 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Aug  1 08:22:57 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18851e8c

media-libs/osl: add 1.14.6.0, update 9999

Support LLVM-20
Make optix available independent of test.
Fix CUDA_OPT_FLAG_CLANG typo.
Don't set CUDA_PATH/OPTIX_PATH.
Update failed tests.

Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Part-of: https://github.com/gentoo/gentoo/pull/43084
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/osl/Manifest                            |  1 +
 media-libs/osl/osl-1.14.5.1.ebuild                 |  2 +-
 .../osl/{osl-9999.ebuild => osl-1.14.6.0.ebuild}   | 46 ++++++++++------------
 media-libs/osl/osl-9999.ebuild                     | 46 ++++++++++------------
 4 files changed, 44 insertions(+), 51 deletions(-)

diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index c86736417952..f121be2086a8 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,2 +1,3 @@
 DIST osl-1.13.12.0.tar.gz 21824352 BLAKE2B 0d5c1d166afc347a515187c34d60c0a2be99e8a1b7078a388190f2232ee545654e3c1fea829dfabb7b0a105d69d3d98cc5dae4fa8f4db1a2228f9f258b34e76b SHA512 152a1b085c4ea88c86bc0ccbd694b848b9f50bd91f1a165899c2c3999042e413e54cdfb83dd90ea23daeeb2a3b65f794b8b2c19e9629bbda266971dcd6e3b5e7
 DIST osl-1.14.5.1.tar.gz 43346319 BLAKE2B e2ae4448ecd7c144113012873c85e512edc4dd78bbd64438f194a680554181a98e6c6b871e17229ba5d252db3a5f51f8af2807016682ed4cd60f83d5d734d821 SHA512 4dfa3659dacc78dc82b943f0d16685e9353924fab40127c69cb2fbdf6d0794970bf283f8711119c31369b9fe507c45e12137d2121f217678da9be86b44b4e2dc
+DIST osl-1.14.6.0.tar.gz 43339662 BLAKE2B 58a1524bf4eb27fdc3e171244bc9c884b7af6ea9e610469f90a45d30c5a7aa5002d3544bb43718271c16906595a3007144a0dae7d099097768c5dac66ea8c694 SHA512 3ac8fa5a2a595fa659e9982ac76556bcc4b68a6ed907cb3f300b9da69e72ec487a5f83cce61d671e8418d948b86945e2ee8471dfc3dc4cf00cbe596bf07725f9

diff --git a/media-libs/osl/osl-1.14.5.1.ebuild b/media-libs/osl/osl-1.14.5.1.ebuild
index ffdd569e2c79..129cae8f7e9c 100644
--- a/media-libs/osl/osl-1.14.5.1.ebuild
+++ b/media-libs/osl/osl-1.14.5.1.ebuild
@@ -277,7 +277,7 @@ src_configure() {
 		mycmakeargs+=(
 			-DUSE_LLVM_BITCODE="$(usex clang-cuda)"
 			-DCUDA_OPT_FLAG_NVCC="$(get-flag O)"
-			-DCUDA_OPT_FLAG_NVCC="$(get-flag O)"
+			-DCUDA_OPT_FLAG_CLANG="$(get-flag O)"
 		)
 	fi
 

diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-1.14.6.0.ebuild
similarity index 92%
copy from media-libs/osl/osl-9999.ebuild
copy to media-libs/osl/osl-1.14.6.0.ebuild
index 26e37e4b01ad..3038b38d882e 100644
--- a/media-libs/osl/osl-9999.ebuild
+++ b/media-libs/osl/osl-1.14.6.0.ebuild
@@ -7,7 +7,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{11..13} )
 
 # Check this on updates
-LLVM_COMPAT=( {18..19} )
+LLVM_COMPAT=( {18..20} )
 
 inherit cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1
 
@@ -45,7 +45,7 @@ IUSE="+clang-cuda debug doc gui libcxx nofma optix partio test ${CPU_FEATURES[*]
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( optix? ( clang-cuda ) )
+	optix? ( clang-cuda )
 "
 
 RDEPEND="
@@ -277,7 +277,7 @@ src_configure() {
 		mycmakeargs+=(
 			-DUSE_LLVM_BITCODE="$(usex clang-cuda)"
 			-DCUDA_OPT_FLAG_NVCC="$(get-flag O)"
-			-DCUDA_OPT_FLAG_NVCC="$(get-flag O)"
+			-DCUDA_OPT_FLAG_CLANG="$(get-flag O)"
 		)
 	fi
 
@@ -296,25 +296,23 @@ src_configure() {
 		)
 	fi
 
-	if use test; then
-		if use optix; then
-			local -x CUDAHOSTCXX CUDAHOSTLD
-			CUDAHOSTCXX="$(cuda_get_host_compiler)"
-			CUDAHOSTLD="$(tc-getCXX)"
-
-			mycmakeargs+=(
-				-DOSL_USE_OPTIX="yes"
-				-DOptiX_FIND_QUIETLY="no"
-				-DCUDA_FIND_QUIETLY="no"
-
-				-DOPTIXHOME="${OPTIX_PATH:=${ESYSROOT}/opt/optix}"
-				-DCUDA_TOOLKIT_ROOT_DIR="${CUDA_PATH:=${ESYSROOT}/opt/cuda}"
-
-				-DCUDA_NVCC_FLAGS="--compiler-bindir;${CUDAHOSTCXX}"
-				-DOSL_EXTRA_NVCC_ARGS="--compiler-bindir;${CUDAHOSTCXX}"
-				-DCUDA_VERBOSE_BUILD="yes"
-			)
-		fi
+	if use optix; then
+		local -x CUDAHOSTCXX CUDAHOSTLD
+		CUDAHOSTCXX="$(cuda_get_host_compiler)"
+		CUDAHOSTLD="$(tc-getCXX)"
+
+		mycmakeargs+=(
+			-DOSL_USE_OPTIX="yes"
+			-DOptiX_FIND_QUIETLY="no"
+			-DCUDA_FIND_QUIETLY="no"
+
+			-DOPTIXHOME="${OPTIX_PATH:-${ESYSROOT}/opt/optix}"
+			-DCUDA_TOOLKIT_ROOT_DIR="${CUDA_PATH:-${ESYSROOT}/opt/cuda}"
+
+			-DCUDA_NVCC_FLAGS="--compiler-bindir;${CUDAHOSTCXX}"
+			-DOSL_EXTRA_NVCC_ARGS="--compiler-bindir;${CUDAHOSTCXX}"
+			-DCUDA_VERBOSE_BUILD="yes"
+		)
 	fi
 
 	# Environment OPENIMAGEIO_CUDA=0 trumps everything else, turns off
@@ -378,11 +376,9 @@ src_test() {
 		"^render-veachmis.opt$"
 
 		# optix
-		"^render-mx-generalized-schlick.optix$"
-		"^render-mx-generalized-schlick.optix.opt$"
-		"^render-mx-generalized-schlick.optix.fused$"
 		"^render-microfacet.optix.opt$"
 		"^render-microfacet.optix.fused$"
+		"^render-mx-burley-diffuse.opt$"
 	)
 
 	local myctestargs=(

diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-9999.ebuild
index 26e37e4b01ad..3038b38d882e 100644
--- a/media-libs/osl/osl-9999.ebuild
+++ b/media-libs/osl/osl-9999.ebuild
@@ -7,7 +7,7 @@ EAPI=8
 PYTHON_COMPAT=( python3_{11..13} )
 
 # Check this on updates
-LLVM_COMPAT=( {18..19} )
+LLVM_COMPAT=( {18..20} )
 
 inherit cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1
 
@@ -45,7 +45,7 @@ IUSE="+clang-cuda debug doc gui libcxx nofma optix partio test ${CPU_FEATURES[*]
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( optix? ( clang-cuda ) )
+	optix? ( clang-cuda )
 "
 
 RDEPEND="
@@ -277,7 +277,7 @@ src_configure() {
 		mycmakeargs+=(
 			-DUSE_LLVM_BITCODE="$(usex clang-cuda)"
 			-DCUDA_OPT_FLAG_NVCC="$(get-flag O)"
-			-DCUDA_OPT_FLAG_NVCC="$(get-flag O)"
+			-DCUDA_OPT_FLAG_CLANG="$(get-flag O)"
 		)
 	fi
 
@@ -296,25 +296,23 @@ src_configure() {
 		)
 	fi
 
-	if use test; then
-		if use optix; then
-			local -x CUDAHOSTCXX CUDAHOSTLD
-			CUDAHOSTCXX="$(cuda_get_host_compiler)"
-			CUDAHOSTLD="$(tc-getCXX)"
-
-			mycmakeargs+=(
-				-DOSL_USE_OPTIX="yes"
-				-DOptiX_FIND_QUIETLY="no"
-				-DCUDA_FIND_QUIETLY="no"
-
-				-DOPTIXHOME="${OPTIX_PATH:=${ESYSROOT}/opt/optix}"
-				-DCUDA_TOOLKIT_ROOT_DIR="${CUDA_PATH:=${ESYSROOT}/opt/cuda}"
-
-				-DCUDA_NVCC_FLAGS="--compiler-bindir;${CUDAHOSTCXX}"
-				-DOSL_EXTRA_NVCC_ARGS="--compiler-bindir;${CUDAHOSTCXX}"
-				-DCUDA_VERBOSE_BUILD="yes"
-			)
-		fi
+	if use optix; then
+		local -x CUDAHOSTCXX CUDAHOSTLD
+		CUDAHOSTCXX="$(cuda_get_host_compiler)"
+		CUDAHOSTLD="$(tc-getCXX)"
+
+		mycmakeargs+=(
+			-DOSL_USE_OPTIX="yes"
+			-DOptiX_FIND_QUIETLY="no"
+			-DCUDA_FIND_QUIETLY="no"
+
+			-DOPTIXHOME="${OPTIX_PATH:-${ESYSROOT}/opt/optix}"
+			-DCUDA_TOOLKIT_ROOT_DIR="${CUDA_PATH:-${ESYSROOT}/opt/cuda}"
+
+			-DCUDA_NVCC_FLAGS="--compiler-bindir;${CUDAHOSTCXX}"
+			-DOSL_EXTRA_NVCC_ARGS="--compiler-bindir;${CUDAHOSTCXX}"
+			-DCUDA_VERBOSE_BUILD="yes"
+		)
 	fi
 
 	# Environment OPENIMAGEIO_CUDA=0 trumps everything else, turns off
@@ -378,11 +376,9 @@ src_test() {
 		"^render-veachmis.opt$"
 
 		# optix
-		"^render-mx-generalized-schlick.optix$"
-		"^render-mx-generalized-schlick.optix.opt$"
-		"^render-mx-generalized-schlick.optix.fused$"
 		"^render-microfacet.optix.opt$"
 		"^render-microfacet.optix.fused$"
+		"^render-mx-burley-diffuse.opt$"
 	)
 
 	local myctestargs=(


             reply	other threads:[~2025-08-01  8:23 UTC|newest]

Thread overview: 74+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-08-01  8:23 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-09-23 17:09 [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/ Arthur Zamarin
2025-05-12 18:17 Sam James
2025-05-01 16:59 Sam James
2025-04-22  0:41 Sam James
2025-04-22  0:41 Sam James
2025-01-13 17:12 Andreas Sturmlechner
2025-01-13  6:54 Joonas Niilola
2025-01-09 23:05 Sam James
2025-01-09 23:05 Sam James
2025-01-09 23:05 Sam James
2025-01-09 23:05 Sam James
2025-01-05 20:35 Sam James
2025-01-05 20:35 Sam James
2024-10-04 21:40 Andreas Sturmlechner
2024-07-15 11:27 Joonas Niilola
2024-06-29 16:51 Sam James
2024-06-29 16:51 Sam James
2024-06-02  4:12 Sam James
2024-05-03  3:33 Sam James
2024-05-03  3:33 Sam James
2024-04-10  6:24 Joonas Niilola
2024-01-10 12:41 Sam James
2023-07-16 18:46 Sam James
2023-06-10 20:47 Andreas Sturmlechner
2023-05-01 15:15 Sam James
2022-12-24 14:06 Andreas Sturmlechner
2022-12-14  5:19 Sam James
2022-11-03  6:15 Sam James
2022-10-02  2:26 Sam James
2022-10-02  2:26 Sam James
2022-07-09  5:57 Sam James
2022-06-06  1:40 Sam James
2022-05-20 13:21 Joonas Niilola
2022-03-19 23:39 Sam James
2022-02-28  5:21 Sam James
2022-02-19 19:41 Sam James
2022-02-14  2:07 Sam James
2022-02-14  2:07 Sam James
2022-02-12  4:43 Sam James
2022-02-12  3:55 Sam James
2022-02-12  3:55 Sam James
2022-02-12  3:55 Sam James
2021-12-02  3:53 Sam James
2021-12-02  3:50 Sam James
2021-12-01 19:35 Sam James
2021-12-01 17:03 Sam James
2021-11-02 20:29 Sam James
2021-11-02 20:29 Sam James
2021-10-04  0:21 Sam James
2021-10-04  0:12 Sam James
2021-10-04  0:08 Sam James
2021-09-19  5:24 Sam James
2021-09-19  5:20 Sam James
2021-09-19  5:20 Sam James
2021-09-19  3:30 Sam James
2021-09-19  3:09 Sam James
2021-09-19  3:09 Sam James
2021-03-05 18:39 Sam James
2021-02-22  7:12 Sam James
2020-12-11  7:58 Joonas Niilola
2020-12-11  7:58 Joonas Niilola
2020-12-01 11:24 Joonas Niilola
2020-12-01 11:24 Joonas Niilola
2020-07-30 22:07 Sam James
2020-06-10  7:32 Michał Górny
2020-03-22 18:02 Mikle Kolyada
2020-03-22 14:40 Andreas Sturmlechner
2019-07-15 13:36 Michał Górny
2018-08-15 20:08 Jonathan Scruggs
2018-03-30 16:04 Aaron Bauman
2018-01-30 21:01 Jonathan Scruggs
2018-01-27 17:19 Jonathan Scruggs
2018-01-12 21:07 Craig Andrews

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=1754036577.18851e8cf12118f02b735715da5ff9ac3dff1bf8.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