From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
Date: Sun, 19 Sep 2021 05:20:48 +0000 (UTC) [thread overview]
Message-ID: <1632028823.67c51d91eb835704c73e7e48c2cf08f8c4c26911.sam@gentoo> (raw)
commit: 67c51d91eb835704c73e7e48c2cf08f8c4c26911
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 19 05:11:44 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 19 05:20:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67c51d91
media-libs/osl: fix declared LLVM compatibility, Python module installation
Bug: https://bugs.gentoo.org/794616
Bug: https://bugs.gentoo.org/778005
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.11.9.0-r1.ebuild | 106 ++++++++++++++++++++++++++++++++++
media-libs/osl/osl-1.12.0.2-r1.ebuild | 104 +++++++++++++++++++++++++++++++++
2 files changed, 210 insertions(+)
diff --git a/media-libs/osl/osl-1.11.9.0-r1.ebuild b/media-libs/osl/osl-1.11.9.0-r1.ebuild
new file mode 100644
index 00000000000..a85d2827df7
--- /dev/null
+++ b/media-libs/osl/osl-1.11.9.0-r1.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+# check this on updates
+LLVM_MAX_SLOT=10
+
+inherit cmake llvm toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/11"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+X86_CPU_FEATURES=(
+ sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+ avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/pugixml
+ media-libs/openexr:=
+ media-libs/openimageio:=
+ <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+ sys-libs/zlib
+ partio? ( media-libs/partio )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ ')
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+"
+
+PATCHES=()
+
+CMAKE_REMOVE_MODULES_LIST=()
+
+# Restricting tests as Make file handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
+
+llvm_check_deps() {
+ has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ llvm_pkg_setup
+}
+
+src_configure() {
+ local cpufeature
+ local mysimd=()
+ for cpufeature in "${CPU_FEATURES[@]}"; do
+ use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+ done
+
+ # If no CPU SIMDs were used, completely disable them
+ [[ -z ${mysimd} ]] && mysimd=("0")
+
+ local gcc=$(tc-getCC)
+
+ local mycmakeargs=(
+ # LLVM 10+ needs C++14
+ -DCMAKE_CXX_STANDARD=14
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DINSTALL_DOCS=$(usex doc)
+ -DUSE_CCACHE=OFF
+ -DLLVM_STATIC=OFF
+ -DLLVM_ROOT="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
+ -DOSL_BUILD_TESTS=$(usex test)
+ -DOSL_SHADER_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/shaders"
+ -DOSL_PTX_INSTALL_DIR="${EPREFIX}/usr/include/${PN^^}/ptx"
+ -DSTOP_ON_WARNING=OFF
+ -DUSE_PARTIO=$(usex partio)
+ -DUSE_QT=$(usex qt5)
+ -DUSE_PYTHON=$(usex python)
+ -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ )
+
+ cmake_src_configure
+}
diff --git a/media-libs/osl/osl-1.12.0.2-r1.ebuild b/media-libs/osl/osl-1.12.0.2-r1.ebuild
new file mode 100644
index 00000000000..d8094d70371
--- /dev/null
+++ b/media-libs/osl/osl-1.12.0.2-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+
+# check this on updates
+LLVM_MAX_SLOT=13
+
+inherit cmake llvm toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}-dev.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+X86_CPU_FEATURES=(
+ sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+ avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/pugixml
+ media-libs/openexr:=
+ media-libs/openimageio:=
+ <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+ sys-libs/zlib:=
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ ')
+ )
+ partio? ( media-libs/partio )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ ${FILESDIR}/${P}-llvm-11.patch
+ ${FILESDIR}/${P}-llvm-12.patch
+)
+
+# Restricting tests as Make file handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"
+
+llvm_check_deps() {
+ has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ llvm_pkg_setup
+}
+
+src_configure() {
+ local cpufeature
+ local mysimd=()
+ for cpufeature in "${CPU_FEATURES[@]}"; do
+ use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+ done
+
+ # If no CPU SIMDs were used, completely disable them
+ [[ -z ${mysimd} ]] && mysimd=("0")
+
+ local gcc=$(tc-getCC)
+ # LLVM needs CPP11. Do not disable.
+ local mycmakeargs=(
+ -DCMAKE_CXX_STANDARD=14
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DINSTALL_DOCS=$(usex doc)
+ -DUSE_CCACHE=OFF
+ -DLLVM_STATIC=OFF
+ -DOSL_BUILD_TESTS=$(usex test)
+ -DSTOP_ON_WARNING=OFF
+ -DUSE_PARTIO=$(usex partio)
+ -DUSE_QT=$(usex qt5)
+ -DUSE_PYTHON=$(usex python)
+ -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ )
+
+ cmake_src_configure
+}
next reply other threads:[~2021-09-19 5:20 UTC|newest]
Thread overview: 71+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-19 5:20 Sam James [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-05-01 16:59 [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/ 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 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=1632028823.67c51d91eb835704c73e7e48c2cf08f8c4c26911.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