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 (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A830B1581F0 for ; Thu, 09 Jan 2025 23:05:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D3381E0798; Thu, 09 Jan 2025 23:05:49 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id BA7A0E0798 for ; Thu, 09 Jan 2025 23:05:49 +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 094F8341B52 for ; Thu, 09 Jan 2025 23:05:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1AFF31DE6 for ; Thu, 09 Jan 2025 23:05:46 +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: <1736463843.48bdb25a84f3f162bc9e88d9af99efd8b640be22.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/files/, media-libs/osl/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/osl/files/osl-boost-config.patch media-libs/osl/files/osl-oslfile.patch media-libs/osl/osl-1.12.14.0-r2.ebuild media-libs/osl/osl-1.13.10.0-r1.ebuild media-libs/osl/osl-1.13.10.0.ebuild media-libs/osl/osl-1.13.12.0-r1.ebuild media-libs/osl/osl-1.13.12.0.ebuild media-libs/osl/osl-9999.ebuild X-VCS-Directories: media-libs/osl/files/ media-libs/osl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 48bdb25a84f3f162bc9e88d9af99efd8b640be22 X-VCS-Branch: master Date: Thu, 09 Jan 2025 23:05:46 +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: 689df71a-107f-4dc1-9c5c-f623a0db8b89 X-Archives-Hash: e8bf5838ab8617531b9c3f958f5377ce commit: 48bdb25a84f3f162bc9e88d9af99efd8b640be22 Author: Paul Zander gmail com> AuthorDate: Thu Jan 9 21:21:46 2025 +0000 Commit: Sam James gentoo org> CommitDate: Thu Jan 9 23:04:03 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=48bdb25a media-libs/osl: ebuild rework depend on exact LLVM_SLOT don't use rm -rf use boost config fix oslfile typo skip failing optix tests Signed-off-by: Paul Zander gmail.com> Signed-off-by: Sam James gentoo.org> media-libs/osl/files/osl-boost-config.patch | 22 ++++++++++++++++++ media-libs/osl/files/osl-oslfile.patch | 26 ++++++++++++++++++++++ media-libs/osl/osl-1.12.14.0-r2.ebuild | 6 +++-- ...sl-1.13.10.0.ebuild => osl-1.13.10.0-r1.ebuild} | 17 +++++++++++--- ...sl-1.13.12.0.ebuild => osl-1.13.12.0-r1.ebuild} | 17 +++++++++++--- media-libs/osl/osl-9999.ebuild | 17 +++++++++++--- 6 files changed, 94 insertions(+), 11 deletions(-) diff --git a/media-libs/osl/files/osl-boost-config.patch b/media-libs/osl/files/osl-boost-config.patch new file mode 100644 index 000000000000..0c0f3bbe71e0 --- /dev/null +++ b/media-libs/osl/files/osl-boost-config.patch @@ -0,0 +1,22 @@ +From 8a29f2263675bf9cb7a567f00fc257728b3ac3d8 Mon Sep 17 00:00:00 2001 +From: Paul Zander +Date: Thu, 9 Jan 2025 19:49:15 +0100 +Subject: [PATCH] boost config + +Signed-off-by: Paul Zander + +diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake +index 7250633..1f032f8 100644 +--- a/src/cmake/externalpackages.cmake ++++ b/src/cmake/externalpackages.cmake +@@ -57,6 +57,7 @@ else () + checked_find_package (Boost REQUIRED + VERSION_MIN 1.55 + COMPONENTS ${Boost_COMPONENTS} ++ CONFIG + RECOMMEND_MIN 1.66 + RECOMMEND_MIN_REASON "Boost 1.66 is the oldest version our CI tests against" + PRINT Boost_INCLUDE_DIRS Boost_LIBRARIES +-- +2.47.1 + diff --git a/media-libs/osl/files/osl-oslfile.patch b/media-libs/osl/files/osl-oslfile.patch new file mode 100644 index 000000000000..76e985c26372 --- /dev/null +++ b/media-libs/osl/files/osl-oslfile.patch @@ -0,0 +1,26 @@ +From 9abc5d56c8ae830355a10d6008b5925faef30af2 Mon Sep 17 00:00:00 2001 +From: Paul Zander +Date: Thu, 9 Jan 2025 19:59:01 +0100 +Subject: [PATCH] oslsrc + +This was snuck in via +https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1914 + +Signed-off-by: Paul Zander + +diff --git a/src/shaders/CMakeLists.txt b/src/shaders/CMakeLists.txt +index 1ea7bee..e96207d 100644 +--- a/src/shaders/CMakeLists.txt ++++ b/src/shaders/CMakeLists.txt +@@ -40,7 +40,7 @@ macro (oslc_compile) + list (APPEND oslc_args "-I${CMAKE_SOURCE_DIR}/src/shaders") + add_custom_command (OUTPUT ${osofile} + COMMAND oslc ${oslc_args} "${oslfile}" -o "${osofile}" +- MAIN_DEPENDENCY ${oslsrc} ++ MAIN_DEPENDENCY ${oslfile} + DEPENDS ${_shader_DEPENDS} "${stdosl_header}" oslc + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "oslc ${oslsrc_we}") +-- +2.47.1 + diff --git a/media-libs/osl/osl-1.12.14.0-r2.ebuild b/media-libs/osl/osl-1.12.14.0-r2.ebuild index 9b2a3bb855a7..cbce89ca9931 100644 --- a/media-libs/osl/osl-1.12.14.0-r2.ebuild +++ b/media-libs/osl/osl-1.12.14.0-r2.ebuild @@ -41,8 +41,8 @@ RDEPEND=" dev-libs/pugixml >=media-libs/openimageio-2.4:= $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT} - llvm-core/llvm:${LLVM_SLOT} + llvm-core/clang:${LLVM_SLOT}= + llvm-core/llvm:${LLVM_SLOT}= ') python? ( ${PYTHON_DEPS} @@ -68,6 +68,8 @@ BDEPEND=" " PATCHES=( + "${FILESDIR}/${PN}-boost-config.patch" + "${FILESDIR}/${PN}-oslfile.patch" "${FILESDIR}/${PN}-include-cstdint.patch" "${FILESDIR}/${PN}-1.12.14.0-libfmt11.patch" "${FILESDIR}/${PN}-1.12.14.0-m_dz.patch" diff --git a/media-libs/osl/osl-1.13.10.0.ebuild b/media-libs/osl/osl-1.13.10.0-r1.ebuild similarity index 95% rename from media-libs/osl/osl-1.13.10.0.ebuild rename to media-libs/osl/osl-1.13.10.0-r1.ebuild index d6b142e2fd64..ccf08a400628 100644 --- a/media-libs/osl/osl-1.13.10.0.ebuild +++ b/media-libs/osl/osl-1.13.10.0-r1.ebuild @@ -44,8 +44,8 @@ RDEPEND=" dev-libs/pugixml >=media-libs/openimageio-2.4:= $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT} - llvm-core/llvm:${LLVM_SLOT} + llvm-core/clang:${LLVM_SLOT}= + llvm-core/llvm:${LLVM_SLOT}= ') optix? ( dev-libs/optix[-headers-only] ) python? ( @@ -76,6 +76,8 @@ BDEPEND=" " PATCHES=( + "${FILESDIR}/${PN}-boost-config.patch" + "${FILESDIR}/${PN}-oslfile.patch" "${FILESDIR}/${PN}-include-cstdint.patch" "${FILESDIR}/${PN}-1.12.14.0-m_dz.patch" ) @@ -269,6 +271,15 @@ src_test() { "^osl-imageio.opt.rs_bitcode$" ) + if use optix; then + CMAKE_SKIP_TESTS+=( + "^color2.optix$" + "^color4.optix(|.opt|.fused)$" + "^vector2.optix$" + "^vector4.optix$" + ) + fi + myctestargs=( # src/build-scripts/ci-test.bash '--force-new-ctest-process' @@ -317,7 +328,7 @@ src_install() { cmake_src_install if [[ -d "${ED}/usr/build-scripts" ]]; then - rm -rf "${ED}/usr/build-scripts" || die + rm -vr "${ED}/usr/build-scripts" || die fi if use test; then diff --git a/media-libs/osl/osl-1.13.12.0.ebuild b/media-libs/osl/osl-1.13.12.0-r1.ebuild similarity index 95% rename from media-libs/osl/osl-1.13.12.0.ebuild rename to media-libs/osl/osl-1.13.12.0-r1.ebuild index 82b3dd66ec02..5f185caace4b 100644 --- a/media-libs/osl/osl-1.13.12.0.ebuild +++ b/media-libs/osl/osl-1.13.12.0-r1.ebuild @@ -44,8 +44,8 @@ RDEPEND=" dev-libs/pugixml >=media-libs/openimageio-2.4:= $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT} - llvm-core/llvm:${LLVM_SLOT} + llvm-core/clang:${LLVM_SLOT}= + llvm-core/llvm:${LLVM_SLOT}= ') optix? ( dev-libs/optix[-headers-only] ) python? ( @@ -76,6 +76,8 @@ BDEPEND=" " PATCHES=( + "${FILESDIR}/${PN}-boost-config.patch" + "${FILESDIR}/${PN}-oslfile.patch" "${FILESDIR}/${PN}-include-cstdint.patch" ) @@ -268,6 +270,15 @@ src_test() { "^osl-imageio.opt.rs_bitcode$" ) + if use optix; then + CMAKE_SKIP_TESTS+=( + "^color2.optix$" + "^color4.optix(|.opt|.fused)$" + "^vector2.optix$" + "^vector4.optix$" + ) + fi + myctestargs=( # src/build-scripts/ci-test.bash '--force-new-ctest-process' @@ -316,7 +327,7 @@ src_install() { cmake_src_install if [[ -d "${ED}/usr/build-scripts" ]]; then - rm -rf "${ED}/usr/build-scripts" || die + rm -vr "${ED}/usr/build-scripts" || die fi if use test; then diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-9999.ebuild index 82b3dd66ec02..5f185caace4b 100644 --- a/media-libs/osl/osl-9999.ebuild +++ b/media-libs/osl/osl-9999.ebuild @@ -44,8 +44,8 @@ RDEPEND=" dev-libs/pugixml >=media-libs/openimageio-2.4:= $(llvm_gen_dep ' - llvm-core/clang:${LLVM_SLOT} - llvm-core/llvm:${LLVM_SLOT} + llvm-core/clang:${LLVM_SLOT}= + llvm-core/llvm:${LLVM_SLOT}= ') optix? ( dev-libs/optix[-headers-only] ) python? ( @@ -76,6 +76,8 @@ BDEPEND=" " PATCHES=( + "${FILESDIR}/${PN}-boost-config.patch" + "${FILESDIR}/${PN}-oslfile.patch" "${FILESDIR}/${PN}-include-cstdint.patch" ) @@ -268,6 +270,15 @@ src_test() { "^osl-imageio.opt.rs_bitcode$" ) + if use optix; then + CMAKE_SKIP_TESTS+=( + "^color2.optix$" + "^color4.optix(|.opt|.fused)$" + "^vector2.optix$" + "^vector4.optix$" + ) + fi + myctestargs=( # src/build-scripts/ci-test.bash '--force-new-ctest-process' @@ -316,7 +327,7 @@ src_install() { cmake_src_install if [[ -d "${ED}/usr/build-scripts" ]]; then - rm -rf "${ED}/usr/build-scripts" || die + rm -vr "${ED}/usr/build-scripts" || die fi if use test; then