* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2018-01-12 21:07 Craig Andrews
0 siblings, 0 replies; 60+ messages in thread
From: Craig Andrews @ 2018-01-12 21:07 UTC (permalink / raw
To: gentoo-commits
commit: b8dc39e0e6aacef522c4e1597f53b8fa286f4e79
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Sat Dec 30 10:23:50 2017 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Fri Jan 12 21:06:55 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8dc39e0
media-libs/osl: Make clang depend compatible with llvm 4
LLVM 4 dropped a use flag to enable clang support. The depend is
now directly to sys-devel/clang.
Closes: https://bugs.gentoo.org/642728
media-libs/osl/osl-1.8.12.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/osl/osl-1.8.12.ebuild b/media-libs/osl/osl-1.8.12.ebuild
index 6bbe3b7c837..7e301585996 100644
--- a/media-libs/osl/osl-1.8.12.ebuild
+++ b/media-libs/osl/osl-1.8.12.ebuild
@@ -28,7 +28,7 @@ RDEPEND=">=media-libs/openexr-2.2.0
DEPEND="${RDEPEND}
>=dev-libs/boost-1.62
- sys-devel/llvm[clang]
+ sys-devel/clang
sys-devel/bison
sys-devel/flex
virtual/pkgconfig"
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2018-01-27 17:19 Jonathan Scruggs
0 siblings, 0 replies; 60+ messages in thread
From: Jonathan Scruggs @ 2018-01-27 17:19 UTC (permalink / raw
To: gentoo-commits
commit: 40d6ec988c90e5cd627fd8a118b2fe5fc8bad349
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Sat Jan 27 14:54:37 2018 +0000
Commit: Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 17:19:01 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40d6ec98
media-libs/osl: update metadata information
media-libs/osl/metadata.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/osl/metadata.xml b/media-libs/osl/metadata.xml
index 73ffbf9c141..c5955714443 100644
--- a/media-libs/osl/metadata.xml
+++ b/media-libs/osl/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>j.scruggs@gmail.com</email>
+ <email>dracwyrm@gentoo.org</email>
<name>Jonathan Scruggs</name>
</maintainer>
<maintainer type="person">
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2018-01-30 21:01 Jonathan Scruggs
0 siblings, 0 replies; 60+ messages in thread
From: Jonathan Scruggs @ 2018-01-30 21:01 UTC (permalink / raw
To: gentoo-commits
commit: 4947589313e37504f472f4d5414b4f0d4d3e7af0
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Mon Jan 29 15:16:35 2018 +0000
Commit: Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
CommitDate: Tue Jan 30 21:01:24 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49475893
media-libs/osl: add 1.9.6 release
Closes: https://github.com/gentoo/gentoo/pull/6996
media-libs/osl/Manifest | 1 +
media-libs/osl/metadata.xml | 6 ++++
media-libs/osl/osl-1.9.6.ebuild | 69 +++++++++++++++++++++++++++++++++++++++++
3 files changed, 76 insertions(+)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index b3d37043f05..ace6b6de3cf 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1 +1,2 @@
DIST osl-1.8.12.tar.gz 14572814 BLAKE2B edf742b104e723e1e3e56b2fb28b1cd4c81921b04a00b8c0f58cf174105a78881283837b550fb4a67d38f5f0a37327fac7a17310974895ed747e8813e6c8ad7b SHA512 29bb0a23d9e1aa445e87b7080be056f939a1828fa87f001cc1503a8c76d21a5620c69146158d27800db71b1abee71a0c39804d85aea7b5899b0cb7ca1c617b56
+DIST osl-1.9.6.tar.gz 14765052 BLAKE2B c6c82d02d49d263361b5b3ba03fca8f35f16199d7d30bbeb50a6b2ee16efcb06ddddc9ce515f749b38b2428365c27a23bf673e9be64d1453c7a49ab0f0d09002 SHA512 e2eb8487038795630bfb38cfb7a39f0cc6877f83689d1e00327b9d95c4b5270c263546a02dff1511272d1d2f429757e11fa28095f9d16cb170b777b531678961
diff --git a/media-libs/osl/metadata.xml b/media-libs/osl/metadata.xml
index c5955714443..b20cc885573 100644
--- a/media-libs/osl/metadata.xml
+++ b/media-libs/osl/metadata.xml
@@ -19,6 +19,12 @@
lights, displacement, and pattern generation.
</longdescription>
<use>
+ <flag name="cpu_flags_x86_avx512f" restrict=">=media-libs/osl-1.9.0">
+ SIMD Optimization
+ </flag>
+ <flag name="cpu_flags_x86_f16c" restrict=">=media-libs/osl-1.9.0">
+ SIMD Optimization
+ </flag>
<flag name="partio">Use <pkg>media-libs/partio</pkg></flag>
</use>
<upstream>
diff --git a/media-libs/osl/osl-1.9.6.ebuild b/media-libs/osl/osl-1.9.6.ebuild
new file mode 100644
index 00000000000..17accb5fe95
--- /dev/null
+++ b/media-libs/osl/osl-1.9.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl"
+
+MY_PV=${PV//_} # Remove underscore if any.
+[[ "${PV}" = *_rc* ]] && MY_PV=${MY_PV^^} # They use capitals for RC.
+
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~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 test ${CPU_FEATURES[@]%:*}"
+
+RDEPEND=">=media-libs/openexr-2.2.0
+ >=media-libs/openimageio-1.8.0
+ dev-libs/pugixml
+ sys-libs/zlib:=
+ partio? ( media-libs/partio )"
+
+DEPEND="${RDEPEND}
+ >=dev-libs/boost-1.62
+ sys-devel/clang
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig"
+
+# Restricting tests as Make file handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${MY_PV}"
+
+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")
+
+ # LLVM needs CPP11. Do not disable.
+ local mycmakeargs=(
+ -DLLVM_STATIC=ON
+ -DUSE_EXTERNAL_PUGIXML=ON
+ -DUSE_PARTIO=$(usex partio)
+ -DENABLERTTI=OFF
+ -DSTOP_ON_WARNING=OFF
+ -DOSL_BUILD_TESTS=$(usex test)
+ -DINSTALL_DOCS=$(usex doc)
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ )
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2018-03-30 16:04 Aaron Bauman
0 siblings, 0 replies; 60+ messages in thread
From: Aaron Bauman @ 2018-03-30 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 581f39f5cb35fbae2c6ae6b11d5a3d56aedfe8c3
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 30 16:03:28 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Mar 30 16:04:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=581f39f5
media-libs/osl: amd64 stable
Bug: https://bugs.gentoo.org/642270
Package-Manager: Portage-2.3.26, Repoman-2.3.7
media-libs/osl/osl-1.8.12.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/osl/osl-1.8.12.ebuild b/media-libs/osl/osl-1.8.12.ebuild
index 7e301585996..038b952f7f4 100644
--- a/media-libs/osl/osl-1.8.12.ebuild
+++ b/media-libs/osl/osl-1.8.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${MY_
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
X86_CPU_FEATURES=( sse2:sse2 sse3:sse3 sse4_1:sse4.1 sse4_2:sse4.2 )
CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2018-08-15 20:08 Jonathan Scruggs
0 siblings, 0 replies; 60+ messages in thread
From: Jonathan Scruggs @ 2018-08-15 20:08 UTC (permalink / raw
To: gentoo-commits
commit: 4e09fa2eb9d86ed0dfcd6391ff42efe5e71d34e0
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Wed Aug 15 17:41:10 2018 +0000
Commit: Jonathan Scruggs <dracwyrm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 15 20:08:17 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e09fa2e
media-libs/osl: bump to version 1.9.9
Closes: https://bugs.gentoo.org/659884
media-libs/osl/Manifest | 1 +
media-libs/osl/osl-1.9.9.ebuild | 68 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 69 insertions(+)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index ace6b6de3cf..d618646e7f1 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,2 +1,3 @@
DIST osl-1.8.12.tar.gz 14572814 BLAKE2B edf742b104e723e1e3e56b2fb28b1cd4c81921b04a00b8c0f58cf174105a78881283837b550fb4a67d38f5f0a37327fac7a17310974895ed747e8813e6c8ad7b SHA512 29bb0a23d9e1aa445e87b7080be056f939a1828fa87f001cc1503a8c76d21a5620c69146158d27800db71b1abee71a0c39804d85aea7b5899b0cb7ca1c617b56
DIST osl-1.9.6.tar.gz 14765052 BLAKE2B c6c82d02d49d263361b5b3ba03fca8f35f16199d7d30bbeb50a6b2ee16efcb06ddddc9ce515f749b38b2428365c27a23bf673e9be64d1453c7a49ab0f0d09002 SHA512 e2eb8487038795630bfb38cfb7a39f0cc6877f83689d1e00327b9d95c4b5270c263546a02dff1511272d1d2f429757e11fa28095f9d16cb170b777b531678961
+DIST osl-1.9.9.tar.gz 14771575 BLAKE2B ffbfa935c0d6568c9b35048d5b05965abc75775f4a4f56a434a331a45f4963b3e5cb74fb965748a5fb94cdd3a4201a4745ce564646cbbe535ca2646a734dc33c SHA512 7f3a16bc654676f8e82bf87a2c33914997f1468772ad27bf284c848e9b02adddaf37cb6ef8bde16c81b9076247bca5463a1a5660023efd67d9ac20969ae99647
diff --git a/media-libs/osl/osl-1.9.9.ebuild b/media-libs/osl/osl-1.9.9.ebuild
new file mode 100644
index 00000000000..c4781e7e7bc
--- /dev/null
+++ b/media-libs/osl/osl-1.9.9.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl"
+
+MY_PV=${PV//_} # Remove underscore if any.
+[[ "${PV}" = *_rc* ]] && MY_PV=${MY_PV^^} # They use capitals for RC.
+
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~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 test ${CPU_FEATURES[@]%:*}"
+
+RDEPEND="dev-libs/pugixml
+ >=media-libs/openexr-2.2.0
+ >=media-libs/openimageio-1.8.0
+ sys-libs/zlib:=
+ partio? ( media-libs/partio )"
+
+DEPEND="${RDEPEND}
+ >=dev-libs/boost-1.62
+ sys-devel/clang
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig"
+
+# Restricting tests as Make file handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${MY_PV}"
+
+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")
+
+ # LLVM needs CPP11. Do not disable.
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DENABLERTTI=OFF
+ -DOSL_BUILD_TESTS=$(usex test)
+ -DINSTALL_DOCS=$(usex doc)
+ -DLLVM_STATIC=ON
+ -DSTOP_ON_WARNING=OFF
+ -DUSE_PARTIO=$(usex partio)
+ -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ )
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2019-07-15 13:36 Michał Górny
0 siblings, 0 replies; 60+ messages in thread
From: Michał Górny @ 2019-07-15 13:36 UTC (permalink / raw
To: gentoo-commits
commit: f818cd84057598a58ad19b708ef26233aca35459
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 13:27:12 2019 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 13:36:34 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f818cd84
media-libs/osl: Remove local descs of CPU_FLAGS_X86
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-libs/osl/metadata.xml | 6 ------
1 file changed, 6 deletions(-)
diff --git a/media-libs/osl/metadata.xml b/media-libs/osl/metadata.xml
index bc2afe661c3..390182ac0ef 100644
--- a/media-libs/osl/metadata.xml
+++ b/media-libs/osl/metadata.xml
@@ -19,12 +19,6 @@
lights, displacement, and pattern generation.
</longdescription>
<use>
- <flag name="cpu_flags_x86_avx512f" restrict=">=media-libs/osl-1.9.0">
- SIMD Optimization
- </flag>
- <flag name="cpu_flags_x86_f16c" restrict=">=media-libs/osl-1.9.0">
- SIMD Optimization
- </flag>
<flag name="partio">Use <pkg>media-libs/partio</pkg></flag>
<flag name="qt5">Build the osltoy binary</flag>
</use>
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2020-03-22 14:40 Andreas Sturmlechner
0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2020-03-22 14:40 UTC (permalink / raw
To: gentoo-commits
commit: 02144b8da2eb37cc3efdc1d48984d8ce41121975
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 22 14:39:06 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 14:40:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02144b8d
media-libs/osl: Restrict 1.10.5 to <sys-devel/clang-9
Closes: https://bugs.gentoo.org/704696
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/osl/osl-1.10.5.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-libs/osl/osl-1.10.5.ebuild b/media-libs/osl/osl-1.10.5.ebuild
index 190989d2cc9..9942f144b9a 100644
--- a/media-libs/osl/osl-1.10.5.ebuild
+++ b/media-libs/osl/osl-1.10.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -30,6 +30,7 @@ RDEPEND="
>=media-libs/openexr-2.2.0:=
>=media-libs/openimageio-1.8.5
>=sys-devel/clang-5:=
+ <sys-devel/clang-9:=
sys-libs/zlib:=
partio? ( media-libs/partio )
qt5? (
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2020-03-22 18:02 Mikle Kolyada
0 siblings, 0 replies; 60+ messages in thread
From: Mikle Kolyada @ 2020-03-22 18:02 UTC (permalink / raw
To: gentoo-commits
commit: a03b68d524c1e85dd3efa771ad80e5bc30257490
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 22 18:01:45 2020 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sun Mar 22 18:01:45 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a03b68d5
media-libs/osl: amd64 stable wrt bug #713998
Package-Manager: Portage-2.3.89, Repoman-2.3.20
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
media-libs/osl/osl-1.10.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/osl/osl-1.10.5.ebuild b/media-libs/osl/osl-1.10.5.ebuild
index 9942f144b9a..b5c979d4f30 100644
--- a/media-libs/osl/osl-1.10.5.ebuild
+++ b/media-libs/osl/osl-1.10.5.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
X86_CPU_FEATURES=(
sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2020-06-10 7:32 Michał Górny
0 siblings, 0 replies; 60+ messages in thread
From: Michał Górny @ 2020-06-10 7:32 UTC (permalink / raw
To: gentoo-commits
commit: 5a3113bc81109fc80c75bdb711c25bcaaa161f46
Author: Adrian Grigo <agrigo2001 <AT> yahoo <DOT> com <DOT> au>
AuthorDate: Tue May 12 01:24:28 2020 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 10 07:31:51 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a3113bc
media-libs/osl: Version bump to 1.10.10
Version bump osl to 1.10.10
This version of osl supports up to LLVM/Clang 9.
Minimum versions of dependencies have been removed where all versions
in the tree are suitable. The patch to find openexr used in the
previous version is no longer required as it has been incorporated
upstream.
Signed-off-by: Adrian Grigo <agrigo2001 <AT> yahoo.com.au>
Closes: https://bugs.gentoo.org/717506
Closes: https://bugs.gentoo.org/720242
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Closes: https://github.com/gentoo/gentoo/pull/15757
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
media-libs/osl/Manifest | 1 +
media-libs/osl/osl-1.10.10.ebuild | 86 +++++++++++++++++++++++++++++++++++++++
2 files changed, 87 insertions(+)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 26e99aaa370..1ccafafa6ad 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1 +1,2 @@
+DIST osl-1.10.10.tar.gz 13549066 BLAKE2B d91360d4cde0e8f70e01aa5cbf14bd6dc30be47ba96d4f2206adb75ef8f14af6af43b00f025cbf9b9c03cfcf117380ee9bb0a93129c314b249151cd97135757b SHA512 10371d9aefa786fefbae15cb9c71d7360bd903a36734840f7d0a960a615d48096b7170596bd934d10579b33d8f8398fc0e00471a10cd517c1a4a601169b2ca13
DIST osl-1.10.5.tar.gz 13543151 BLAKE2B 3c67834d9ab6d4d725ecde622c402707593b9aaf25f1e94f9ed6b004c28fa9b7b90cfd0d320cb2898f77f8883ac14a71310abaf63a5b06704565c5a3bdea09b4 SHA512 d704b623836edca4c3fe9c18f33b8d76f4625036228fc977732c600e23e16da4cb4bf311607019b251d734b63a184bde0f7726f144ecd5bcd7866938d95bfdff
diff --git a/media-libs/osl/osl-1.10.10.ebuild b/media-libs/osl/osl-1.10.10.ebuild
new file mode 100644
index 00000000000..e37aeee7734
--- /dev/null
+++ b/media-libs/osl/osl-1.10.10.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake llvm toolchain-funcs
+
+# check this on updates
+LLVM_MAX_SLOT=9
+
+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}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~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[@]%:*}"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/pugixml
+ media-libs/openexr:=
+ media-libs/openimageio:=
+ <sys-devel/clang-10:=
+ sys-libs/zlib:=
+ 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}/${PN}-1.10.5-fix-install-shaders.patch"
+)
+
+# 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}"
+}
+
+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_INSTALL_DOCDIR="share/doc/${PF}"
+ -DENABLERTTI=OFF
+ -DINSTALL_DOCS=$(usex doc)
+ -DLLVM_STATIC=ON
+ -DOSL_BUILD_TESTS=$(usex test)
+ -DSTOP_ON_WARNING=OFF
+ -DUSE_PARTIO=$(usex partio)
+ -DUSE_QT=$(usex qt5)
+ -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2020-07-30 22:07 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2020-07-30 22:07 UTC (permalink / raw
To: gentoo-commits
commit: dc1fdb8720716fc88037fbdcdf710635316594f4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 30 22:03:42 2020 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jul 30 22:03:53 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc1fdb87
media-libs/osl: amd64 stable (bug #734552)
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.10.10.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/osl/osl-1.10.10.ebuild b/media-libs/osl/osl-1.10.10.ebuild
index e37aeee7734..1b2d7c3168e 100644
--- a/media-libs/osl/osl-1.10.10.ebuild
+++ b/media-libs/osl/osl-1.10.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
X86_CPU_FEATURES=(
sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2020-12-01 11:24 Joonas Niilola
0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2020-12-01 11:24 UTC (permalink / raw
To: gentoo-commits
commit: cf4b1ff64f961b0fd360e4f74351fa3325081890
Author: Adrian Grigo <agrigo2001 <AT> yahoo <DOT> com <DOT> au>
AuthorDate: Fri Nov 27 00:27:24 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Dec 1 11:22:09 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf4b1ff6
media-libs/osl: Version bump to 1.11.9.0
Version bump to 1.11.9.0, using LLVM 10 and C++14
using shared libraries to prevent compilation error
New dependency on pybind11 added
ENABLERTTI removed as flag removed upstream
LLVM_ROOT set to prevent errors with pugixml
Shader install patch replaced with setting
OSL_SHADER_INSTALL_DIR and OSL_PTX_INSTALLDIR
Thanks again to Luke A Guest, Sam James, Joonas Niilola,
Reggie and mehw for contributions to this update.
Signed-off-by: Adrian Grigo <agrigo2001 <AT> yahoo.com.au>
Closes: https://bugs.gentoo.org/747475
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Closes: https://github.com/gentoo/gentoo/pull/18418
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/osl/Manifest | 1 +
media-libs/osl/osl-1.11.9.0.ebuild | 93 ++++++++++++++++++++++++++++++++++++++
2 files changed, 94 insertions(+)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 9d9c3beb49e..1b6d5ed44f2 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,2 +1,3 @@
DIST osl-1.10.10.tar.gz 13549066 BLAKE2B d91360d4cde0e8f70e01aa5cbf14bd6dc30be47ba96d4f2206adb75ef8f14af6af43b00f025cbf9b9c03cfcf117380ee9bb0a93129c314b249151cd97135757b SHA512 10371d9aefa786fefbae15cb9c71d7360bd903a36734840f7d0a960a615d48096b7170596bd934d10579b33d8f8398fc0e00471a10cd517c1a4a601169b2ca13
DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16adf2637fba648a75f98c10103c7c4b5fa1d091ab43b0929f85523b0fa79589eca56686490ee61c48069593767 SHA512 bc39fcf80878160807e35c52654a2993a7d33b3ab2fbf567ec50d0b23636a19064830afab5734f1e39276c77e843bbfe1d6b10a64fd4ebe69b17c8faa5378201
+DIST osl-1.11.9.0.tar.gz 14137334 BLAKE2B db68cb77d6af56e711b897371a4fe9386bf1a62625f9fa04012e9ec22346933fe3b0112301a8ad17ac6dd9c01c2a8e00c6d6e557d947870fd39bb3dec1443fd8 SHA512 f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65
diff --git a/media-libs/osl/osl-1.11.9.0.ebuild b/media-libs/osl/osl-1.11.9.0.ebuild
new file mode 100644
index 00000000000..9ab4388c8df
--- /dev/null
+++ b/media-libs/osl/osl-1.11.9.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake llvm toolchain-funcs
+
+# check this on updates
+LLVM_MAX_SLOT=10
+
+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 ~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[@]%:*}"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/pugixml
+ media-libs/openexr:=
+ media-libs/openimageio:=
+ <sys-devel/clang-11:=
+ sys-libs/zlib
+ partio? ( media-libs/partio )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+
+DEPEND="
+ ${RDEPEND}
+ dev-python/pybind11
+"
+
+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}"
+}
+
+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)
+ # LLVM10+ needs CPP14+
+ local mycmakeargs=(
+ -DCMAKE_CXX_STANDARD=14
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DINSTALL_DOCS=$(usex doc)
+ -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_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2020-12-01 11:24 Joonas Niilola
0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2020-12-01 11:24 UTC (permalink / raw
To: gentoo-commits
commit: beb901a124bd4b8b9c85e074ef3f607c81004c55
Author: Adrian Grigo <agrigo2001 <AT> yahoo <DOT> com <DOT> au>
AuthorDate: Thu Nov 26 23:09:30 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Dec 1 11:22:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=beb901a1
media-libs/osl: Version bump to 1.10.13
This version works with openimageio 2 (fixes build failure of 1.10.10)
Add support for LLVM 10, which requires C++14
Enable shared libraries
Add github page as second homepage
Added subslot operator otherwise upgrading to 1.11 will leave behind
preserved libraries (blender is the only current client in the tree)
Thanks to Mehw, Cyrillic, Peter Karlsson, Reggie, Luke A Guest, and
Joonas Niilola for their contributions to the bugs mentioned below
which forms the bulk of this update.
Signed-off-by: Adrian Grigo <agrigo2001 <AT> yahoo.com.au>
Closes: https://bugs.gentoo.org/735750
Closes: https://bugs.gentoo.org/751580
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/osl/Manifest | 1 +
media-libs/osl/osl-1.10.13.ebuild | 87 +++++++++++++++++++++++++++++++++++++++
2 files changed, 88 insertions(+)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 2001775196d..9d9c3beb49e 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1 +1,2 @@
DIST osl-1.10.10.tar.gz 13549066 BLAKE2B d91360d4cde0e8f70e01aa5cbf14bd6dc30be47ba96d4f2206adb75ef8f14af6af43b00f025cbf9b9c03cfcf117380ee9bb0a93129c314b249151cd97135757b SHA512 10371d9aefa786fefbae15cb9c71d7360bd903a36734840f7d0a960a615d48096b7170596bd934d10579b33d8f8398fc0e00471a10cd517c1a4a601169b2ca13
+DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16adf2637fba648a75f98c10103c7c4b5fa1d091ab43b0929f85523b0fa79589eca56686490ee61c48069593767 SHA512 bc39fcf80878160807e35c52654a2993a7d33b3ab2fbf567ec50d0b23636a19064830afab5734f1e39276c77e843bbfe1d6b10a64fd4ebe69b17c8faa5378201
diff --git a/media-libs/osl/osl-1.10.13.ebuild b/media-libs/osl/osl-1.10.13.ebuild
new file mode 100644
index 00000000000..85fdd979a7f
--- /dev/null
+++ b/media-libs/osl/osl-1.10.13.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake llvm toolchain-funcs
+
+# check this on updates
+LLVM_MAX_SLOT=10
+
+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/10"
+KEYWORDS="~amd64 ~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[@]%:*}"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/pugixml
+ media-libs/openexr:=
+ media-libs/openimageio:=
+ <sys-devel/clang-11:=
+ sys-libs/zlib
+ 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}/${PN}-1.10.5-fix-install-shaders.patch"
+)
+
+# 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}"
+}
+
+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}"
+ -DENABLERTTI=OFF
+ -DINSTALL_DOCS=$(usex doc)
+ -DLLVM_STATIC=OFF
+ -DOSL_BUILD_TESTS=$(usex test)
+ -DSTOP_ON_WARNING=OFF
+ -DUSE_PARTIO=$(usex partio)
+ -DUSE_QT=$(usex qt5)
+ -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2020-12-11 7:58 Joonas Niilola
0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2020-12-11 7:58 UTC (permalink / raw
To: gentoo-commits
commit: 206b84cc385c0f2a6d09102d8a862f637808bde4
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 11 07:56:03 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 07:58:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=206b84cc
media-libs/osl: stabilize 1.10.13 on amd64
Closes: https://bugs.gentoo.org/759442
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/osl/osl-1.10.13.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/osl/osl-1.10.13.ebuild b/media-libs/osl/osl-1.10.13.ebuild
index 85fdd979a7f..fdab29afa48 100644
--- a/media-libs/osl/osl-1.10.13.ebuild
+++ b/media-libs/osl/osl-1.10.13.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
LICENSE="BSD"
SLOT="0/10"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
X86_CPU_FEATURES=(
sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2020-12-11 7:58 Joonas Niilola
0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2020-12-11 7:58 UTC (permalink / raw
To: gentoo-commits
commit: 40e5c615573535fd9685875d19a3ce10f27bc5ed
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 11 07:56:30 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Dec 11 07:58:11 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40e5c615
media-libs/osl: remove old 1.10.10
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/osl/Manifest | 1 -
media-libs/osl/osl-1.10.10.ebuild | 86 ---------------------------------------
2 files changed, 87 deletions(-)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 1b6d5ed44f2..db1eb09c70c 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,3 +1,2 @@
-DIST osl-1.10.10.tar.gz 13549066 BLAKE2B d91360d4cde0e8f70e01aa5cbf14bd6dc30be47ba96d4f2206adb75ef8f14af6af43b00f025cbf9b9c03cfcf117380ee9bb0a93129c314b249151cd97135757b SHA512 10371d9aefa786fefbae15cb9c71d7360bd903a36734840f7d0a960a615d48096b7170596bd934d10579b33d8f8398fc0e00471a10cd517c1a4a601169b2ca13
DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16adf2637fba648a75f98c10103c7c4b5fa1d091ab43b0929f85523b0fa79589eca56686490ee61c48069593767 SHA512 bc39fcf80878160807e35c52654a2993a7d33b3ab2fbf567ec50d0b23636a19064830afab5734f1e39276c77e843bbfe1d6b10a64fd4ebe69b17c8faa5378201
DIST osl-1.11.9.0.tar.gz 14137334 BLAKE2B db68cb77d6af56e711b897371a4fe9386bf1a62625f9fa04012e9ec22346933fe3b0112301a8ad17ac6dd9c01c2a8e00c6d6e557d947870fd39bb3dec1443fd8 SHA512 f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65
diff --git a/media-libs/osl/osl-1.10.10.ebuild b/media-libs/osl/osl-1.10.10.ebuild
deleted file mode 100644
index 1b2d7c3168e..00000000000
--- a/media-libs/osl/osl-1.10.10.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake llvm toolchain-funcs
-
-# check this on updates
-LLVM_MAX_SLOT=9
-
-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}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~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[@]%:*}"
-
-RDEPEND="
- dev-libs/boost:=
- dev-libs/pugixml
- media-libs/openexr:=
- media-libs/openimageio:=
- <sys-devel/clang-10:=
- sys-libs/zlib:=
- 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}/${PN}-1.10.5-fix-install-shaders.patch"
-)
-
-# 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}"
-}
-
-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_INSTALL_DOCDIR="share/doc/${PF}"
- -DENABLERTTI=OFF
- -DINSTALL_DOCS=$(usex doc)
- -DLLVM_STATIC=ON
- -DOSL_BUILD_TESTS=$(usex test)
- -DSTOP_ON_WARNING=OFF
- -DUSE_PARTIO=$(usex partio)
- -DUSE_QT=$(usex qt5)
- -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2021-02-22 7:12 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-02-22 7:12 UTC (permalink / raw
To: gentoo-commits
commit: dd0ae549dec56c651996f458dc60a5d5027945c4
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 22 07:12:33 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 07:12:33 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd0ae549
media-libs/osl: Keyword 1.11.9.0 arm, #556758
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.11.9.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/osl/osl-1.11.9.0.ebuild b/media-libs/osl/osl-1.11.9.0.ebuild
index 9ab4388c8df..1acabfffb6e 100644
--- a/media-libs/osl/osl-1.11.9.0.ebuild
+++ b/media-libs/osl/osl-1.11.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
LICENSE="BSD"
SLOT="0/11"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
X86_CPU_FEATURES=(
sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2021-03-05 18:39 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-03-05 18:39 UTC (permalink / raw
To: gentoo-commits
commit: 3314ae26b35c5519ab08da1ee6859cc14bd97587
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 5 18:38:48 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar 5 18:38:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3314ae26
media-libs/osl: Keyword 1.11.9.0 arm64, #556758
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.11.9.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/osl/osl-1.11.9.0.ebuild b/media-libs/osl/osl-1.11.9.0.ebuild
index 1acabfffb6e..ea80a949044 100644
--- a/media-libs/osl/osl-1.11.9.0.ebuild
+++ b/media-libs/osl/osl-1.11.9.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
LICENSE="BSD"
SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
X86_CPU_FEATURES=(
sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2021-09-19 3:09 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-09-19 3:09 UTC (permalink / raw
To: gentoo-commits
commit: 99dfafe2c16183644730233e34bc7038e677a25b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 19 03:08:04 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 19 03:08:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99dfafe2
media-libs/osl: Keyword 1.12.0.2 arm64, #795279
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.12.0.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/osl/osl-1.12.0.2.ebuild b/media-libs/osl/osl-1.12.0.2.ebuild
index a312fa3bc86..16f3f9196a6 100644
--- a/media-libs/osl/osl-1.12.0.2.ebuild
+++ b/media-libs/osl/osl-1.12.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
X86_CPU_FEATURES=(
sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2021-09-19 3:09 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-09-19 3:09 UTC (permalink / raw
To: gentoo-commits
commit: 7f04236b86ba9bcf2de6f76f1585448192f0e752
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 19 03:08:16 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 19 03:08:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f04236b
media-libs/osl: Keyword 1.12.0.2 arm, #795279
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.12.0.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/osl/osl-1.12.0.2.ebuild b/media-libs/osl/osl-1.12.0.2.ebuild
index 16f3f9196a6..7fe35048e7d 100644
--- a/media-libs/osl/osl-1.12.0.2.ebuild
+++ b/media-libs/osl/osl-1.12.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
X86_CPU_FEATURES=(
sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2021-09-19 3:30 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-09-19 3:30 UTC (permalink / raw
To: gentoo-commits
commit: fa9a4efe37206ad099ca8f0ae0140ad29541fb72
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 19 03:29:16 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 19 03:29:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa9a4efe
media-libs/osl: Keyword 1.12.0.2 ppc64, #795279
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.12.0.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/osl/osl-1.12.0.2.ebuild b/media-libs/osl/osl-1.12.0.2.ebuild
index 7fe35048e7d..87525179a74 100644
--- a/media-libs/osl/osl-1.12.0.2.ebuild
+++ b/media-libs/osl/osl-1.12.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
X86_CPU_FEATURES=(
sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2021-09-19 5:20 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-09-19 5:20 UTC (permalink / raw
To: gentoo-commits
commit: 2e6aff0061e5cd9531e7489647958ecc6ca8bb5a
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 19 05:19:22 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 19 05:20:25 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e6aff00
media-libs/osl: fix MisplacedEclassVar
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.11.15.0.ebuild | 2 ++
media-libs/osl/osl-1.11.9.0-r1.ebuild | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/media-libs/osl/osl-1.11.15.0.ebuild b/media-libs/osl/osl-1.11.15.0.ebuild
index 612465934cb..f4a19303d28 100644
--- a/media-libs/osl/osl-1.11.15.0.ebuild
+++ b/media-libs/osl/osl-1.11.15.0.ebuild
@@ -8,6 +8,8 @@ PYTHON_COMPAT=( python3_{8,9,10} )
# check this on updates
LLVM_MAX_SLOT=13
+CMAKE_REMOVE_MODULES_LIST=()
+
inherit cmake llvm toolchain-funcs python-single-r1
DESCRIPTION="Advanced shading language for production GI renderers"
diff --git a/media-libs/osl/osl-1.11.9.0-r1.ebuild b/media-libs/osl/osl-1.11.9.0-r1.ebuild
index a85d2827df7..10bd18b8492 100644
--- a/media-libs/osl/osl-1.11.9.0-r1.ebuild
+++ b/media-libs/osl/osl-1.11.9.0-r1.ebuild
@@ -8,6 +8,8 @@ PYTHON_COMPAT=( python3_{8,9,10} )
# check this on updates
LLVM_MAX_SLOT=10
+CMAKE_REMOVE_MODULES_LIST=()
+
inherit cmake llvm toolchain-funcs python-single-r1
DESCRIPTION="Advanced shading language for production GI renderers"
@@ -56,8 +58,6 @@ BDEPEND="
PATCHES=()
-CMAKE_REMOVE_MODULES_LIST=()
-
# Restricting tests as Make file handles them differently
RESTRICT="test"
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2021-09-19 5:20 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-09-19 5:20 UTC (permalink / raw
To: gentoo-commits
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
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2021-09-19 5:24 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-09-19 5:24 UTC (permalink / raw
To: gentoo-commits
commit: a11d1c3b5d9364b7b3a870d19fa34cb0a4499028
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 19 05:23:19 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Sep 19 05:23:19 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a11d1c3b
media-libs/osl: Stabilize 1.12.0.2 amd64, #812548
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.12.0.2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/osl/osl-1.12.0.2.ebuild b/media-libs/osl/osl-1.12.0.2.ebuild
index 87525179a74..7532e89f4dd 100644
--- a/media-libs/osl/osl-1.12.0.2.ebuild
+++ b/media-libs/osl/osl-1.12.0.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
X86_CPU_FEATURES=(
sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2021-10-04 0:08 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-10-04 0:08 UTC (permalink / raw
To: gentoo-commits
commit: e2f3431518e4bf310d623077877f3d9b6c605cdd
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 4 00:08:28 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 4 00:08:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2f34315
media-libs/osl: needs <= LLVM 12
Closes: https://bugs.gentoo.org/816090
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.11.15.0.ebuild | 2 +-
media-libs/osl/osl-1.12.0.2-r1.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/osl/osl-1.11.15.0.ebuild b/media-libs/osl/osl-1.11.15.0.ebuild
index f4a19303d28..7b33287ed3f 100644
--- a/media-libs/osl/osl-1.11.15.0.ebuild
+++ b/media-libs/osl/osl-1.11.15.0.ebuild
@@ -6,7 +6,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{8,9,10} )
# check this on updates
-LLVM_MAX_SLOT=13
+LLVM_MAX_SLOT=12
CMAKE_REMOVE_MODULES_LIST=()
diff --git a/media-libs/osl/osl-1.12.0.2-r1.ebuild b/media-libs/osl/osl-1.12.0.2-r1.ebuild
index d8094d70371..8c235e4a108 100644
--- a/media-libs/osl/osl-1.12.0.2-r1.ebuild
+++ b/media-libs/osl/osl-1.12.0.2-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{8,9,10} )
# check this on updates
-LLVM_MAX_SLOT=13
+LLVM_MAX_SLOT=12
inherit cmake llvm toolchain-funcs python-single-r1
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2021-10-04 0:12 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-10-04 0:12 UTC (permalink / raw
To: gentoo-commits
commit: b8f26837493d36eee145c656abfabf3d99581c19
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 4 00:11:48 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 4 00:11:48 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f26837
media-libs/osl: fix MisplacedEclassVar
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.10.13.ebuild | 4 ++--
media-libs/osl/osl-1.11.15.0.ebuild | 4 +---
media-libs/osl/osl-1.11.9.0-r1.ebuild | 2 +-
media-libs/osl/osl-1.11.9.0.ebuild | 6 +++---
media-libs/osl/osl-1.12.0.2-r1.ebuild | 2 +-
media-libs/osl/osl-1.12.0.2.ebuild | 2 +-
6 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/media-libs/osl/osl-1.10.13.ebuild b/media-libs/osl/osl-1.10.13.ebuild
index fdab29afa48..57d75feb4aa 100644
--- a/media-libs/osl/osl-1.10.13.ebuild
+++ b/media-libs/osl/osl-1.10.13.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -49,7 +49,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.10.5-fix-install-shaders.patch"
)
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
RESTRICT="test"
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
diff --git a/media-libs/osl/osl-1.11.15.0.ebuild b/media-libs/osl/osl-1.11.15.0.ebuild
index 7b33287ed3f..2874e67dd89 100644
--- a/media-libs/osl/osl-1.11.15.0.ebuild
+++ b/media-libs/osl/osl-1.11.15.0.ebuild
@@ -60,9 +60,7 @@ PATCHES=(
"${FILESDIR}"/${P}-fix-cmake.patch
)
-CMAKE_REMOVE_MODULES_LIST=()
-
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
RESTRICT="test"
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
diff --git a/media-libs/osl/osl-1.11.9.0-r1.ebuild b/media-libs/osl/osl-1.11.9.0-r1.ebuild
index 10bd18b8492..2c050efe222 100644
--- a/media-libs/osl/osl-1.11.9.0-r1.ebuild
+++ b/media-libs/osl/osl-1.11.9.0-r1.ebuild
@@ -58,7 +58,7 @@ BDEPEND="
PATCHES=()
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
RESTRICT="test"
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
diff --git a/media-libs/osl/osl-1.11.9.0.ebuild b/media-libs/osl/osl-1.11.9.0.ebuild
index ea80a949044..eafd2f78c74 100644
--- a/media-libs/osl/osl-1.11.9.0.ebuild
+++ b/media-libs/osl/osl-1.11.9.0.ebuild
@@ -7,6 +7,8 @@ inherit cmake llvm toolchain-funcs
# check this on updates
LLVM_MAX_SLOT=10
+CMAKE_REMOVE_MODULES_LIST=()
+
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"
@@ -51,9 +53,7 @@ BDEPEND="
PATCHES=()
-CMAKE_REMOVE_MODULES_LIST=()
-
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
RESTRICT="test"
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
diff --git a/media-libs/osl/osl-1.12.0.2-r1.ebuild b/media-libs/osl/osl-1.12.0.2-r1.ebuild
index 8c235e4a108..11944da63f6 100644
--- a/media-libs/osl/osl-1.12.0.2-r1.ebuild
+++ b/media-libs/osl/osl-1.12.0.2-r1.ebuild
@@ -60,7 +60,7 @@ PATCHES=(
${FILESDIR}/${P}-llvm-12.patch
)
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
RESTRICT="test"
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"
diff --git a/media-libs/osl/osl-1.12.0.2.ebuild b/media-libs/osl/osl-1.12.0.2.ebuild
index 7532e89f4dd..155cb0665f2 100644
--- a/media-libs/osl/osl-1.12.0.2.ebuild
+++ b/media-libs/osl/osl-1.12.0.2.ebuild
@@ -51,7 +51,7 @@ PATCHES=(
${FILESDIR}/${P}-llvm-12.patch
)
-# Restricting tests as Make file handles them differently
+# Restricting tests as Makefile handles them differently
RESTRICT="test"
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2021-10-04 0:21 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-10-04 0:21 UTC (permalink / raw
To: gentoo-commits
commit: 1eda236a9d434df2cadf8b091be91c9cd421893b
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 4 00:21:04 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Oct 4 00:21:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eda236a
media-libs/osl: fix MisplacedEclassVar again
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.11.9.0.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-libs/osl/osl-1.11.9.0.ebuild b/media-libs/osl/osl-1.11.9.0.ebuild
index eafd2f78c74..723fee86f66 100644
--- a/media-libs/osl/osl-1.11.9.0.ebuild
+++ b/media-libs/osl/osl-1.11.9.0.ebuild
@@ -2,13 +2,14 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit cmake llvm toolchain-funcs
# check this on updates
LLVM_MAX_SLOT=10
CMAKE_REMOVE_MODULES_LIST=()
+inherit cmake llvm toolchain-funcs
+
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"
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2021-11-02 20:29 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-11-02 20:29 UTC (permalink / raw
To: gentoo-commits
commit: c5806771f57b92a5736d6525301403771c9e1132
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 2 20:14:32 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 2 20:15:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5806771
media-libs/osl: depend on older openimageio for now
Closes: https://bugs.gentoo.org/821202
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/{osl-1.11.15.0.ebuild => osl-1.11.15.0-r1.ebuild} | 3 ++-
media-libs/osl/{osl-1.12.0.2-r1.ebuild => osl-1.12.0.2-r3.ebuild} | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/media-libs/osl/osl-1.11.15.0.ebuild b/media-libs/osl/osl-1.11.15.0-r1.ebuild
similarity index 97%
rename from media-libs/osl/osl-1.11.15.0.ebuild
rename to media-libs/osl/osl-1.11.15.0-r1.ebuild
index 2874e67dd89..5f806806db4 100644
--- a/media-libs/osl/osl-1.11.15.0.ebuild
+++ b/media-libs/osl/osl-1.11.15.0-r1.ebuild
@@ -29,11 +29,12 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
+# See bug #821202 for openimageio < dep
RDEPEND="
dev-libs/boost:=
dev-libs/pugixml
media-libs/openexr:=
- media-libs/openimageio:=
+ <media-libs/openimageio-2.3:=
<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
sys-libs/zlib
partio? ( media-libs/partio )
diff --git a/media-libs/osl/osl-1.12.0.2-r1.ebuild b/media-libs/osl/osl-1.12.0.2-r3.ebuild
similarity index 96%
rename from media-libs/osl/osl-1.12.0.2-r1.ebuild
rename to media-libs/osl/osl-1.12.0.2-r3.ebuild
index 11944da63f6..1006a0b1636 100644
--- a/media-libs/osl/osl-1.12.0.2-r1.ebuild
+++ b/media-libs/osl/osl-1.12.0.2-r3.ebuild
@@ -27,11 +27,12 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+# See bug #821202 for openimageio < dep
RDEPEND="
dev-libs/boost:=
dev-libs/pugixml
media-libs/openexr:=
- media-libs/openimageio:=
+ <media-libs/openimageio-2.3:=
<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
sys-libs/zlib:=
python? (
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2021-11-02 20:29 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-11-02 20:29 UTC (permalink / raw
To: gentoo-commits
commit: 228ca6f3edc218317f22a8c65b13cc6366726525
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 2 20:28:52 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Nov 2 20:28:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=228ca6f3
media-libs/osl: add 1.11.16.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/Manifest | 1 +
media-libs/osl/osl-1.11.16.0.ebuild | 105 ++++++++++++++++++++++++++++++++++++
2 files changed, 106 insertions(+)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index a23760d3674..3643c48076f 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,4 +1,5 @@
DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16adf2637fba648a75f98c10103c7c4b5fa1d091ab43b0929f85523b0fa79589eca56686490ee61c48069593767 SHA512 bc39fcf80878160807e35c52654a2993a7d33b3ab2fbf567ec50d0b23636a19064830afab5734f1e39276c77e843bbfe1d6b10a64fd4ebe69b17c8faa5378201
DIST osl-1.11.15.0.tar.gz 14143372 BLAKE2B 7385d86417fd2666d7558eb459402a9720fc4b59287c2feb45c451bd1e413d102f3f286e6bc07bbeb320b9f5a96b4981851dddcf3a6eaa69d5869238811978a8 SHA512 d1df69349cb43690d0578b32caf92fe33ff570713fd87899e2ab312962c6474bd9c19df5b3b018a7498390e5933fcfbfdd3ecd450a4d91d64dd680ee74f492c5
+DIST osl-1.11.16.0.tar.gz 14143407 BLAKE2B 0e6a20ee63a836bc268f03eb943731e8bf18909bf86041532de50e51ff9fb78f9be316be9b3677cb2b0e5fddd90defab95281e6597a52e61d982ffc9fcc52f79 SHA512 717a588bb371ff64d41dc34caad6a4e8483cba32d3b8fe7db9f98e422be050b1b89e4cf7f018e1106dfc9120d2485c3d8430a63cd80344050b00082fdd45fa1b
DIST osl-1.11.9.0.tar.gz 14137334 BLAKE2B db68cb77d6af56e711b897371a4fe9386bf1a62625f9fa04012e9ec22346933fe3b0112301a8ad17ac6dd9c01c2a8e00c6d6e557d947870fd39bb3dec1443fd8 SHA512 f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65
DIST osl-1.12.0.2.tar.gz 16205315 BLAKE2B 543d120e981f093c121b4abb4c36d7d8c127555c8986df931a3040136e3ae3d84d602d73395604cd492f8d192e408f585cd6579fe6283c974778f0b99092985d SHA512 cdcd1fb348f6f2f1f889ed1895bac545e10b73e700959bc09b1df2a40cd86e69ba43a1dfaf26dedaec9c23aa17b74428d4bccc9cf7f4d27ae2fc5152adb6c010
diff --git a/media-libs/osl/osl-1.11.16.0.ebuild b/media-libs/osl/osl-1.11.16.0.ebuild
new file mode 100644
index 00000000000..d4591a784b7
--- /dev/null
+++ b/media-libs/osl/osl-1.11.16.0.ebuild
@@ -0,0 +1,105 @@
+# 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
+
+CMAKE_REMOVE_MODULES_LIST=()
+
+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"
+
+# See bug #821202 for openimageio < dep
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/pugixml
+ media-libs/openexr:=
+ <media-libs/openimageio-2.3:=
+ <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
+"
+
+# Restricting tests as Makefile 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
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2021-12-01 17:03 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-12-01 17:03 UTC (permalink / raw
To: gentoo-commits
commit: ecee0ed7ac882147acef761205edbfc9215d77b6
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 1 17:03:11 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 1 17:03:11 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecee0ed7
media-libs/osl: stabilize 1.11.16.0 for amd64
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.11.16.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/osl/osl-1.11.16.0.ebuild b/media-libs/osl/osl-1.11.16.0.ebuild
index d4591a784b78..fca8230620e4 100644
--- a/media-libs/osl/osl-1.11.16.0.ebuild
+++ b/media-libs/osl/osl-1.11.16.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
LICENSE="BSD"
SLOT="0/11"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
X86_CPU_FEATURES=(
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2021-12-01 19:35 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-12-01 19:35 UTC (permalink / raw
To: gentoo-commits
commit: 4b89d007ec8f092429d9c69fa7a1de89b29525c0
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 1 19:35:13 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 1 19:35:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b89d007
media-libs/osl: drop tests CMake option
We're not running them for now & they're broken anyway.
(Not sure how I didn't notice this earlier?!)
Closes: https://bugs.gentoo.org/827949
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.11.16.0.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-libs/osl/osl-1.11.16.0.ebuild b/media-libs/osl/osl-1.11.16.0.ebuild
index fca8230620e4..210576bec26a 100644
--- a/media-libs/osl/osl-1.11.16.0.ebuild
+++ b/media-libs/osl/osl-1.11.16.0.ebuild
@@ -91,7 +91,8 @@ src_configure() {
-DUSE_CCACHE=OFF
-DLLVM_STATIC=OFF
-DLLVM_ROOT="$(get_llvm_prefix ${LLVM_MAX_SLOT})"
- -DOSL_BUILD_TESTS=$(usex test)
+ # Breaks build for now: bug #827949
+ #-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
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2021-12-02 3:50 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-12-02 3:50 UTC (permalink / raw
To: gentoo-commits
commit: 96ffde43f96fb831a4477f71bb7bb7fa84b0b0f2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 2 03:49:34 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 2 03:49:34 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96ffde43
media-libs/osl: force use of OpenEXR/ilmbase (not imath)
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/{osl-1.11.16.0.ebuild => osl-1.11.16.0-r1.ebuild} | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/media-libs/osl/osl-1.11.16.0.ebuild b/media-libs/osl/osl-1.11.16.0-r1.ebuild
similarity index 96%
rename from media-libs/osl/osl-1.11.16.0.ebuild
rename to media-libs/osl/osl-1.11.16.0-r1.ebuild
index 210576bec26a..dd9c668ee293 100644
--- a/media-libs/osl/osl-1.11.16.0.ebuild
+++ b/media-libs/osl/osl-1.11.16.0-r1.ebuild
@@ -34,6 +34,7 @@ RDEPEND="
dev-libs/boost:=
dev-libs/pugixml
media-libs/openexr:=
+ media-libs/ilmbase:=
<media-libs/openimageio-2.3:=
<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
sys-libs/zlib
@@ -84,6 +85,9 @@ src_configure() {
local gcc=$(tc-getCC)
local mycmakeargs=(
+ # Force use of OpenEXR/ilmbase
+ -DCMAKE_DISABLE_FIND_PACKAGE_Imath=ON
+
# LLVM 10+ needs C++14
-DCMAKE_CXX_STANDARD=14
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2021-12-02 3:53 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2021-12-02 3:53 UTC (permalink / raw
To: gentoo-commits
commit: bc6e096f405b997ca1d3b2fcbc9e8e68b19b8980
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 2 03:52:13 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Dec 2 03:53:01 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc6e096f
media-libs/osl: pin to openexr:0
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/{osl-1.11.16.0-r1.ebuild => osl-1.11.16.0-r2.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/osl/osl-1.11.16.0-r1.ebuild b/media-libs/osl/osl-1.11.16.0-r2.ebuild
similarity index 99%
rename from media-libs/osl/osl-1.11.16.0-r1.ebuild
rename to media-libs/osl/osl-1.11.16.0-r2.ebuild
index dd9c668ee293..ceada4f92ae6 100644
--- a/media-libs/osl/osl-1.11.16.0-r1.ebuild
+++ b/media-libs/osl/osl-1.11.16.0-r2.ebuild
@@ -33,7 +33,7 @@ IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
RDEPEND="
dev-libs/boost:=
dev-libs/pugixml
- media-libs/openexr:=
+ media-libs/openexr:0=
media-libs/ilmbase:=
<media-libs/openimageio-2.3:=
<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2022-02-12 3:55 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-02-12 3:55 UTC (permalink / raw
To: gentoo-commits
commit: a777fb693192e9ebdad9635e9270c33e2adbe892
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 03:35:17 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 03:55:34 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a777fb69
media-libs/osl: stabilize 1.12.0.2-r3 for amd64
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.12.0.2-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/osl/osl-1.12.0.2-r3.ebuild b/media-libs/osl/osl-1.12.0.2-r3.ebuild
index 1006a0b16368..6546eb9617e4 100644
--- a/media-libs/osl/osl-1.12.0.2-r3.ebuild
+++ b/media-libs/osl/osl-1.12.0.2-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
X86_CPU_FEATURES=(
sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2022-02-12 3:55 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-02-12 3:55 UTC (permalink / raw
To: gentoo-commits
commit: e9ffcaa3e6e45bafa379b3fae35ab9fbf087f6e9
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 03:35:25 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 03:55:35 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9ffcaa3
media-libs/osl: drop 1.12.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.12.0.2.ebuild | 88 --------------------------------------
1 file changed, 88 deletions(-)
diff --git a/media-libs/osl/osl-1.12.0.2.ebuild b/media-libs/osl/osl-1.12.0.2.ebuild
deleted file mode 100644
index 155cb0665f23..000000000000
--- a/media-libs/osl/osl-1.12.0.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit cmake llvm toolchain-funcs
-
-# check this on updates
-LLVM_MAX_SLOT=12
-
-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[@]%:*}"
-
-RDEPEND="
- dev-libs/boost:=
- dev-libs/pugixml
- media-libs/openexr:=
- media-libs/openimageio:=
- <=sys-devel/clang-13:=
- sys-libs/zlib:=
- dev-python/pybind11
- 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 Makefile handles them differently
-RESTRICT="test"
-
-S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"
-
-llvm_check_deps() {
- has_version -r "sys-devel/clang:${LLVM_SLOT}"
-}
-
-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)
- -DLLVM_STATIC=OFF
- -DOSL_BUILD_TESTS=$(usex test)
- -DSTOP_ON_WARNING=OFF
- -DUSE_PARTIO=$(usex partio)
- -DUSE_QT=$(usex qt5)
- -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
- )
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2022-02-12 3:55 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-02-12 3:55 UTC (permalink / raw
To: gentoo-commits
commit: 8e668cea9c3af527b7d00f77558f6b244d7ab7ad
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 03:47:19 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 03:55:37 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e668cea
media-libs/osl: add 1.11.17.0
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/Manifest | 1 +
media-libs/osl/osl-1.11.17.0.ebuild | 113 ++++++++++++++++++++++++++++++++++++
2 files changed, 114 insertions(+)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index f3343cf6bdd1..4d5068e24a70 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,4 +1,5 @@
DIST osl-1.11.15.0.tar.gz 14143372 BLAKE2B 7385d86417fd2666d7558eb459402a9720fc4b59287c2feb45c451bd1e413d102f3f286e6bc07bbeb320b9f5a96b4981851dddcf3a6eaa69d5869238811978a8 SHA512 d1df69349cb43690d0578b32caf92fe33ff570713fd87899e2ab312962c6474bd9c19df5b3b018a7498390e5933fcfbfdd3ecd450a4d91d64dd680ee74f492c5
DIST osl-1.11.16.0.tar.gz 14143407 BLAKE2B 0e6a20ee63a836bc268f03eb943731e8bf18909bf86041532de50e51ff9fb78f9be316be9b3677cb2b0e5fddd90defab95281e6597a52e61d982ffc9fcc52f79 SHA512 717a588bb371ff64d41dc34caad6a4e8483cba32d3b8fe7db9f98e422be050b1b89e4cf7f018e1106dfc9120d2485c3d8430a63cd80344050b00082fdd45fa1b
+DIST osl-1.11.17.0.tar.gz 13888749 BLAKE2B 284489a2dc580bade93894c43c22d99d88e249329e10922c9c6dde7fc0eed3f741e279cc5fc043ce513ea59ddcea4a3576e34c6fd2294aadc727bdc8d422ed26 SHA512 14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2
DIST osl-1.12.0.2.tar.gz 16205315 BLAKE2B 543d120e981f093c121b4abb4c36d7d8c127555c8986df931a3040136e3ae3d84d602d73395604cd492f8d192e408f585cd6579fe6283c974778f0b99092985d SHA512 cdcd1fb348f6f2f1f889ed1895bac545e10b73e700959bc09b1df2a40cd86e69ba43a1dfaf26dedaec9c23aa17b74428d4bccc9cf7f4d27ae2fc5152adb6c010
DIST osl-1.12.4.1.tar.gz 17716100 BLAKE2B eddd614ad4631446ff9de5e6c11cb8c19f9226b3306dca39a37827b4a03f7dc034b321ea3cce75e33dbe93dbb2d7dd09a0bf5ba222a693ad7acb6d96c529d2d9 SHA512 eaee1b539fa10ec6703db19acf0cd91cffcd44f4ce9aff3d4e00abd3ba7d8cd3557b37c57c902d435181bc983623828a06a778377b09f40ccac2e430addce4d4
diff --git a/media-libs/osl/osl-1.11.17.0.ebuild b/media-libs/osl/osl-1.11.17.0.ebuild
new file mode 100644
index 000000000000..58e331049861
--- /dev/null
+++ b/media-libs/osl/osl-1.11.17.0.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2022 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
+
+CMAKE_REMOVE_MODULES_LIST=()
+
+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"
+# TODO: drop .1 on next SONAME change (probably 1.11 -> 1.12), we needed
+# a nudge to force rebuilds due to openexr 2 -> openexr 3 change.
+SLOT="0/$(ver_cut 2).1"
+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"
+
+# See bug #821202 for openimageio < dep
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/pugixml
+ media-libs/openexr:3=
+ dev-libs/imath:=
+ <media-libs/openimageio-2.3:=
+ <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
+"
+
+# Restricting tests as Makefile handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.11.16.0-openexr-3-imath.patch
+)
+
+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})"
+ # Breaks build for now: bug #827949
+ #-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
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2022-02-12 4:43 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-02-12 4:43 UTC (permalink / raw
To: gentoo-commits
commit: 177d9b9ffb35e21ac4923682402d797174694e2d
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 04:42:39 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 04:42:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=177d9b9f
media-libs/osl: update dep bounds for OpenEXR 3 conversion
This helps to avoid pulling in versions which might've been linked
against OpenEXR 2.
Bug: https://bugs.gentoo.org/831357
Bug: https://bugs.gentoo.org/832862
Bug: https://bugs.gentoo.org/821202
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/{osl-1.11.16.0-r3.ebuild => osl-1.11.16.0-r4.ebuild} | 3 +--
media-libs/osl/{osl-1.11.17.0.ebuild => osl-1.11.17.0-r1.ebuild} | 3 +--
media-libs/osl/{osl-1.12.0.2-r3.ebuild => osl-1.12.0.2-r4.ebuild} | 3 +--
media-libs/osl/{osl-1.12.4.1.ebuild => osl-1.12.4.1-r1.ebuild} | 3 +--
4 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/media-libs/osl/osl-1.11.16.0-r3.ebuild b/media-libs/osl/osl-1.11.16.0-r4.ebuild
similarity index 97%
rename from media-libs/osl/osl-1.11.16.0-r3.ebuild
rename to media-libs/osl/osl-1.11.16.0-r4.ebuild
index 58e331049861..31e118f6baa9 100644
--- a/media-libs/osl/osl-1.11.16.0-r3.ebuild
+++ b/media-libs/osl/osl-1.11.16.0-r4.ebuild
@@ -31,13 +31,12 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
-# See bug #821202 for openimageio < dep
RDEPEND="
dev-libs/boost:=
dev-libs/pugixml
media-libs/openexr:3=
dev-libs/imath:=
- <media-libs/openimageio-2.3:=
+ >=media-libs/openimageio-2.3.12.0:=
<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
sys-libs/zlib
partio? ( media-libs/partio )
diff --git a/media-libs/osl/osl-1.11.17.0.ebuild b/media-libs/osl/osl-1.11.17.0-r1.ebuild
similarity index 97%
rename from media-libs/osl/osl-1.11.17.0.ebuild
rename to media-libs/osl/osl-1.11.17.0-r1.ebuild
index 58e331049861..31e118f6baa9 100644
--- a/media-libs/osl/osl-1.11.17.0.ebuild
+++ b/media-libs/osl/osl-1.11.17.0-r1.ebuild
@@ -31,13 +31,12 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
-# See bug #821202 for openimageio < dep
RDEPEND="
dev-libs/boost:=
dev-libs/pugixml
media-libs/openexr:3=
dev-libs/imath:=
- <media-libs/openimageio-2.3:=
+ >=media-libs/openimageio-2.3.12.0:=
<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
sys-libs/zlib
partio? ( media-libs/partio )
diff --git a/media-libs/osl/osl-1.12.0.2-r3.ebuild b/media-libs/osl/osl-1.12.0.2-r4.ebuild
similarity index 96%
rename from media-libs/osl/osl-1.12.0.2-r3.ebuild
rename to media-libs/osl/osl-1.12.0.2-r4.ebuild
index 6546eb9617e4..dfc763b60ebd 100644
--- a/media-libs/osl/osl-1.12.0.2-r3.ebuild
+++ b/media-libs/osl/osl-1.12.0.2-r4.ebuild
@@ -27,12 +27,11 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# See bug #821202 for openimageio < dep
RDEPEND="
dev-libs/boost:=
dev-libs/pugixml
media-libs/openexr:=
- <media-libs/openimageio-2.3:=
+ >=media-libs/openimageio-2.3.12.0:=
<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
sys-libs/zlib:=
python? (
diff --git a/media-libs/osl/osl-1.12.4.1.ebuild b/media-libs/osl/osl-1.12.4.1-r1.ebuild
similarity index 97%
rename from media-libs/osl/osl-1.12.4.1.ebuild
rename to media-libs/osl/osl-1.12.4.1-r1.ebuild
index 4237748e4f5e..21208542651c 100644
--- a/media-libs/osl/osl-1.12.4.1.ebuild
+++ b/media-libs/osl/osl-1.12.4.1-r1.ebuild
@@ -28,12 +28,11 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-# See bug #821202 for openimageio < dep
RDEPEND="
dev-libs/boost:=
dev-libs/pugixml
media-libs/openexr:3=
- media-libs/openimageio:=
+ >=media-libs/openimageio-2.3.12.0:=
<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
sys-libs/zlib:=
python? (
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2022-02-14 2:07 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-02-14 2:07 UTC (permalink / raw
To: gentoo-commits
commit: d937ca78168d1a272458883282c5d39799c53ba2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 14 02:06:34 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 14 02:07:30 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d937ca78
media-libs/osl: drop 1.12.0.2-r4
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/Manifest | 1 -
media-libs/osl/osl-1.12.0.2-r4.ebuild | 104 ----------------------------------
2 files changed, 105 deletions(-)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 4d5068e24a70..bd469d1b40f6 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,5 +1,4 @@
DIST osl-1.11.15.0.tar.gz 14143372 BLAKE2B 7385d86417fd2666d7558eb459402a9720fc4b59287c2feb45c451bd1e413d102f3f286e6bc07bbeb320b9f5a96b4981851dddcf3a6eaa69d5869238811978a8 SHA512 d1df69349cb43690d0578b32caf92fe33ff570713fd87899e2ab312962c6474bd9c19df5b3b018a7498390e5933fcfbfdd3ecd450a4d91d64dd680ee74f492c5
DIST osl-1.11.16.0.tar.gz 14143407 BLAKE2B 0e6a20ee63a836bc268f03eb943731e8bf18909bf86041532de50e51ff9fb78f9be316be9b3677cb2b0e5fddd90defab95281e6597a52e61d982ffc9fcc52f79 SHA512 717a588bb371ff64d41dc34caad6a4e8483cba32d3b8fe7db9f98e422be050b1b89e4cf7f018e1106dfc9120d2485c3d8430a63cd80344050b00082fdd45fa1b
DIST osl-1.11.17.0.tar.gz 13888749 BLAKE2B 284489a2dc580bade93894c43c22d99d88e249329e10922c9c6dde7fc0eed3f741e279cc5fc043ce513ea59ddcea4a3576e34c6fd2294aadc727bdc8d422ed26 SHA512 14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2
-DIST osl-1.12.0.2.tar.gz 16205315 BLAKE2B 543d120e981f093c121b4abb4c36d7d8c127555c8986df931a3040136e3ae3d84d602d73395604cd492f8d192e408f585cd6579fe6283c974778f0b99092985d SHA512 cdcd1fb348f6f2f1f889ed1895bac545e10b73e700959bc09b1df2a40cd86e69ba43a1dfaf26dedaec9c23aa17b74428d4bccc9cf7f4d27ae2fc5152adb6c010
DIST osl-1.12.4.1.tar.gz 17716100 BLAKE2B eddd614ad4631446ff9de5e6c11cb8c19f9226b3306dca39a37827b4a03f7dc034b321ea3cce75e33dbe93dbb2d7dd09a0bf5ba222a693ad7acb6d96c529d2d9 SHA512 eaee1b539fa10ec6703db19acf0cd91cffcd44f4ce9aff3d4e00abd3ba7d8cd3557b37c57c902d435181bc983623828a06a778377b09f40ccac2e430addce4d4
diff --git a/media-libs/osl/osl-1.12.0.2-r4.ebuild b/media-libs/osl/osl-1.12.0.2-r4.ebuild
deleted file mode 100644
index dfc763b60ebd..000000000000
--- a/media-libs/osl/osl-1.12.0.2-r4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 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=12
-
-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-2.3.12.0:=
- <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 Makefile 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
-}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2022-02-14 2:07 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-02-14 2:07 UTC (permalink / raw
To: gentoo-commits
commit: 55b7e5e507861ea760e758983b8b1906ed7336df
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 14 02:07:01 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 14 02:07:33 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=55b7e5e5
media-libs/osl: drop 1.11.15.0-r1, 1.11.16.0-r4
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/Manifest | 1 -
media-libs/osl/osl-1.11.15.0-r1.ebuild | 109 --------------------------------
media-libs/osl/osl-1.11.16.0-r4.ebuild | 112 ---------------------------------
3 files changed, 222 deletions(-)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index bd469d1b40f6..fec975e58653 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,4 +1,3 @@
-DIST osl-1.11.15.0.tar.gz 14143372 BLAKE2B 7385d86417fd2666d7558eb459402a9720fc4b59287c2feb45c451bd1e413d102f3f286e6bc07bbeb320b9f5a96b4981851dddcf3a6eaa69d5869238811978a8 SHA512 d1df69349cb43690d0578b32caf92fe33ff570713fd87899e2ab312962c6474bd9c19df5b3b018a7498390e5933fcfbfdd3ecd450a4d91d64dd680ee74f492c5
DIST osl-1.11.16.0.tar.gz 14143407 BLAKE2B 0e6a20ee63a836bc268f03eb943731e8bf18909bf86041532de50e51ff9fb78f9be316be9b3677cb2b0e5fddd90defab95281e6597a52e61d982ffc9fcc52f79 SHA512 717a588bb371ff64d41dc34caad6a4e8483cba32d3b8fe7db9f98e422be050b1b89e4cf7f018e1106dfc9120d2485c3d8430a63cd80344050b00082fdd45fa1b
DIST osl-1.11.17.0.tar.gz 13888749 BLAKE2B 284489a2dc580bade93894c43c22d99d88e249329e10922c9c6dde7fc0eed3f741e279cc5fc043ce513ea59ddcea4a3576e34c6fd2294aadc727bdc8d422ed26 SHA512 14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2
DIST osl-1.12.4.1.tar.gz 17716100 BLAKE2B eddd614ad4631446ff9de5e6c11cb8c19f9226b3306dca39a37827b4a03f7dc034b321ea3cce75e33dbe93dbb2d7dd09a0bf5ba222a693ad7acb6d96c529d2d9 SHA512 eaee1b539fa10ec6703db19acf0cd91cffcd44f4ce9aff3d4e00abd3ba7d8cd3557b37c57c902d435181bc983623828a06a778377b09f40ccac2e430addce4d4
diff --git a/media-libs/osl/osl-1.11.15.0-r1.ebuild b/media-libs/osl/osl-1.11.15.0-r1.ebuild
deleted file mode 100644
index 5f806806db4c..000000000000
--- a/media-libs/osl/osl-1.11.15.0-r1.ebuild
+++ /dev/null
@@ -1,109 +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,10} )
-
-# check this on updates
-LLVM_MAX_SLOT=12
-
-CMAKE_REMOVE_MODULES_LIST=()
-
-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"
-
-# See bug #821202 for openimageio < dep
-RDEPEND="
- dev-libs/boost:=
- dev-libs/pugixml
- media-libs/openexr:=
- <media-libs/openimageio-2.3:=
- <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=(
- "${FILESDIR}"/${P}-fix-cmake.patch
-)
-
-# Restricting tests as Makefile 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.11.16.0-r4.ebuild b/media-libs/osl/osl-1.11.16.0-r4.ebuild
deleted file mode 100644
index 31e118f6baa9..000000000000
--- a/media-libs/osl/osl-1.11.16.0-r4.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2022 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
-
-CMAKE_REMOVE_MODULES_LIST=()
-
-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"
-# TODO: drop .1 on next SONAME change (probably 1.11 -> 1.12), we needed
-# a nudge to force rebuilds due to openexr 2 -> openexr 3 change.
-SLOT="0/$(ver_cut 2).1"
-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:3=
- dev-libs/imath:=
- >=media-libs/openimageio-2.3.12.0:=
- <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
-"
-
-# Restricting tests as Makefile handles them differently
-RESTRICT="test"
-
-S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.11.16.0-openexr-3-imath.patch
-)
-
-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})"
- # Breaks build for now: bug #827949
- #-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
-}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2022-02-19 19:41 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-02-19 19:41 UTC (permalink / raw
To: gentoo-commits
commit: 782c6633b629670f8b6b00ecc6cb5cdc7014144f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 19:41:08 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 19:41:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=782c6633
media-libs/osl: fix openexr/imath dependencies
Closes: https://bugs.gentoo.org/833766
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/{osl-1.11.17.0-r2.ebuild => osl-1.11.17.0-r3.ebuild} | 4 ++--
media-libs/osl/{osl-1.12.4.1-r1.ebuild => osl-1.12.4.1-r2.ebuild} | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-libs/osl/osl-1.11.17.0-r2.ebuild b/media-libs/osl/osl-1.11.17.0-r3.ebuild
similarity index 97%
rename from media-libs/osl/osl-1.11.17.0-r2.ebuild
rename to media-libs/osl/osl-1.11.17.0-r3.ebuild
index 8b62492f3cd0..524e24a932de 100644
--- a/media-libs/osl/osl-1.11.17.0-r2.ebuild
+++ b/media-libs/osl/osl-1.11.17.0-r3.ebuild
@@ -34,8 +34,8 @@ IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
RDEPEND="
dev-libs/boost:=
dev-libs/pugixml
- media-libs/openexr:=
- dev-libs/imath:=
+ >=media-libs/openexr-3:0=
+ >=dev-libs/imath-3.1.4-r2:=
>=media-libs/openimageio-2.3.12.0:=
<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
sys-libs/zlib
diff --git a/media-libs/osl/osl-1.12.4.1-r1.ebuild b/media-libs/osl/osl-1.12.4.1-r2.ebuild
similarity index 98%
rename from media-libs/osl/osl-1.12.4.1-r1.ebuild
rename to media-libs/osl/osl-1.12.4.1-r2.ebuild
index 21208542651c..8678e5483bcb 100644
--- a/media-libs/osl/osl-1.12.4.1-r1.ebuild
+++ b/media-libs/osl/osl-1.12.4.1-r2.ebuild
@@ -31,7 +31,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="
dev-libs/boost:=
dev-libs/pugixml
- media-libs/openexr:3=
+ >=media-libs/openexr-3:0=
>=media-libs/openimageio-2.3.12.0:=
<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
sys-libs/zlib:=
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2022-02-28 5:21 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-02-28 5:21 UTC (permalink / raw
To: gentoo-commits
commit: 12f056c08263df14fa59e7ebbf8ba08ab03e4223
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 28 05:19:39 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Feb 28 05:19:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12f056c0
media-libs/osl: Stabilize 1.11.17.0-r3 amd64, #833158
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.11.17.0-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/osl/osl-1.11.17.0-r3.ebuild b/media-libs/osl/osl-1.11.17.0-r3.ebuild
index 524e24a932de..3f98563dd7a0 100644
--- a/media-libs/osl/osl-1.11.17.0-r3.ebuild
+++ b/media-libs/osl/osl-1.11.17.0-r3.ebuild
@@ -20,7 +20,7 @@ LICENSE="BSD"
# TODO: drop .1 on next SONAME change (probably 1.11 -> 1.12), we needed
# a nudge to force rebuilds due to openexr 2 -> openexr 3 change.
SLOT="0/$(ver_cut 2).1"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
X86_CPU_FEATURES=(
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2022-03-19 23:39 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-03-19 23:39 UTC (permalink / raw
To: gentoo-commits
commit: 08678a03291385bf261453b46bc348090ded3ae7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 23:36:04 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 23:36:04 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08678a03
media-libs/osl: [QA] fix tc-get* quoting
This can cause build problems for e.g. 32-bit (gcc -m32 ...)
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.11.16.0-r2.ebuild | 4 ++--
media-libs/osl/osl-1.12.4.1-r2.ebuild | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/media-libs/osl/osl-1.11.16.0-r2.ebuild b/media-libs/osl/osl-1.11.16.0-r2.ebuild
index 3dd9f84f2cf7..fe9c14961b1f 100644
--- a/media-libs/osl/osl-1.11.16.0-r2.ebuild
+++ b/media-libs/osl/osl-1.11.16.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -86,7 +86,7 @@ src_configure() {
# If no CPU SIMDs were used, completely disable them
[[ -z ${mysimd} ]] && mysimd=("0")
- local gcc=$(tc-getCC)
+ local gcc="$(tc-getCC)"
local mycmakeargs=(
# LLVM 10+ needs C++14
diff --git a/media-libs/osl/osl-1.12.4.1-r2.ebuild b/media-libs/osl/osl-1.12.4.1-r2.ebuild
index 8678e5483bcb..b04804eadb45 100644
--- a/media-libs/osl/osl-1.12.4.1-r2.ebuild
+++ b/media-libs/osl/osl-1.12.4.1-r2.ebuild
@@ -82,7 +82,7 @@ src_configure() {
# If no CPU SIMDs were used, completely disable them
[[ -z ${mysimd} ]] && mysimd=("0")
- local gcc=$(tc-getCC)
+ local gcc="$(tc-getCC)"
# LLVM needs CPP11. Do not disable.
local mycmakeargs=(
-DCMAKE_CXX_STANDARD=14
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2022-05-20 13:21 Joonas Niilola
0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2022-05-20 13:21 UTC (permalink / raw
To: gentoo-commits
commit: 3ccf124a36dd03df3b6b28ec472df54e1ab6d62c
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri May 20 13:19:58 2022 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri May 20 13:21:01 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ccf124a
media-libs/osl: revbump 1.11.17.0 due to LLVM_SLOT update
- as noted by sam.
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/osl/{osl-1.11.17.0-r3.ebuild => osl-1.11.17.0-r4.ebuild} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/media-libs/osl/osl-1.11.17.0-r3.ebuild b/media-libs/osl/osl-1.11.17.0-r4.ebuild
similarity index 100%
rename from media-libs/osl/osl-1.11.17.0-r3.ebuild
rename to media-libs/osl/osl-1.11.17.0-r4.ebuild
^ permalink raw reply [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2022-06-06 1:40 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-06-06 1:40 UTC (permalink / raw
To: gentoo-commits
commit: 9679d85429bdba275abdd29ed95d6d7a1beb0960
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 01:39:47 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 01:39:47 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9679d854
media-libs/osl: drop 1.11.16.0-r2
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/Manifest | 1 -
media-libs/osl/osl-1.11.16.0-r2.ebuild | 111 ---------------------------------
2 files changed, 112 deletions(-)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index fec975e58653..977ee1a8d75c 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,3 +1,2 @@
-DIST osl-1.11.16.0.tar.gz 14143407 BLAKE2B 0e6a20ee63a836bc268f03eb943731e8bf18909bf86041532de50e51ff9fb78f9be316be9b3677cb2b0e5fddd90defab95281e6597a52e61d982ffc9fcc52f79 SHA512 717a588bb371ff64d41dc34caad6a4e8483cba32d3b8fe7db9f98e422be050b1b89e4cf7f018e1106dfc9120d2485c3d8430a63cd80344050b00082fdd45fa1b
DIST osl-1.11.17.0.tar.gz 13888749 BLAKE2B 284489a2dc580bade93894c43c22d99d88e249329e10922c9c6dde7fc0eed3f741e279cc5fc043ce513ea59ddcea4a3576e34c6fd2294aadc727bdc8d422ed26 SHA512 14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2
DIST osl-1.12.4.1.tar.gz 17716100 BLAKE2B eddd614ad4631446ff9de5e6c11cb8c19f9226b3306dca39a37827b4a03f7dc034b321ea3cce75e33dbe93dbb2d7dd09a0bf5ba222a693ad7acb6d96c529d2d9 SHA512 eaee1b539fa10ec6703db19acf0cd91cffcd44f4ce9aff3d4e00abd3ba7d8cd3557b37c57c902d435181bc983623828a06a778377b09f40ccac2e430addce4d4
diff --git a/media-libs/osl/osl-1.11.16.0-r2.ebuild b/media-libs/osl/osl-1.11.16.0-r2.ebuild
deleted file mode 100644
index fe9c14961b1f..000000000000
--- a/media-libs/osl/osl-1.11.16.0-r2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2022 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
-
-CMAKE_REMOVE_MODULES_LIST=()
-
-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"
-
-# See bug #821202 for openimageio < dep
-RDEPEND="
- dev-libs/boost:=
- dev-libs/pugixml
- media-libs/openexr:0=
- media-libs/ilmbase:=
- <media-libs/openimageio-2.3:=
- <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
-"
-
-# Restricting tests as Makefile handles them differently
-RESTRICT="test"
-
-S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.11.16.0-no-imath.patch
-)
-
-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})"
- # Breaks build for now: bug #827949
- #-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
-}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2022-07-09 5:57 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-07-09 5:57 UTC (permalink / raw
To: gentoo-commits
commit: 74e27b0e8a0d700113972cb9fe13df730ba090ac
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 9 05:45:05 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jul 9 05:57:45 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74e27b0e
media-libs/osl: needs older libfmt
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.11.17.0-r4.ebuild | 3 +++
1 file changed, 3 insertions(+)
diff --git a/media-libs/osl/osl-1.11.17.0-r4.ebuild b/media-libs/osl/osl-1.11.17.0-r4.ebuild
index 0a1926fb5a2d..49498f248837 100644
--- a/media-libs/osl/osl-1.11.17.0-r4.ebuild
+++ b/media-libs/osl/osl-1.11.17.0-r4.ebuild
@@ -31,7 +31,10 @@ CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python"
+# libfmt dep can actually be removed once it builds w/ 9.0.0, it uses
+# headers via openimageio, but it's code in osl which breaks
RDEPEND="
+ <dev-libs/libfmt-9.0.0
dev-libs/boost:=
dev-libs/pugixml
>=media-libs/openexr-3:0=
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2022-10-02 2:26 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-10-02 2:26 UTC (permalink / raw
To: gentoo-commits
commit: 6e4cb780951365c1dfc5295fc0c853020b4efa3e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 01:32:44 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 02:26:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e4cb780
media-libs/osl: add 1.12.6.2
Closes: https://bugs.gentoo.org/769683
Closes: https://bugs.gentoo.org/835148
Closes: https://bugs.gentoo.org/859964
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/Manifest | 1 +
media-libs/osl/osl-1.12.6.2.ebuild | 109 +++++++++++++++++++++++++++++++++++++
2 files changed, 110 insertions(+)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 977ee1a8d75c..1b5df4d2b7a2 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,2 +1,3 @@
DIST osl-1.11.17.0.tar.gz 13888749 BLAKE2B 284489a2dc580bade93894c43c22d99d88e249329e10922c9c6dde7fc0eed3f741e279cc5fc043ce513ea59ddcea4a3576e34c6fd2294aadc727bdc8d422ed26 SHA512 14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2
DIST osl-1.12.4.1.tar.gz 17716100 BLAKE2B eddd614ad4631446ff9de5e6c11cb8c19f9226b3306dca39a37827b4a03f7dc034b321ea3cce75e33dbe93dbb2d7dd09a0bf5ba222a693ad7acb6d96c529d2d9 SHA512 eaee1b539fa10ec6703db19acf0cd91cffcd44f4ce9aff3d4e00abd3ba7d8cd3557b37c57c902d435181bc983623828a06a778377b09f40ccac2e430addce4d4
+DIST osl-1.12.6.2.tar.gz 20247666 BLAKE2B 68905b7dc1a055a7ded26f0a6661ba9db8ddc473fef9ec1de4dab37d0473ce22d123feb33416a44d7b57a80281a64c978540e83f200ac2199a9e49142e00749a SHA512 16e35842735b2dfba7d44a310a918ea8a54798f5ff873ec04bb33b9801612aaf0993ca44b9591fb0b797accb0451137edf6424e1b2a511a011b65f385663d828
diff --git a/media-libs/osl/osl-1.12.6.2.ebuild b/media-libs/osl/osl-1.12.6.2.ebuild
new file mode 100644
index 000000000000..965e1f0404e3
--- /dev/null
+++ b/media-libs/osl/osl-1.12.6.2.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+# Check this on updates
+LLVM_MAX_SLOT=15
+
+inherit cmake llvm toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl"
+# If a development release, please don't keyword!
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenShadingLanguage-${PV}"
+
+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"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/pugixml
+ >=media-libs/openexr-3:0=
+ >=media-libs/openimageio-2.3.12.0:=
+ <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
+"
+
+llvm_check_deps() {
+ has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+ llvm_pkg_setup
+
+ use python && python-single-r1_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=(
+ # Still needed?
+ # See https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1454
+ #-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)
+ -DPYTHON_VERSION="${EPYTHON/python}"
+ -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ # TODO: investigate failures
+ local myctestargs=(
+ -E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward)"
+ )
+
+ cmake_src_test
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2022-10-02 2:26 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-10-02 2:26 UTC (permalink / raw
To: gentoo-commits
commit: fca5d53c3894fd7cdf4e5ec2554c9e32af18eaa5
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 01:33:06 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 02:26:10 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fca5d53c
media-libs/osl: drop 1.12.4.1-r2
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/Manifest | 1 -
media-libs/osl/osl-1.12.4.1-r2.ebuild | 102 ----------------------------------
2 files changed, 103 deletions(-)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 1b5df4d2b7a2..145ea4407354 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,3 +1,2 @@
DIST osl-1.11.17.0.tar.gz 13888749 BLAKE2B 284489a2dc580bade93894c43c22d99d88e249329e10922c9c6dde7fc0eed3f741e279cc5fc043ce513ea59ddcea4a3576e34c6fd2294aadc727bdc8d422ed26 SHA512 14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2
-DIST osl-1.12.4.1.tar.gz 17716100 BLAKE2B eddd614ad4631446ff9de5e6c11cb8c19f9226b3306dca39a37827b4a03f7dc034b321ea3cce75e33dbe93dbb2d7dd09a0bf5ba222a693ad7acb6d96c529d2d9 SHA512 eaee1b539fa10ec6703db19acf0cd91cffcd44f4ce9aff3d4e00abd3ba7d8cd3557b37c57c902d435181bc983623828a06a778377b09f40ccac2e430addce4d4
DIST osl-1.12.6.2.tar.gz 20247666 BLAKE2B 68905b7dc1a055a7ded26f0a6661ba9db8ddc473fef9ec1de4dab37d0473ce22d123feb33416a44d7b57a80281a64c978540e83f200ac2199a9e49142e00749a SHA512 16e35842735b2dfba7d44a310a918ea8a54798f5ff873ec04bb33b9801612aaf0993ca44b9591fb0b797accb0451137edf6424e1b2a511a011b65f385663d828
diff --git a/media-libs/osl/osl-1.12.4.1-r2.ebuild b/media-libs/osl/osl-1.12.4.1-r2.ebuild
deleted file mode 100644
index b04804eadb45..000000000000
--- a/media-libs/osl/osl-1.12.4.1-r2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 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/v${PV}-dev.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/OpenShadingLanguage-${PV}-dev"
-
-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-3:0=
- >=media-libs/openimageio-2.3.12.0:=
- <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
-"
-
-# Restricting tests as Makefile handles them differently
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.12.4.1-openexr-3-imath.patch
-)
-
-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
-}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2022-11-03 6:15 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-11-03 6:15 UTC (permalink / raw
To: gentoo-commits
commit: 53e1973f60c92620705b4f6717e39b63536f23a8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 3 05:54:44 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Nov 3 06:14:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53e1973f
media-libs/osl: add 1.12.7.0
Closes: https://bugs.gentoo.org/873958
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/Manifest | 1 +
media-libs/osl/osl-1.12.7.0.ebuild | 109 +++++++++++++++++++++++++++++++++++++
2 files changed, 110 insertions(+)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 145ea4407354..33091b219dcf 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,2 +1,3 @@
DIST osl-1.11.17.0.tar.gz 13888749 BLAKE2B 284489a2dc580bade93894c43c22d99d88e249329e10922c9c6dde7fc0eed3f741e279cc5fc043ce513ea59ddcea4a3576e34c6fd2294aadc727bdc8d422ed26 SHA512 14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2
DIST osl-1.12.6.2.tar.gz 20247666 BLAKE2B 68905b7dc1a055a7ded26f0a6661ba9db8ddc473fef9ec1de4dab37d0473ce22d123feb33416a44d7b57a80281a64c978540e83f200ac2199a9e49142e00749a SHA512 16e35842735b2dfba7d44a310a918ea8a54798f5ff873ec04bb33b9801612aaf0993ca44b9591fb0b797accb0451137edf6424e1b2a511a011b65f385663d828
+DIST osl-1.12.7.0.tar.gz 20250356 BLAKE2B a9398243546b1bfc1e3f9602f6112a72a8e7cb6ace54e93d0e5f30d943474e82c3317596597d6a09e0f2cf04b1b21f05c31a2357e3d667d710cd2aa340f5fd63 SHA512 ec0391dfc95140fee4fa8332991cdcb0978dafc436f3e07d0293e2baa2014b8765e6b60631ae5a8bbd6e16dbcf37f04c076d7d6b2d8bfa58b78471f0d92c433f
diff --git a/media-libs/osl/osl-1.12.7.0.ebuild b/media-libs/osl/osl-1.12.7.0.ebuild
new file mode 100644
index 000000000000..3aa13e612394
--- /dev/null
+++ b/media-libs/osl/osl-1.12.7.0.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+# Check this on updates
+LLVM_MAX_SLOT=15
+
+inherit cmake llvm toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl"
+# If a development release, please don't keyword!
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenShadingLanguage-${PV}"
+
+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"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/pugixml
+ >=media-libs/openexr-3:0=
+ >=media-libs/openimageio-2.3.12.0:=
+ <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
+"
+
+llvm_check_deps() {
+ has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+ llvm_pkg_setup
+
+ use python && python-single-r1_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=(
+ # Still needed?
+ # See https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1454
+ #-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)
+ -DPYTHON_VERSION="${EPYTHON/python}"
+ -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ # TODO: investigate failures
+ local myctestargs=(
+ -E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward|color|color.opt|example-deformer)"
+ )
+
+ cmake_src_test
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2022-12-14 5:19 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2022-12-14 5:19 UTC (permalink / raw
To: gentoo-commits
commit: 16195f86fcf92aa81903d5b36f368892d17dec01
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 14 05:18:58 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Dec 14 05:18:58 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16195f86
media-libs/osl: Stabilize 1.12.7.0 amd64, #885823
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.12.7.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/osl/osl-1.12.7.0.ebuild b/media-libs/osl/osl-1.12.7.0.ebuild
index 3aa13e612394..2ac80227ee76 100644
--- a/media-libs/osl/osl-1.12.7.0.ebuild
+++ b/media-libs/osl/osl-1.12.7.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/OpenShadingLanguage-${PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
X86_CPU_FEATURES=(
sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2022-12-24 14:06 Andreas Sturmlechner
0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2022-12-24 14:06 UTC (permalink / raw
To: gentoo-commits
commit: 8b05582cd5767503d23270bbfe6309af7ea447f0
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 20 22:13:01 2022 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 24 14:06:29 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8b05582c
media-libs/osl: drop 1.11.17.0-r4
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/osl/Manifest | 1 -
media-libs/osl/osl-1.11.17.0-r4.ebuild | 115 ---------------------------------
2 files changed, 116 deletions(-)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index d7130099e625..11f422a9e40f 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,2 +1 @@
-DIST osl-1.11.17.0.tar.gz 13888749 BLAKE2B 284489a2dc580bade93894c43c22d99d88e249329e10922c9c6dde7fc0eed3f741e279cc5fc043ce513ea59ddcea4a3576e34c6fd2294aadc727bdc8d422ed26 SHA512 14cb25b10f4644551b906344a289e2a4c421f4c85beaa120bb1a1e532c9be3ec235622516c4700fb23d258c5dcd1ece18b84491b0973b3162098843a9059b1d2
DIST osl-1.12.7.0.tar.gz 20250356 BLAKE2B a9398243546b1bfc1e3f9602f6112a72a8e7cb6ace54e93d0e5f30d943474e82c3317596597d6a09e0f2cf04b1b21f05c31a2357e3d667d710cd2aa340f5fd63 SHA512 ec0391dfc95140fee4fa8332991cdcb0978dafc436f3e07d0293e2baa2014b8765e6b60631ae5a8bbd6e16dbcf37f04c076d7d6b2d8bfa58b78471f0d92c433f
diff --git a/media-libs/osl/osl-1.11.17.0-r4.ebuild b/media-libs/osl/osl-1.11.17.0-r4.ebuild
deleted file mode 100644
index 49498f248837..000000000000
--- a/media-libs/osl/osl-1.11.17.0-r4.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2022 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=14
-
-CMAKE_REMOVE_MODULES_LIST=()
-
-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"
-# TODO: drop .1 on next SONAME change (probably 1.11 -> 1.12), we needed
-# a nudge to force rebuilds due to openexr 2 -> openexr 3 change.
-SLOT="0/$(ver_cut 2).1"
-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"
-
-# libfmt dep can actually be removed once it builds w/ 9.0.0, it uses
-# headers via openimageio, but it's code in osl which breaks
-RDEPEND="
- <dev-libs/libfmt-9.0.0
- dev-libs/boost:=
- dev-libs/pugixml
- >=media-libs/openexr-3:0=
- >=dev-libs/imath-3.1.4-r2:=
- >=media-libs/openimageio-2.3.12.0:=
- <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
-"
-
-# Restricting tests as Makefile handles them differently
-RESTRICT="test"
-
-S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.11.17.0-llvm14.patch
-)
-
-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})"
- # Breaks build for now: bug #827949
- #-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
-}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2023-05-01 15:15 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2023-05-01 15:15 UTC (permalink / raw
To: gentoo-commits
commit: 6faa56e4bc50bdbe5bd1bf7917b5217d91cf465a
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
AuthorDate: Mon May 1 14:56:29 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 1 15:14:24 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6faa56e4
media-libs/osl: Bump to 1.12.7.0
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30823
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/Manifest | 1 +
media-libs/osl/osl-1.12.11.0.ebuild | 106 ++++++++++++++++++++++++++++++++++++
2 files changed, 107 insertions(+)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 11f422a9e40f..75ed128ae73e 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1 +1,2 @@
+DIST osl-1.12.11.0.tar.gz 20287156 BLAKE2B 178db816980929cc61a0deea63f715a9f10adc41c6dd264bca8df451ef9531c4ee9477f6374f160b2a7d6fb72289a3edcbe5a3e8050ff2fdcc6bfe57fda58626 SHA512 9cf7b08f43e66d280cb90bf8c579f3a7d949934ac8e7a9289113a4a34158a43e32c9b73863f2a94a628ebc1a988923c3a7d32f0944745ae7c74dc164fdd5125e
DIST osl-1.12.7.0.tar.gz 20250356 BLAKE2B a9398243546b1bfc1e3f9602f6112a72a8e7cb6ace54e93d0e5f30d943474e82c3317596597d6a09e0f2cf04b1b21f05c31a2357e3d667d710cd2aa340f5fd63 SHA512 ec0391dfc95140fee4fa8332991cdcb0978dafc436f3e07d0293e2baa2014b8765e6b60631ae5a8bbd6e16dbcf37f04c076d7d6b2d8bfa58b78471f0d92c433f
diff --git a/media-libs/osl/osl-1.12.11.0.ebuild b/media-libs/osl/osl-1.12.11.0.ebuild
new file mode 100644
index 000000000000..d9c353880f22
--- /dev/null
+++ b/media-libs/osl/osl-1.12.11.0.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+# Check this on updates
+LLVM_MAX_SLOT=15
+
+inherit cmake llvm toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl"
+# If a development release, please don't keyword!
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenShadingLanguage-${PV}"
+
+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"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/pugixml
+ >=media-libs/openexr-3:0=
+ >=media-libs/openimageio-2.3.12.0:=
+ <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
+"
+
+llvm_check_deps() {
+ has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+ llvm_pkg_setup
+
+ use python && python-single-r1_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=(
+ -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)
+ -DPYTHON_VERSION="${EPYTHON/python}"
+ -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ # TODO: investigate failures
+ local myctestargs=(
+ -E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward|render-raytypes.opt|color|color.opt|example-deformer)"
+ )
+
+ cmake_src_test
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2023-06-10 20:47 Andreas Sturmlechner
0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2023-06-10 20:47 UTC (permalink / raw
To: gentoo-commits
commit: 317b6b71c4bab28a50a9f6f77710f217151eeb6d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 10 19:59:59 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jun 10 20:45:38 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=317b6b71
media-libs/osl: unkeyword for ~x86, no revdeps
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/osl/osl-1.12.11.0.ebuild | 2 +-
media-libs/osl/osl-1.12.7.0.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/osl/osl-1.12.11.0.ebuild b/media-libs/osl/osl-1.12.11.0.ebuild
index d9c353880f22..58c299d89c9d 100644
--- a/media-libs/osl/osl-1.12.11.0.ebuild
+++ b/media-libs/osl/osl-1.12.11.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/OpenShadingLanguage-${PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
X86_CPU_FEATURES=(
sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
diff --git a/media-libs/osl/osl-1.12.7.0.ebuild b/media-libs/osl/osl-1.12.7.0.ebuild
index 4cddeb4dc727..901706148ec2 100644
--- a/media-libs/osl/osl-1.12.7.0.ebuild
+++ b/media-libs/osl/osl-1.12.7.0.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/OpenShadingLanguage-${PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
X86_CPU_FEATURES=(
sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2023-07-16 18:46 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2023-07-16 18:46 UTC (permalink / raw
To: gentoo-commits
commit: f1048e9aac05e9400b986035ecd10c8a7d8a774c
Author: Sebastian Parborg <darkdefende <AT> gmail <DOT> com>
AuthorDate: Sun Jul 2 22:55:26 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul 16 18:42:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1048e9a
media-libs/osl: Version bump and fix compilation on arm64
Closes: https://bugs.gentoo.org/908870
Signed-off-by: Sebastian Parborg <darkdefende <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31722
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/Manifest | 1 +
media-libs/osl/osl-1.12.13.0.ebuild | 110 ++++++++++++++++++++++++++++++++++++
2 files changed, 111 insertions(+)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 75ed128ae73e..7bf7586baeaa 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,2 +1,3 @@
DIST osl-1.12.11.0.tar.gz 20287156 BLAKE2B 178db816980929cc61a0deea63f715a9f10adc41c6dd264bca8df451ef9531c4ee9477f6374f160b2a7d6fb72289a3edcbe5a3e8050ff2fdcc6bfe57fda58626 SHA512 9cf7b08f43e66d280cb90bf8c579f3a7d949934ac8e7a9289113a4a34158a43e32c9b73863f2a94a628ebc1a988923c3a7d32f0944745ae7c74dc164fdd5125e
+DIST osl-1.12.13.0.tar.gz 20286745 BLAKE2B 75a2a5d10000ba26cd11463dde710d5be3b8b2d227de45263d8bd39fd87ca064f7c6d2b2f9cea2fdb8f29ccaa94d3ef60e2ff2e0e6d867385e2298dd10ef61b6 SHA512 d7e6ab79f77f2854cbb4fa2fbe5fc92659bb015b1bbffcee2ef86185cf20235990fa3b20308601aa298fedc85d3fcd4451b7b7ff0df7def97027efe4fb8a02bc
DIST osl-1.12.7.0.tar.gz 20250356 BLAKE2B a9398243546b1bfc1e3f9602f6112a72a8e7cb6ace54e93d0e5f30d943474e82c3317596597d6a09e0f2cf04b1b21f05c31a2357e3d667d710cd2aa340f5fd63 SHA512 ec0391dfc95140fee4fa8332991cdcb0978dafc436f3e07d0293e2baa2014b8765e6b60631ae5a8bbd6e16dbcf37f04c076d7d6b2d8bfa58b78471f0d92c433f
diff --git a/media-libs/osl/osl-1.12.13.0.ebuild b/media-libs/osl/osl-1.12.13.0.ebuild
new file mode 100644
index 000000000000..dd1d1fecff02
--- /dev/null
+++ b/media-libs/osl/osl-1.12.13.0.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+# Check this on updates
+LLVM_MAX_SLOT=15
+
+inherit cmake flag-o-matic llvm toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl"
+# If a development release, please don't keyword!
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenShadingLanguage-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+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"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/pugixml
+ >=media-libs/openexr-3:0=
+ >=media-libs/openimageio-2.3.12.0:=
+ <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
+"
+
+llvm_check_deps() {
+ has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+ llvm_pkg_setup
+
+ use python && python-single-r1_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")
+
+ # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+ # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
+ use arm64 && append-flags -flax-vector-conversions
+
+ local gcc="$(tc-getCC)"
+ local mycmakeargs=(
+ -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)
+ -DPYTHON_VERSION="${EPYTHON/python}"
+ -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ # TODO: investigate failures
+ local myctestargs=(
+ -E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward|render-raytypes.opt|color|color.opt|example-deformer)"
+ )
+
+ cmake_src_test
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2024-01-10 12:41 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2024-01-10 12:41 UTC (permalink / raw
To: gentoo-commits
commit: 1292fc663dc19c86b54e1076eb36a9b5b714c7d6
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Fri Dec 8 14:20:37 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 10 12:41:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1292fc66
media-libs/osl: add 1.12.14.0
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34220
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/Manifest | 1 +
media-libs/osl/metadata.xml | 5 +-
media-libs/osl/osl-1.12.14.0.ebuild | 144 ++++++++++++++++++++++++++++++++++++
3 files changed, 148 insertions(+), 2 deletions(-)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 7bf7586baeaa..878645684cfb 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,3 +1,4 @@
DIST osl-1.12.11.0.tar.gz 20287156 BLAKE2B 178db816980929cc61a0deea63f715a9f10adc41c6dd264bca8df451ef9531c4ee9477f6374f160b2a7d6fb72289a3edcbe5a3e8050ff2fdcc6bfe57fda58626 SHA512 9cf7b08f43e66d280cb90bf8c579f3a7d949934ac8e7a9289113a4a34158a43e32c9b73863f2a94a628ebc1a988923c3a7d32f0944745ae7c74dc164fdd5125e
DIST osl-1.12.13.0.tar.gz 20286745 BLAKE2B 75a2a5d10000ba26cd11463dde710d5be3b8b2d227de45263d8bd39fd87ca064f7c6d2b2f9cea2fdb8f29ccaa94d3ef60e2ff2e0e6d867385e2298dd10ef61b6 SHA512 d7e6ab79f77f2854cbb4fa2fbe5fc92659bb015b1bbffcee2ef86185cf20235990fa3b20308601aa298fedc85d3fcd4451b7b7ff0df7def97027efe4fb8a02bc
+DIST osl-1.12.14.0.tar.gz 20555853 BLAKE2B 4f6bc2084e4c1b25e707a37830961f20926e6ab5cb915c763cbd8126127e70f6368832077729ab5e044f573e8c38c4afb413eff8adccee5ea1ae96cb9be43b6e SHA512 51641e58fb0bba042853e3976c104decc788f1b1d3ec2e33a3f5504b11b05950dc38766ffb066b0f76edc4e0a8829d6b7dd408d9288b74d69380395b1d991bd5
DIST osl-1.12.7.0.tar.gz 20250356 BLAKE2B a9398243546b1bfc1e3f9602f6112a72a8e7cb6ace54e93d0e5f30d943474e82c3317596597d6a09e0f2cf04b1b21f05c31a2357e3d667d710cd2aa340f5fd63 SHA512 ec0391dfc95140fee4fa8332991cdcb0978dafc436f3e07d0293e2baa2014b8765e6b60631ae5a8bbd6e16dbcf37f04c076d7d6b2d8bfa58b78471f0d92c433f
diff --git a/media-libs/osl/metadata.xml b/media-libs/osl/metadata.xml
index a300ead37dfa..bd83cdb5a001 100644
--- a/media-libs/osl/metadata.xml
+++ b/media-libs/osl/metadata.xml
@@ -16,9 +16,10 @@
</longdescription>
<use>
<flag name="partio">Use <pkg>media-libs/partio</pkg></flag>
- <flag name="qt5">Build the osltoy binary</flag>
+ <flag name="gui">Build the osltoy binary (with Qt5)</flag>
+ <flag name="qt6">Build the osltoy binary (with Qt6)</flag>
</use>
<upstream>
- <remote-id type="github">imageworks/OpenShadingLanguage</remote-id>
+ <remote-id type="github">AcademySoftwareFoundation/OpenShadingLanguage</remote-id>
</upstream>
</pkgmetadata>
diff --git a/media-libs/osl/osl-1.12.14.0.ebuild b/media-libs/osl/osl-1.12.14.0.ebuild
new file mode 100644
index 000000000000..9cfb9be255ac
--- /dev/null
+++ b/media-libs/osl/osl-1.12.14.0.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+# Check this on updates
+LLVM_MAX_SLOT=15
+
+inherit cmake flag-o-matic llvm toolchain-funcs python-single-r1
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="https://www.imageworks.com/technology/opensource https://github.com/AcademySoftwareFoundation/OpenShadingLanguage"
+# If a development release, please don't keyword!
+SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenShadingLanguage-${PV}"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+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 gui partio qt6 test ${CPU_FEATURES[@]%:*} python"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/pugixml
+ >=media-libs/openexr-3:0=
+ >=media-libs/openimageio-2.3.12.0:=
+ <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 )
+ gui? (
+ !qt6? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+ qt6? (
+ dev-qt/qtbase:6[gui,widgets]
+ )
+ )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+"
+
+llvm_check_deps() {
+ has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+ llvm_pkg_setup
+
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ local cpufeature
+ local mysimd=()
+ for cpufeature in "${CPU_FEATURES[@]}"; do
+ use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+ done
+
+ local mybatched=()
+ use cpu_flags_x86_avx && mybatched+=(
+ "b8_AVX"
+ )
+ use cpu_flags_x86_avx2 && mybatched+=(
+ "b8_AVX2"
+ "b8_AVX2_noFMA"
+ )
+ use cpu_flags_x86_avx512f && mybatched+=(
+ "b8_AVX512"
+ "b8_AVX512_noFMA"
+ "b16_AVX512"
+ "b16_AVX512_noFMA"
+ )
+
+ # If no CPU SIMDs were used, completely disable them
+ [[ -z ${mysimd} ]] && mysimd=("0")
+ [[ -z ${mybatched} ]] && mybatched=("0")
+
+ # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+ # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
+ use arm64 && append-flags -flax-vector-conversions
+
+ local gcc="$(tc-getCC)"
+ local mycmakeargs=(
+ # std::tuple_size_v is c++17
+ -DCMAKE_CXX_STANDARD=17
+ -DDOWNSTREAM_CXX_STANDARD=17
+ -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_PYTHON=$(usex python)
+ -DPYTHON_VERSION="${EPYTHON/python}"
+ -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
+ -DVEC_REPORT=yes
+ )
+
+ if use gui; then
+ mycmakeargs+=( -DUSE_QT=yes )
+ if ! use qt6; then
+ mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6=ON )
+ fi
+ else
+ mycmakeargs+=( -DUSE_QT=no )
+ fi
+
+ cmake_src_configure
+}
+
+src_test() {
+ # TODO: investigate failures
+ local myctestargs=(
+ -E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward|render-raytypes.opt|color|color.opt|example-deformer)"
+ )
+
+ cmake_src_test
+}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2024-04-10 6:24 Joonas Niilola
0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2024-04-10 6:24 UTC (permalink / raw
To: gentoo-commits
commit: 7f441b1b6f9acbb53263aa76a0ca83657c238dd9
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 10 06:23:31 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Apr 10 06:23:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f441b1b
media-libs/osl: Stabilize 1.12.14.0 amd64, #928997
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/osl/osl-1.12.14.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-libs/osl/osl-1.12.14.0.ebuild b/media-libs/osl/osl-1.12.14.0.ebuild
index 9cfb9be255ac..f44e08f29baf 100644
--- a/media-libs/osl/osl-1.12.14.0.ebuild
+++ b/media-libs/osl/osl-1.12.14.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -18,7 +18,7 @@ S="${WORKDIR}/OpenShadingLanguage-${PV}"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
X86_CPU_FEATURES=(
sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2024-05-03 3:33 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2024-05-03 3:33 UTC (permalink / raw
To: gentoo-commits
commit: 88c844cb1e45a4b1487e8b32618352d82902093e
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Thu May 2 23:47:14 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 3 03:33:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=88c844cb
media-libs/osl: fix live ebuild that was never once tested
It was originally added while updating a tagged release. It cannot have
ever been tested because at the time it was added, it unconditionally
defined ${S} to something suitable for a tarball, whereas git-r3 sets
things up based on ${PN} for you already.
Fixes: c920bc0801087518ea87d472f7a78bfa25cb04c8
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.12.14.0-r1.ebuild | 3 +--
media-libs/osl/osl-1.13.7.0.ebuild | 3 +--
media-libs/osl/osl-9999.ebuild | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/media-libs/osl/osl-1.12.14.0-r1.ebuild b/media-libs/osl/osl-1.12.14.0-r1.ebuild
index 66765c891954..c6a86ec36e2f 100644
--- a/media-libs/osl/osl-1.12.14.0-r1.ebuild
+++ b/media-libs/osl/osl-1.12.14.0-r1.ebuild
@@ -20,10 +20,9 @@ else
# If a development release, please don't keyword!
SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+ S="${WORKDIR}/OpenShadingLanguage-${PV}"
fi
-S="${WORKDIR}/OpenShadingLanguage-${PV}"
-
LICENSE="BSD"
SLOT="0/$(ver_cut 1-3)"
diff --git a/media-libs/osl/osl-1.13.7.0.ebuild b/media-libs/osl/osl-1.13.7.0.ebuild
index 673742be896a..45ff2f64c225 100644
--- a/media-libs/osl/osl-1.13.7.0.ebuild
+++ b/media-libs/osl/osl-1.13.7.0.ebuild
@@ -20,10 +20,9 @@ else
# If a development release, please don't keyword!
SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+ S="${WORKDIR}/OpenShadingLanguage-${PV}"
fi
-S="${WORKDIR}/OpenShadingLanguage-${PV}"
-
LICENSE="BSD"
SLOT="0/$(ver_cut 1-3)"
diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-9999.ebuild
index 9ae3ddb5a40d..02e2f6079c81 100644
--- a/media-libs/osl/osl-9999.ebuild
+++ b/media-libs/osl/osl-9999.ebuild
@@ -20,10 +20,9 @@ else
# If a development release, please don't keyword!
SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+ S="${WORKDIR}/OpenShadingLanguage-${PV}"
fi
-S="${WORKDIR}/OpenShadingLanguage-${PV}"
-
LICENSE="BSD"
SLOT="0/$(ver_cut 1-3)"
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2024-05-03 3:33 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2024-05-03 3:33 UTC (permalink / raw
To: gentoo-commits
commit: 6441e2b149d548297bf87ab5ffeda35bb1d32c1e
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Fri May 3 00:09:38 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri May 3 03:33:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6441e2b1
media-libs/osl: mark as LTO-unsafe
Closes: https://bugs.gentoo.org/875836
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.12.14.0-r1.ebuild | 5 +++++
media-libs/osl/osl-1.12.14.0.ebuild | 5 +++++
media-libs/osl/osl-1.13.7.0.ebuild | 5 +++++
media-libs/osl/osl-9999.ebuild | 5 +++++
4 files changed, 20 insertions(+)
diff --git a/media-libs/osl/osl-1.12.14.0-r1.ebuild b/media-libs/osl/osl-1.12.14.0-r1.ebuild
index c6a86ec36e2f..50363e61e508 100644
--- a/media-libs/osl/osl-1.12.14.0-r1.ebuild
+++ b/media-libs/osl/osl-1.12.14.0-r1.ebuild
@@ -87,6 +87,11 @@ src_prepare() {
}
src_configure() {
+ # -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/875836
+ # https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1810
+ filter-lto
+
# pick the highest we support
local mysimd=()
if use cpu_flags_x86_avx512f; then
diff --git a/media-libs/osl/osl-1.12.14.0.ebuild b/media-libs/osl/osl-1.12.14.0.ebuild
index f44e08f29baf..5af6590d6486 100644
--- a/media-libs/osl/osl-1.12.14.0.ebuild
+++ b/media-libs/osl/osl-1.12.14.0.ebuild
@@ -74,6 +74,11 @@ pkg_setup() {
}
src_configure() {
+ # -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/875836
+ # https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1810
+ filter-lto
+
local cpufeature
local mysimd=()
for cpufeature in "${CPU_FEATURES[@]}"; do
diff --git a/media-libs/osl/osl-1.13.7.0.ebuild b/media-libs/osl/osl-1.13.7.0.ebuild
index 45ff2f64c225..b43492c6caca 100644
--- a/media-libs/osl/osl-1.13.7.0.ebuild
+++ b/media-libs/osl/osl-1.13.7.0.ebuild
@@ -94,6 +94,11 @@ src_prepare() {
}
src_configure() {
+ # -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/875836
+ # https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1810
+ filter-lto
+
# pick the highest we support
local mysimd=()
if use cpu_flags_x86_avx512f; then
diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-9999.ebuild
index 02e2f6079c81..68654d760dc8 100644
--- a/media-libs/osl/osl-9999.ebuild
+++ b/media-libs/osl/osl-9999.ebuild
@@ -94,6 +94,11 @@ src_prepare() {
}
src_configure() {
+ # -Werror=lto-type-mismatch
+ # https://bugs.gentoo.org/875836
+ # https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1810
+ filter-lto
+
# pick the highest we support
local mysimd=()
if use cpu_flags_x86_avx512f; then
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2024-06-02 4:12 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2024-06-02 4:12 UTC (permalink / raw
To: gentoo-commits
commit: 05515b776ebc64109872064ab3797d9806db67a3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 2 04:12:42 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jun 2 04:12:42 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05515b77
media-libs/osl: Stabilize 1.13.7.0 amd64, #932980
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.13.7.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/osl/osl-1.13.7.0.ebuild b/media-libs/osl/osl-1.13.7.0.ebuild
index b43492c6caca..404090f7e9f3 100644
--- a/media-libs/osl/osl-1.13.7.0.ebuild
+++ b/media-libs/osl/osl-1.13.7.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]] ; then
else
# If a development release, please don't keyword!
SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
S="${WORKDIR}/OpenShadingLanguage-${PV}"
fi
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2024-06-29 16:51 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2024-06-29 16:51 UTC (permalink / raw
To: gentoo-commits
commit: 06f56b7e0d3d0427aa7a161e989e0002e714a649
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sat Jun 8 21:36:08 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 16:49:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=06f56b7e
media-libs/osl: move VEC_REPORT to USE=debug
BATCHED and SIMD support is iffy. This was intended to get better bug reports.
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/36062
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/osl-1.12.14.0-r1.ebuild | 9 +++++++--
media-libs/osl/osl-1.12.14.0.ebuild | 9 +++++++--
media-libs/osl/osl-1.13.10.0.ebuild | 9 +++++++--
media-libs/osl/osl-1.13.7.0.ebuild | 9 +++++++--
media-libs/osl/osl-9999.ebuild | 9 +++++++--
5 files changed, 35 insertions(+), 10 deletions(-)
diff --git a/media-libs/osl/osl-1.12.14.0-r1.ebuild b/media-libs/osl/osl-1.12.14.0-r1.ebuild
index 628b4123b45d..e450385f5016 100644
--- a/media-libs/osl/osl-1.12.14.0-r1.ebuild
+++ b/media-libs/osl/osl-1.12.14.0-r1.ebuild
@@ -32,7 +32,7 @@ X86_CPU_FEATURES=(
)
CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
-IUSE="doc gui libcxx nofma partio qt6 test ${CPU_FEATURES[*]%:*} python"
+IUSE="debug doc gui libcxx nofma partio qt6 test ${CPU_FEATURES[*]%:*} python"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -177,11 +177,16 @@ src_configure() {
-DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
-DUSE_LIBCPLUSPLUS="$(usex libcxx)"
-DUSE_OPTIX="no"
- -DVEC_REPORT="yes"
-DOpenImageIO_ROOT="${EPREFIX}/usr"
)
+ if use debug; then
+ mycmakeargs+=(
+ -DVEC_REPORT="yes"
+ )
+ fi
+
if use gui; then
mycmakeargs+=( -DUSE_QT="yes" )
if ! use qt6; then
diff --git a/media-libs/osl/osl-1.12.14.0.ebuild b/media-libs/osl/osl-1.12.14.0.ebuild
index 5af6590d6486..459fa3084277 100644
--- a/media-libs/osl/osl-1.12.14.0.ebuild
+++ b/media-libs/osl/osl-1.12.14.0.ebuild
@@ -26,7 +26,7 @@ X86_CPU_FEATURES=(
)
CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-IUSE="doc gui partio qt6 test ${CPU_FEATURES[@]%:*} python"
+IUSE="debug doc gui partio qt6 test ${CPU_FEATURES[@]%:*} python"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -124,9 +124,14 @@ src_configure() {
-DPYTHON_VERSION="${EPYTHON/python}"
-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
-DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
- -DVEC_REPORT=yes
)
+ if use debug; then
+ mycmakeargs+=(
+ -DVEC_REPORT="yes"
+ )
+ fi
+
if use gui; then
mycmakeargs+=( -DUSE_QT=yes )
if ! use qt6; then
diff --git a/media-libs/osl/osl-1.13.10.0.ebuild b/media-libs/osl/osl-1.13.10.0.ebuild
index 9d66a33c3e3d..3df3ad89ba3b 100644
--- a/media-libs/osl/osl-1.13.10.0.ebuild
+++ b/media-libs/osl/osl-1.13.10.0.ebuild
@@ -32,7 +32,7 @@ X86_CPU_FEATURES=(
)
CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
-IUSE="doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python"
+IUSE="debug doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python"
RESTRICT="!test? ( test )"
@@ -189,11 +189,16 @@ src_configure() {
-DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
-DUSE_LIBCPLUSPLUS="$(usex libcxx)"
-DOSL_USE_OPTIX="$(usex optix)"
- -DVEC_REPORT="yes"
-DOpenImageIO_ROOT="${EPREFIX}/usr"
)
+ if use debug; then
+ mycmakeargs+=(
+ -DVEC_REPORT="yes"
+ )
+ fi
+
if use gui; then
mycmakeargs+=( -DUSE_QT="yes" )
if ! use qt6; then
diff --git a/media-libs/osl/osl-1.13.7.0.ebuild b/media-libs/osl/osl-1.13.7.0.ebuild
index 404090f7e9f3..a8e64ed97c5f 100644
--- a/media-libs/osl/osl-1.13.7.0.ebuild
+++ b/media-libs/osl/osl-1.13.7.0.ebuild
@@ -32,7 +32,7 @@ X86_CPU_FEATURES=(
)
CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
-IUSE="doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python"
+IUSE="debug doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python"
RESTRICT="!test? ( test )"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -185,11 +185,16 @@ src_configure() {
-DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
-DUSE_LIBCPLUSPLUS="$(usex libcxx)"
-DOSL_USE_OPTIX="$(usex optix)"
- -DVEC_REPORT="yes"
-DOpenImageIO_ROOT="${EPREFIX}/usr"
)
+ if use debug; then
+ mycmakeargs+=(
+ -DVEC_REPORT="yes"
+ )
+ fi
+
if use gui; then
mycmakeargs+=( -DUSE_QT="yes" )
if ! use qt6; then
diff --git a/media-libs/osl/osl-9999.ebuild b/media-libs/osl/osl-9999.ebuild
index 9d66a33c3e3d..3df3ad89ba3b 100644
--- a/media-libs/osl/osl-9999.ebuild
+++ b/media-libs/osl/osl-9999.ebuild
@@ -32,7 +32,7 @@ X86_CPU_FEATURES=(
)
CPU_FEATURES=( "${X86_CPU_FEATURES[@]/#/cpu_flags_x86_}" )
-IUSE="doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python"
+IUSE="debug doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python"
RESTRICT="!test? ( test )"
@@ -189,11 +189,16 @@ src_configure() {
-DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
-DUSE_LIBCPLUSPLUS="$(usex libcxx)"
-DOSL_USE_OPTIX="$(usex optix)"
- -DVEC_REPORT="yes"
-DOpenImageIO_ROOT="${EPREFIX}/usr"
)
+ if use debug; then
+ mycmakeargs+=(
+ -DVEC_REPORT="yes"
+ )
+ fi
+
if use gui; then
mycmakeargs+=( -DUSE_QT="yes" )
if ! use qt6; then
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2024-06-29 16:51 Sam James
0 siblings, 0 replies; 60+ messages in thread
From: Sam James @ 2024-06-29 16:51 UTC (permalink / raw
To: gentoo-commits
commit: 7de07cfe904158128c854e3f00aa714baf9fbc3c
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon Jun 3 12:53:21 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Jun 29 16:49:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7de07cfe
media-libs/osl: drop 1.12.7.0, 1.12.11.0, 1.12.13.0
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/osl/Manifest | 3 -
media-libs/osl/osl-1.12.11.0.ebuild | 106 ----------------------------------
media-libs/osl/osl-1.12.13.0.ebuild | 110 ------------------------------------
media-libs/osl/osl-1.12.7.0.ebuild | 109 -----------------------------------
4 files changed, 328 deletions(-)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index fcebc31179bc..ac78547f4a27 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,6 +1,3 @@
-DIST osl-1.12.11.0.tar.gz 20287156 BLAKE2B 178db816980929cc61a0deea63f715a9f10adc41c6dd264bca8df451ef9531c4ee9477f6374f160b2a7d6fb72289a3edcbe5a3e8050ff2fdcc6bfe57fda58626 SHA512 9cf7b08f43e66d280cb90bf8c579f3a7d949934ac8e7a9289113a4a34158a43e32c9b73863f2a94a628ebc1a988923c3a7d32f0944745ae7c74dc164fdd5125e
-DIST osl-1.12.13.0.tar.gz 20286745 BLAKE2B 75a2a5d10000ba26cd11463dde710d5be3b8b2d227de45263d8bd39fd87ca064f7c6d2b2f9cea2fdb8f29ccaa94d3ef60e2ff2e0e6d867385e2298dd10ef61b6 SHA512 d7e6ab79f77f2854cbb4fa2fbe5fc92659bb015b1bbffcee2ef86185cf20235990fa3b20308601aa298fedc85d3fcd4451b7b7ff0df7def97027efe4fb8a02bc
DIST osl-1.12.14.0.tar.gz 20555853 BLAKE2B 4f6bc2084e4c1b25e707a37830961f20926e6ab5cb915c763cbd8126127e70f6368832077729ab5e044f573e8c38c4afb413eff8adccee5ea1ae96cb9be43b6e SHA512 51641e58fb0bba042853e3976c104decc788f1b1d3ec2e33a3f5504b11b05950dc38766ffb066b0f76edc4e0a8829d6b7dd408d9288b74d69380395b1d991bd5
-DIST osl-1.12.7.0.tar.gz 20250356 BLAKE2B a9398243546b1bfc1e3f9602f6112a72a8e7cb6ace54e93d0e5f30d943474e82c3317596597d6a09e0f2cf04b1b21f05c31a2357e3d667d710cd2aa340f5fd63 SHA512 ec0391dfc95140fee4fa8332991cdcb0978dafc436f3e07d0293e2baa2014b8765e6b60631ae5a8bbd6e16dbcf37f04c076d7d6b2d8bfa58b78471f0d92c433f
DIST osl-1.13.7.0.tar.gz 21774349 BLAKE2B 1fd731f14b8dce948d7995efadb63eec8ce028ed6b095db391d2dfedcbbd62ca3aad9cd5d7d40f94c9e358f952d841899103467a2f81b12a605ae8c8436a16ff SHA512 15ffc6a5eed44141672af3d7ddab5d97abacad2062cddb35ef2a8484538a9a9a86cbd7e7170deafcefd3b69df764bfd207685603ca17a2fbff4299ccd1afe569
DIST osl-1.13.10.0.tar.gz 21776721 BLAKE2B 6b40adcf50403292003ae8216e60328d5af6d25bf22cd241aeb4f99b1d39c628c78fe1bc8372226c984ca38b6e08427525f12dc38e5b6d3355de02cbc71f1b7b SHA512 f005b8797a7bb882bcdf4fd644551d42c150956baa8dd9deff39ff1121321f33b8e144a9a96ac940ae6bf60985c6131457131baa87c73c2b498298aaa77c3c7d
diff --git a/media-libs/osl/osl-1.12.11.0.ebuild b/media-libs/osl/osl-1.12.11.0.ebuild
deleted file mode 100644
index 677938550873..000000000000
--- a/media-libs/osl/osl-1.12.11.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-# Check this on updates
-LLVM_MAX_SLOT=15
-
-inherit cmake llvm toolchain-funcs python-single-r1
-
-DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="http://opensource.imageworks.com/?p=osl"
-# If a development release, please don't keyword!
-SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/OpenShadingLanguage-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-
-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"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- dev-libs/boost:=
- dev-libs/pugixml
- >=media-libs/openexr-3:0=
- >=media-libs/openimageio-2.3.12.0:=
- <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="
- app-alternatives/yacc
- app-alternatives/lex
- virtual/pkgconfig
-"
-
-llvm_check_deps() {
- has_version -r "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
- llvm_pkg_setup
-
- use python && python-single-r1_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=(
- -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)
- -DPYTHON_VERSION="${EPYTHON/python}"
- -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
- )
-
- cmake_src_configure
-}
-
-src_test() {
- # TODO: investigate failures
- local myctestargs=(
- -E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward|render-raytypes.opt|color|color.opt|example-deformer)"
- )
-
- cmake_src_test
-}
diff --git a/media-libs/osl/osl-1.12.13.0.ebuild b/media-libs/osl/osl-1.12.13.0.ebuild
deleted file mode 100644
index e3c4c2e1a16a..000000000000
--- a/media-libs/osl/osl-1.12.13.0.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..11} )
-
-# Check this on updates
-LLVM_MAX_SLOT=15
-
-inherit cmake flag-o-matic llvm toolchain-funcs python-single-r1
-
-DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="http://opensource.imageworks.com/?p=osl"
-# If a development release, please don't keyword!
-SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/OpenShadingLanguage-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
-
-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"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- dev-libs/boost:=
- dev-libs/pugixml
- >=media-libs/openexr-3:0=
- >=media-libs/openimageio-2.3.12.0:=
- <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="
- app-alternatives/yacc
- app-alternatives/lex
- virtual/pkgconfig
-"
-
-llvm_check_deps() {
- has_version -r "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
- llvm_pkg_setup
-
- use python && python-single-r1_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")
-
- # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
- # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
- use arm64 && append-flags -flax-vector-conversions
-
- local gcc="$(tc-getCC)"
- local mycmakeargs=(
- -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)
- -DPYTHON_VERSION="${EPYTHON/python}"
- -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
- )
-
- cmake_src_configure
-}
-
-src_test() {
- # TODO: investigate failures
- local myctestargs=(
- -E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward|render-raytypes.opt|color|color.opt|example-deformer)"
- )
-
- cmake_src_test
-}
diff --git a/media-libs/osl/osl-1.12.7.0.ebuild b/media-libs/osl/osl-1.12.7.0.ebuild
deleted file mode 100644
index d778aa560c98..000000000000
--- a/media-libs/osl/osl-1.12.7.0.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-
-# Check this on updates
-LLVM_MAX_SLOT=15
-
-inherit cmake llvm toolchain-funcs python-single-r1
-
-DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="http://opensource.imageworks.com/?p=osl"
-# If a development release, please don't keyword!
-SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/OpenShadingLanguage-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
-
-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"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
- dev-libs/boost:=
- dev-libs/pugixml
- >=media-libs/openexr-3:0=
- >=media-libs/openimageio-2.3.12.0:=
- <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="
- app-alternatives/yacc
- app-alternatives/lex
- virtual/pkgconfig
-"
-
-llvm_check_deps() {
- has_version -r "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
- llvm_pkg_setup
-
- use python && python-single-r1_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=(
- # Still needed?
- # See https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/pull/1454
- #-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)
- -DPYTHON_VERSION="${EPYTHON/python}"
- -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
- )
-
- cmake_src_configure
-}
-
-src_test() {
- # TODO: investigate failures
- local myctestargs=(
- -E "(osl-imageio|osl-imageio.opt|render-background|render-bumptest|render-mx-furnace-burley-diffuse|render-mx-furnace-sheen|render-mx-burley-diffuse|render-mx-conductor|render-mx-generalized-schlick|render-mx-generalized-schlick-glass|render-microfacet|render-oren-nayar|render-uv|render-veachmis|render-ward|color|color.opt|example-deformer)"
- )
-
- cmake_src_test
-}
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2024-07-15 11:27 Joonas Niilola
0 siblings, 0 replies; 60+ messages in thread
From: Joonas Niilola @ 2024-07-15 11:27 UTC (permalink / raw
To: gentoo-commits
commit: b64c397efc5dce3104e1661f7f345519e7fe736f
Author: Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 15 11:27:09 2024 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jul 15 11:27:09 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b64c397e
media-libs/osl: Stabilize 1.13.10.0 amd64, #935996
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/osl/osl-1.13.10.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/osl/osl-1.13.10.0.ebuild b/media-libs/osl/osl-1.13.10.0.ebuild
index 3df3ad89ba3b..2d149fe4a5f5 100644
--- a/media-libs/osl/osl-1.13.10.0.ebuild
+++ b/media-libs/osl/osl-1.13.10.0.ebuild
@@ -19,7 +19,7 @@ if [[ ${PV} = *9999* ]] ; then
else
# If a development release, please don't keyword!
SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
S="${WORKDIR}/OpenShadingLanguage-${PV}"
fi
^ permalink raw reply related [flat|nested] 60+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/
@ 2024-10-04 21:40 Andreas Sturmlechner
0 siblings, 0 replies; 60+ messages in thread
From: Andreas Sturmlechner @ 2024-10-04 21:40 UTC (permalink / raw
To: gentoo-commits
commit: 13940bc5aebd140a1c8f31d7410addfeb337aff6
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 4 17:42:23 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 4 21:40:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13940bc5
media-libs/osl: drop 1.13.7.0
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/osl/Manifest | 1 -
media-libs/osl/osl-1.13.7.0.ebuild | 462 -------------------------------------
2 files changed, 463 deletions(-)
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index ac78547f4a27..e2e30825190e 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,3 +1,2 @@
DIST osl-1.12.14.0.tar.gz 20555853 BLAKE2B 4f6bc2084e4c1b25e707a37830961f20926e6ab5cb915c763cbd8126127e70f6368832077729ab5e044f573e8c38c4afb413eff8adccee5ea1ae96cb9be43b6e SHA512 51641e58fb0bba042853e3976c104decc788f1b1d3ec2e33a3f5504b11b05950dc38766ffb066b0f76edc4e0a8829d6b7dd408d9288b74d69380395b1d991bd5
-DIST osl-1.13.7.0.tar.gz 21774349 BLAKE2B 1fd731f14b8dce948d7995efadb63eec8ce028ed6b095db391d2dfedcbbd62ca3aad9cd5d7d40f94c9e358f952d841899103467a2f81b12a605ae8c8436a16ff SHA512 15ffc6a5eed44141672af3d7ddab5d97abacad2062cddb35ef2a8484538a9a9a86cbd7e7170deafcefd3b69df764bfd207685603ca17a2fbff4299ccd1afe569
DIST osl-1.13.10.0.tar.gz 21776721 BLAKE2B 6b40adcf50403292003ae8216e60328d5af6d25bf22cd241aeb4f99b1d39c628c78fe1bc8372226c984ca38b6e08427525f12dc38e5b6d3355de02cbc71f1b7b SHA512 f005b8797a7bb882bcdf4fd644551d42c150956baa8dd9deff39ff1121321f33b8e144a9a96ac940ae6bf60985c6131457131baa87c73c2b498298aaa77c3c7d
diff --git a/media-libs/osl/osl-1.13.7.0.ebuild b/media-libs/osl/osl-1.13.7.0.ebuild
deleted file mode 100644
index a8e64ed97c5f..000000000000
--- a/media-libs/osl/osl-1.13.7.0.ebuild
+++ /dev/null
@@ -1,462 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{10..12} )
-
-# Check this on updates
-LLVM_COMPAT=( {15..17} )
-
-inherit cmake cuda flag-o-matic llvm-r1 toolchain-funcs python-single-r1
-
-DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="https://www.imageworks.com/technology/opensource https://github.com/AcademySoftwareFoundation/OpenShadingLanguage"
-
-if [[ ${PV} = *9999* ]] ; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage.git"
-else
- # If a development release, please don't keyword!
- SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
- S="${WORKDIR}/OpenShadingLanguage-${PV}"
-fi
-
-LICENSE="BSD"
-SLOT="0/$(ver_cut 1-3)"
-
-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="debug doc gui libcxx nofma optix partio qt6 test ${CPU_FEATURES[*]%:*} python"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# TODO optix
-RDEPEND="
- dev-libs/boost:=
- dev-libs/pugixml
- >=media-libs/openexr-3:0=
- >=media-libs/openimageio-2.4:=
- $(llvm_gen_dep '
- sys-devel/clang:${LLVM_SLOT}
- sys-devel/llvm:${LLVM_SLOT}
- ')
- sys-libs/zlib:=
- optix? ( dev-libs/optix[-headers-only] )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pybind11[${PYTHON_USEDEP}]
- media-libs/openimageio[python,${PYTHON_SINGLE_USEDEP}]
- ')
- )
- partio? ( media-libs/partio )
- gui? (
- !qt6? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qtopengl:5
- )
- qt6? (
- dev-qt/qtbase:6[gui,widgets,opengl]
- )
- )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
- sys-devel/bison
- sys-devel/flex
- virtual/pkgconfig
-"
-
-pkg_setup() {
- llvm-r1_pkg_setup
-
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- if use optix; then
- cuda_src_prepare
- cuda_add_sandbox -w
- fi
-
- sed -e "/^install.*llvm_macros.cmake.*cmake/d" -i CMakeLists.txt || die
-
- cmake_src_prepare
-}
-
-src_configure() {
- # -Werror=lto-type-mismatch
- # https://bugs.gentoo.org/875836
- # https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1810
- filter-lto
-
- # pick the highest we support
- local mysimd=()
- if use cpu_flags_x86_avx512f; then
- mysimd+=( avx512f )
- elif use cpu_flags_x86_avx2 ; then
- mysimd+=( avx2 )
- if use cpu_flags_x86_f16c ; then
- mysimd+=( f16c )
- fi
- elif use cpu_flags_x86_avx ; then
- mysimd+=( avx )
- elif use cpu_flags_x86_sse4_2 ; then
- mysimd+=( sse4.2 )
- elif use cpu_flags_x86_sse4_1 ; then
- mysimd+=( sse4.1 )
- elif use cpu_flags_x86_ssse3 ; then
- mysimd+=( ssse3 )
- elif use cpu_flags_x86_sse3 ; then
- mysimd+=( sse3 )
- elif use cpu_flags_x86_sse2 ; then
- mysimd+=( sse2 )
- fi
-
- local mybatched=()
- if use cpu_flags_x86_avx512f || use cpu_flags_x86_avx2 ; then
- if use cpu_flags_x86_avx512f ; then
- if use nofma; then
- mybatched+=(
- "b8_AVX512_noFMA"
- "b16_AVX512_noFMA"
- )
- else
- mybatched+=(
- "b8_AVX512"
- "b16_AVX512"
- )
- fi
- fi
- if use cpu_flags_x86_avx2 ; then
- if use nofma; then
- mybatched+=(
- "b8_AVX2_noFMA"
- )
- else
- mybatched+=(
- "b8_AVX2"
- )
- fi
- fi
- elif use cpu_flags_x86_avx ; then
- mybatched+=(
- "b8_AVX"
- )
- fi
-
- # If no CPU SIMDs were used, completely disable them
- [[ -z "${mysimd[*]}" ]] && mysimd=("0")
- [[ -z "${mybatched[*]}" ]] && mybatched=("0")
-
- # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
- # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
- use arm64 && append-flags -flax-vector-conversions
-
- local gcc
- gcc="$(tc-getCC)"
-
- local mycmakeargs=(
- -DCMAKE_POLICY_DEFAULT_CMP0146="OLD" # BUG FindCUDA
- -DCMAKE_POLICY_DEFAULT_CMP0148="OLD" # BUG FindPythonInterp
-
- # std::tuple_size_v is c++17
- -DCMAKE_CXX_STANDARD="17"
-
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
- -DINSTALL_DOCS="$(usex doc)"
- -DUSE_CCACHE="no"
- -DLLVM_STATIC="no"
- -DOSL_BUILD_TESTS="$(usex test)"
- -DSTOP_ON_WARNING="no"
- -DUSE_PARTIO="$(usex partio)"
- -DUSE_PYTHON="$(usex python)"
- -DPYTHON_VERSION="${EPYTHON/python}"
- -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
- -DUSE_BATCHED="$(IFS=","; echo "${mybatched[*]}")"
- -DUSE_LIBCPLUSPLUS="$(usex libcxx)"
- -DOSL_USE_OPTIX="$(usex optix)"
-
- -DOpenImageIO_ROOT="${EPREFIX}/usr"
- )
-
- if use debug; then
- mycmakeargs+=(
- -DVEC_REPORT="yes"
- )
- fi
-
- if use gui; then
- mycmakeargs+=( -DUSE_QT="yes" )
- if ! use qt6; then
- mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" )
- fi
- else
- mycmakeargs+=( -DUSE_QT="no" )
- fi
-
- if use optix; then
- mycmakeargs+=(
- -DOptiX_FIND_QUIETLY="no"
- -DCUDA_FIND_QUIETLY="no"
-
- -DOPTIXHOME="${EPREFIX}/opt/optix"
- -DCUDA_TOOLKIT_ROOT_DIR="${EPREFIX}/opt/cuda"
-
- -DCUDA_NVCC_FLAGS="--compiler-bindir;$(cuda_gccdir)"
- -DOSL_EXTRA_NVCC_ARGS="--compiler-bindir;$(cuda_gccdir)"
- -DCUDA_VERBOSE_BUILD="yes"
- )
- fi
-
- if use partio; then
- mycmakeargs+=(
- -Dpartio_DIR="${EPREFIX}/usr"
- )
- fi
-
- cmake_src_configure
-}
-
-src_test() {
- # A bunch of tests only work when installed.
- # So install them into the temp directory now.
- DESTDIR="${T}" cmake_build install
-
- ln -s "${CMAKE_USE_DIR}/src/cmake/" "${BUILD_DIR}/src/cmake" || die
-
- if use optix; then
- cp \
- "${BUILD_DIR}/src/liboslexec/shadeops_cuda.ptx" \
- "${BUILD_DIR}/src/testrender/"{optix_raytracer,quad,rend_lib_testrender,sphere,wrapper}".ptx" \
- "${BUILD_DIR}/src/testshade/"{optix_grid_renderer,rend_lib_testshade}".ptx" \
- "${BUILD_DIR}/bin/" || die
-
- # NOTE this should go to cuda eclass
- addwrite /dev/nvidiactl
- addwrite /dev/nvidia0
- addwrite /dev/nvidia-uvm
- addwrite /dev/nvidia-caps
- addwrite "/dev/char/"
- fi
-
- CMAKE_SKIP_TESTS=(
- "broken"
- "^render"
-
- # broken with in-tree <=dev-libs/optix-7.5.0 and out of date
- "^example-cuda$"
-
- # outright fail
- "^transform-reg.regress.batched.opt$"
-
- # SIGABRT similar to https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1363
- "^derivs.opt.rs_bitcode$"
- "^geomath.batched$"
- "^matrix.batched$"
- "^matrix.batched.opt$"
- "^spline-reg.regress.batched.opt$"
- "^transformc.batched$"
- )
-
- # These only fail inside sandbox
- if [[ "${OSL_OPTIONAL_TESTS}" != "true" ]]; then
- CMAKE_SKIP_TESTS+=(
- # TODO: investigate failures
- # SIGABRT similar to https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/issues/1363
- "^andor-reg.regress.batched.opt$"
- "^arithmetic-reg.regress.batched.opt$"
- "^array-assign-reg.regress.batched.opt$"
- "^array-copy-reg.regress.batched.opt$"
- "^array-length-reg.regress.batched$"
- "^bug-outputinit.optix$"
- "^bug-outputinit.optix.fused$"
- "^bug-outputinit.optix.opt$"
- "^bug-return.optix$"
- "^bug-return.optix.fused$"
- "^bug-return.optix.opt$"
- "^closure-parameters.batched$"
- "^closure-parameters.batched.opt$"
- "^closure.batched$"
- "^closure.batched.opt$"
- "^debug-uninit$"
- "^debug-uninit.batched$"
- "^debug-uninit.batched.opt$"
- "^debug-uninit.opt$"
- "^debug-uninit.opt.rs_bitcode$"
- "^derivs$"
- "^derivs.batched$"
- "^derivs.batched.opt$"
- "^derivs.opt$"
- "^exponential$"
- "^exponential.opt$"
- "^exponential.opt.rs_bitcode$"
- "^filterwidth-reg.regress.batched.opt$"
- "^geomath$"
- "^geomath.batched.opt$"
- "^geomath.opt$"
- "^geomath.opt.rs_bitcode$"
- "^getattribute-camera.batched$"
- "^getattribute-camera.batched.opt$"
- "^getattribute-shader.batched.opt$"
- "^gettextureinfo-reg.regress.batched.opt$"
- "^gettextureinfo-udim-reg.regress.batched.opt$"
- "^gettextureinfo.batched$"
- "^hyperb.batched.opt$"
- "^hyperb.opt$"
- "^hyperb.opt.rs_bitcode$"
- "^initlist.batched$"
- "^initlist.batched.opt$"
- "^linearstep.batched$"
- "^linearstep.batched.opt$"
- "^loop.batched$"
- "^loop.batched.opt$"
- "^matrix$"
- "^matrix-compref-reg.regress.batched.opt$"
- "^matrix-reg.regress.rsbitcode.opt$"
- "^matrix.opt$"
- "^matrix.opt.rs_bitcode$"
- "^matrix.rsbitcode.opt$"
- "^message-no-closure.batched$"
- "^message-no-closure.batched.opt$"
- "^message-reg.regress.batched.opt$"
- "^miscmath$"
- "^miscmath.batched$"
- "^miscmath.batched.opt$"
- "^miscmath.opt$"
- "^miscmath.opt.rs_bitcode$"
- "^noise-cell.batched$"
- "^noise-gabor-reg.regress.batched.opt$"
- "^noise-gabor.batched$"
- "^noise-gabor.batched.opt$"
- "^noise-generic.batched$"
- "^noise-generic.batched.opt$"
- "^noise-perlin.batched$"
- "^noise-perlin.batched.opt$"
- "^noise-reg.regress.batched.opt$"
- "^noise-simplex.batched$"
- "^noise-simplex.batched.opt$"
- "^noise.batched$"
- "^opt-warnings.batched$"
- "^opt-warnings.batched.opt$"
- "^pnoise-cell.batched$"
- "^pnoise-gabor.batched$"
- "^pnoise-gabor.batched.opt$"
- "^pnoise-generic.batched$"
- "^pnoise-generic.batched.opt$"
- "^pnoise-perlin.batched$"
- "^pnoise-perlin.batched.opt$"
- "^pnoise-reg.regress.batched.opt$"
- "^pnoise.batched$"
- "^pointcloud.batched$"
- "^pointcloud.batched.opt$"
- "^regex-reg.regress.batched.opt$"
- "^select.batched$"
- "^select.batched.opt$"
- "^shaderglobals.batched$"
- "^shaderglobals.batched.opt$"
- "^smoothstep-reg.regress.batched.opt$"
- "^spline-derivbug.batched$"
- "^spline-derivbug.batched.opt$"
- "^spline.batched$"
- "^spline.batched.opt$"
- "^splineinverse-ident.batched$"
- "^splineinverse-ident.batched.opt$"
- "^split-reg.regress.batched.opt$"
- "^string$"
- "^string-reg.regress.batched.opt$"
- "^string.batched$"
- "^string.batched.opt$"
- "^string.opt$"
- "^string.opt.rs_bitcode$"
- "^struct-array-mixture.batched$"
- "^struct-array-mixture.batched.opt$"
- "^struct.batched$"
- "^test-fmt-matrixcolor.opt.rs_bitcode$"
- "^testoptix-noise.optix.opt$"
- "^testoptix-reparam.optix.opt$"
- "^texture-environment-opts-reg.regress.batched.opt$"
- "^texture-opts-reg.regress.batched.opt$"
- "^texture-wrap.batched$"
- "^texture-wrap.batched.opt$"
- "^transcendental-reg.regress.batched.opt$"
- "^transform$"
- "^transform.batched$"
- "^transform.batched.opt$"
- "^transform.opt$"
- "^transform.opt.rs_bitcode$"
- "^transformc$"
- "^transformc.batched.opt$"
- "^transformc.opt$"
- "^transformc.opt.rs_bitcode$"
- "^transformc.rsbitcode.opt$"
- "^trig$"
- "^trig-reg.regress.batched.opt$"
- "^trig.batched$"
- "^trig.batched.opt$"
- "^trig.opt$"
- "^trig.opt.rs_bitcode$"
- "^vecctr.batched$"
- "^vecctr.batched.opt$"
- "^vector$"
- "^vector-reg.regress.batched.opt$"
- "^vector.opt$"
- "^vector.opt.rs_bitcode$"
- "^wavelength_color.optix$"
- "^wavelength_color.optix.fused$"
- "^wavelength_color.optix.opt$"
- "^xml-reg.regress.batched.opt$"
-
- # diff
- "^testoptix.optix.opt$"
- )
- fi
-
- myctestargs=(
- # src/build-scripts/ci-test.bash
- '--force-new-ctest-process'
- )
-
- local -x DEBUG CXXFLAGS LD_LIBRARY_PATH DIR OSL_DIR OSL_SOURCE_DIR PYTHONPATH
- DEBUG=1 # doubles the floating point tolerance
- CXXFLAGS="-I${T}/usr/include"
- LD_LIBRARY_PATH="${T}/usr/$(get_libdir)"
- OSL_DIR="${T}/usr/$(get_libdir)/cmake/OSL"
- OSL_SOURCE_DIR="${S}"
-
- if use python; then
- PYTHONPATH="${BUILD_DIR}/lib/python/site-packages"
- fi
-
- cmake_src_test
-
- CMAKE_SKIP_TESTS=(
- "^render-background$"
- "^render-mx-furnace-sheen$"
- "^render-mx-burley-diffuse$"
- "^render-mx-conductor$"
- "^render-microfacet$"
- "^render-veachmis$"
- "^render-ward$"
- "^render-raytypes.opt$"
- "^render-raytypes.opt.rs_bitcode$"
- )
-
- myctestargs=(
- # src/build-scripts/ci-test.bash
- '--force-new-ctest-process'
- --repeat until-pass:10
- -R "^render"
- )
-
- cmake_src_test
-}
^ permalink raw reply related [flat|nested] 60+ messages in thread
end of thread, other threads:[~2024-10-04 21:40 UTC | newest]
Thread overview: 60+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-12-02 3:53 [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/ Sam James
-- strict thread matches above, loose matches on Subject: below --
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: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
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox