subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-libs\/osl\/"

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

2024-06-01 Thread Sam James

commit: 05515b776ebc64109872064ab3797d9806db67a3
Author: Sam James  gentoo  org>
AuthorDate: Sun Jun  2 04:12:42 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jun  2 04:12:42 2024 +
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  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} = ** ]] ; 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

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

2024-05-02 Thread Sam James

commit: 6441e2b149d548297bf87ab5ffeda35bb1d32c1e
Author: Eli Schwartz  gmail  com>
AuthorDate: Fri May  3 00:09:38 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  3 03:33:18 2024 +
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  gmail.com>
Signed-off-by: Sam James  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-.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-.ebuild b/media-libs/osl/osl-.ebuild
index 02e2f6079c81..68654d760dc8 100644
--- a/media-libs/osl/osl-.ebuild
+++ b/media-libs/osl/osl-.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

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

2024-05-02 Thread Sam James

commit: 88c844cb1e45a4b1487e8b32618352d82902093e
Author: Eli Schwartz  gmail  com>
AuthorDate: Thu May  2 23:47:14 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May  3 03:33:18 2024 +
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  gmail.com>
Signed-off-by: Sam James  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-.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-.ebuild b/media-libs/osl/osl-.ebuild
index 9ae3ddb5a40d..02e2f6079c81 100644
--- a/media-libs/osl/osl-.ebuild
+++ b/media-libs/osl/osl-.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)"

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

2024-04-10 Thread Joonas Niilola

commit: 7f441b1b6f9acbb53263aa76a0ca83657c238dd9
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Apr 10 06:23:31 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Apr 10 06:23:31 2024 +
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  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

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

2024-01-10 Thread Sam James

commit: 1292fc663dc19c86b54e1076eb36a9b5b714c7d6
Author: Paul Zander  gmail  com>
AuthorDate: Fri Dec  8 14:20:37 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jan 10 12:41:00 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1292fc66

media-libs/osl: add 1.12.14.0

Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34220
Signed-off-by: Sam James  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 
75a2a5d1ba26cd11463dde710d5be3b8b2d227de45263d8bd39fd87ca064f7c6d2b2f9cea2fdb8f29ccaa94d3ef60e2ff2e0e6d867385e2298dd10ef61b6
 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 @@


Use media-libs/partio
-   Build the osltoy binary
+   Build the osltoy binary (with Qt5)
+   Build the osltoy binary (with Qt6)


-   imageworks/OpenShadingLanguage
+   AcademySoftwareFoundation/OpenShadingLanguage

 

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 ..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:=
+

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

2023-07-16 Thread Sam James

commit: f1048e9aac05e9400b986035ecd10c8a7d8a774c
Author: Sebastian Parborg  gmail  com>
AuthorDate: Sun Jul  2 22:55:26 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jul 16 18:42:16 2023 +
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  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31722
Signed-off-by: Sam James  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 
75a2a5d1ba26cd11463dde710d5be3b8b2d227de45263d8bd39fd87ca064f7c6d2b2f9cea2fdb8f29ccaa94d3ef60e2ff2e0e6d867385e2298dd10ef61b6
 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 ..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:=
+

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

2023-06-10 Thread Andreas Sturmlechner

commit: 317b6b71c4bab28a50a9f6f77710f217151eeb6d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Jun 10 19:59:59 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Jun 10 20:45:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=317b6b71

media-libs/osl: unkeyword for ~x86, no revdeps

Signed-off-by: Andreas Sturmlechner  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

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

2023-05-01 Thread Sam James

commit: 6faa56e4bc50bdbe5bd1bf7917b5217d91cf465a
Author: Sebastian Parborg  gmail  com>
AuthorDate: Mon May  1 14:56:29 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon May  1 15:14:24 2023 +
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  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/30823
Signed-off-by: Sam James  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 ..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:=
+

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

2022-12-26 Thread Conrad Kostecki

commit: e7064bc2d802091c83bb63dcef49cb05e8ab6028
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Mon Dec 26 08:31:31 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Mon Dec 26 13:41:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7064bc2

media-libs/osl: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28812
Signed-off-by: Conrad Kostecki  gentoo.org>

 media-libs/osl/files/osl-1.11.17.0-llvm14.patch | 35 -
 1 file changed, 35 deletions(-)

diff --git a/media-libs/osl/files/osl-1.11.17.0-llvm14.patch 
b/media-libs/osl/files/osl-1.11.17.0-llvm14.patch
deleted file mode 100644
index 6a20ce31c589..
--- a/media-libs/osl/files/osl-1.11.17.0-llvm14.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Backport of the following patch from git main to 1.11.17.0:
-
-From 8a8c2fd5e6c016eb2d22d2522bdeb9f165f319fa Mon Sep 17 00:00:00 2001
-From: Larry Gritz 
-Date: Mon, 18 Apr 2022 11:45:34 -0700
-Subject: [PATCH 1/3] Support for LLVM 14
-
-API changes we had to take into account:
-* TargetRegistry.h location
-* No more DisableTailCalls field in PassManagerBuilder.
-
-Signed-off-by: Larry Gritz 

- .github/workflows/ci.yml  | 10 +-
- INSTALL.md|  2 +-
- src/build-scripts/build_llvm.bash |  2 +-
- src/liboslexec/llvm_util.cpp  |  7 ++-
- 4 files changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
-index b30c89318..22d4134ba 100644
 a/src/liboslexec/llvm_util.cpp
-+++ b/src/liboslexec/llvm_util.cpp
-@@ -45,7 +45,11 @@
- #include 
- #include 
- #include 
-+#if OSL_LLVM_VERSION < 140
- #include 
-+#else
-+#include 
-+#endif
- 
- #include 
- #include

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

2022-12-24 Thread Andreas Sturmlechner

commit: 8b05582cd5767503d23270bbfe6309af7ea447f0
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Dec 20 22:13:01 2022 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Dec 24 14:06:29 2022 +
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  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..
--- 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="
-   =media-libs/openexr-3:0=
-   >=dev-libs/imath-3.1.4-r2:=
-   >=media-libs/openimageio-2.3.12.0:=
-

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

2022-12-13 Thread Sam James

commit: 16195f86fcf92aa81903d5b36f368892d17dec01
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec 14 05:18:58 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec 14 05:18:58 2022 +
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  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

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

2022-11-03 Thread Sam James

commit: 53e1973f60c92620705b4f6717e39b63536f23a8
Author: Sam James  gentoo  org>
AuthorDate: Thu Nov  3 05:54:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Nov  3 06:14:03 2022 +
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  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 ..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:=
+   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
+}

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

2022-10-15 Thread Conrad Kostecki

commit: b2e3ee3e5a1ca3ae846f9483f24d21f291cb703c
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Oct 15 07:56:50 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sat Oct 15 19:33:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2e3ee3e

media-libs/osl: remove unused patch

Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27792
Signed-off-by: Conrad Kostecki  gentoo.org>

 media-libs/osl/files/osl-1.11.16.0-no-imath.patch | 49 ---
 1 file changed, 49 deletions(-)

diff --git a/media-libs/osl/files/osl-1.11.16.0-no-imath.patch 
b/media-libs/osl/files/osl-1.11.16.0-no-imath.patch
deleted file mode 100644
index a8e5c1f23116..
--- a/media-libs/osl/files/osl-1.11.16.0-no-imath.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-Force finding OpenEXR / IlmBase instead of imath for now.
 a/src/cmake/modules/FindOpenEXR.cmake
-+++ b/src/cmake/modules/FindOpenEXR.cmake
-@@ -39,43 +39,10 @@
- #
- 
- # First, try to fine just the right config files
--find_package(Imath CONFIG)
--if (NOT TARGET Imath::Imath)
--# Couldn't find Imath::Imath, maybe it's older and has IlmBase?
--find_package(IlmBase CONFIG)
--endif ()
-+find_package(IlmBase CONFIG)
- find_package(OpenEXR CONFIG)
- 
--if (TARGET OpenEXR::OpenEXR AND TARGET Imath::Imath)
--# OpenEXR 3.x if both of these targets are found
--set (FOUND_OPENEXR_WITH_CONFIG 1)
--if (NOT OpenEXR_FIND_QUIETLY)
--message (STATUS "Found CONFIG for OpenEXR 3 
(OPENEXR_VERSION=${OpenEXR_VERSION})")
--endif ()
--
--# Mimic old style variables
--set (OPENEXR_VERSION ${OpenEXR_VERSION})
--get_target_property(IMATH_INCLUDES Imath::Imath 
INTERFACE_INCLUDE_DIRECTORIES)
--get_target_property(ILMBASE_INCLUDES Imath::Imath 
INTERFACE_INCLUDE_DIRECTORIES)
--get_target_property(ILMBASE_IMATH_LIBRARY Imath::Imath 
INTERFACE_LINK_LIBRARIES)
--get_target_property(IMATH_LIBRARY Imath::Imath INTERFACE_LINK_LIBRARIES)
--get_target_property(OPENEXR_IEX_LIBRARY OpenEXR::Iex 
INTERFACE_LINK_LIBRARIES)
--get_target_property(OPENEXR_ILMTHREAD_LIBRARY OpenEXR::IlmThread 
INTERFACE_LINK_LIBRARIES)
--set (ILMBASE_LIBRARIES ${ILMBASE_IMATH_LIBRARY})
--set (ILMBASE_FOUND true)
--
--get_target_property(OPENEXR_INCLUDES OpenEXR::OpenEXR 
INTERFACE_INCLUDE_DIRECTORIES)
--get_target_property(OPENEXR_ILMIMF_LIBRARY OpenEXR::OpenEXR 
INTERFACE_LINK_LIBRARIES)
--set (OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} 
${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_LIBRARIES})
--set (OPENEXR_FOUND true)
--
--# Link with pthreads if required
--find_package (Threads)
--if (CMAKE_USE_PTHREADS_INIT)
--list (APPEND ILMBASE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
--endif ()
--
--elseif (TARGET OpenEXR::IlmImf AND TARGET IlmBase::Imath AND
-+if (TARGET OpenEXR::IlmImf AND TARGET IlmBase::Imath AND
- (OPENEXR_VERSION VERSION_GREATER_EQUAL 2.4 OR OpenEXR_VERSION 
VERSION_GREATER_EQUAL 2.4))
- # OpenEXR 2.4 or 2.5 with exported config
- set (FOUND_OPENEXR_WITH_CONFIG 1)

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

2022-10-01 Thread Sam James

commit: 6e4cb780951365c1dfc5295fc0c853020b4efa3e
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct  2 01:32:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct  2 02:26:10 2022 +
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  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 ..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:=
+   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
+}

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

2022-10-01 Thread Sam James

commit: fca5d53c3894fd7cdf4e5ec2554c9e32af18eaa5
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct  2 01:33:06 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct  2 02:26:10 2022 +
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  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..
--- 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:=
-

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

2022-07-08 Thread Sam James

commit: 74e27b0e8a0d700113972cb9fe13df730ba090ac
Author: Sam James  gentoo  org>
AuthorDate: Sat Jul  9 05:45:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jul  9 05:57:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74e27b0e

media-libs/osl: needs older libfmt

Signed-off-by: Sam James  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="
+   =media-libs/openexr-3:0=

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

2022-06-05 Thread Sam James

commit: 9679d85429bdba275abdd29ed95d6d7a1beb0960
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun  6 01:39:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun  6 01:39:47 2022 +
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  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..
--- 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:=
-

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

2022-05-20 Thread Joonas Niilola

commit: 3ccf124a36dd03df3b6b28ec472df54e1ab6d62c
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri May 20 13:19:58 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri May 20 13:21:01 2022 +
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  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

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

2022-05-20 Thread Joonas Niilola

commit: 32003b5f8de209e47294f95b2c0557b04f099290
Author: Sebastian Parborg  gmail  com>
AuthorDate: Mon May  2 14:14:39 2022 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri May 20 11:25:11 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32003b5f

media-libs/osl: Backport LLVM 14 patch to the stable release

Signed-off-by: Sebastian Parborg  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-libs/osl/files/osl-1.11.17.0-llvm14.patch | 35 +
 media-libs/osl/osl-1.11.17.0-r3.ebuild  |  6 -
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/media-libs/osl/files/osl-1.11.17.0-llvm14.patch 
b/media-libs/osl/files/osl-1.11.17.0-llvm14.patch
new file mode 100644
index ..6a20ce31c589
--- /dev/null
+++ b/media-libs/osl/files/osl-1.11.17.0-llvm14.patch
@@ -0,0 +1,35 @@
+Backport of the following patch from git main to 1.11.17.0:
+
+From 8a8c2fd5e6c016eb2d22d2522bdeb9f165f319fa Mon Sep 17 00:00:00 2001
+From: Larry Gritz 
+Date: Mon, 18 Apr 2022 11:45:34 -0700
+Subject: [PATCH 1/3] Support for LLVM 14
+
+API changes we had to take into account:
+* TargetRegistry.h location
+* No more DisableTailCalls field in PassManagerBuilder.
+
+Signed-off-by: Larry Gritz 
+---
+ .github/workflows/ci.yml  | 10 +-
+ INSTALL.md|  2 +-
+ src/build-scripts/build_llvm.bash |  2 +-
+ src/liboslexec/llvm_util.cpp  |  7 ++-
+ 4 files changed, 13 insertions(+), 8 deletions(-)
+
+diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
+index b30c89318..22d4134ba 100644
+--- a/src/liboslexec/llvm_util.cpp
 b/src/liboslexec/llvm_util.cpp
+@@ -45,7 +45,11 @@
+ #include 
+ #include 
+ #include 
++#if OSL_LLVM_VERSION < 140
+ #include 
++#else
++#include 
++#endif
+ 
+ #include 
+ #include 

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 3f98563dd7a0..0a1926fb5a2d 100644
--- a/media-libs/osl/osl-1.11.17.0-r3.ebuild
+++ b/media-libs/osl/osl-1.11.17.0-r3.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 PYTHON_COMPAT=( python3_{8,9,10} )
 
 # check this on updates
-LLVM_MAX_SLOT=13
+LLVM_MAX_SLOT=14
 
 CMAKE_REMOVE_MODULES_LIST=()
 
@@ -64,6 +64,10 @@ 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}"
 }

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

2022-03-19 Thread Sam James

commit: 08678a03291385bf261453b46bc348090ded3ae7
Author: Sam James  gentoo  org>
AuthorDate: Sat Mar 19 23:36:04 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Mar 19 23:36:04 2022 +
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  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

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

2022-02-27 Thread Sam James

commit: 12f056c08263df14fa59e7ebbf8ba08ab03e4223
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 28 05:19:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 28 05:19:39 2022 +
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  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=(

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

2022-02-19 Thread Sam James

commit: 782c6633b629670f8b6b00ecc6cb5cdc7014144f
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 19 19:41:08 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 19 19:41:08 2022 +
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  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:=

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

2022-02-15 Thread Conrad Kostecki

commit: 2a87a4bbc2a3b768baf6345a083e5e1496d71efd
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Tue Feb 15 18:26:42 2022 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Tue Feb 15 20:51:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a87a4bb

media-libs/osl: remove unused patches

Closes: https://github.com/gentoo/gentoo/pull/24201
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch |  24 ---
 media-libs/osl/files/osl-1.12.0.2-llvm-11.patch|  29 ---
 media-libs/osl/files/osl-1.12.0.2-llvm-12.patch| 240 -
 3 files changed, 293 deletions(-)

diff --git a/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch 
b/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch
deleted file mode 100644
index 020370d54bca..
--- a/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/commit/14bd942f1bbb621c729f01c982925acd6d263d58.patch
-
-From: debaetsd 
-Date: Tue, 29 Dec 2020 22:01:21 +0100
-Subject: [PATCH] fixed cmake setup when tests are disabled (#1319)
-
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -252,11 +252,9 @@ install (EXPORT OSL_EXPORTED_TARGETS
- FILE ${OSL_TARGETS_EXPORT_NAME}
- NAMESPACE ${PROJECT_NAME}::)
- 
--
--
--
--osl_add_all_tests()
--
-+if (${PROJECT_NAME}_BUILD_TESTS AND NOT ${PROJECT_NAME}_IS_SUBPROJECT)
-+  osl_add_all_tests()
-+endif ()
- 
- if (NOT ${PROJECT_NAME}_IS_SUBPROJECT)
- include (packaging)
-

diff --git a/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch 
b/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch
deleted file mode 100644
index a47bcd4e47da..
--- a/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 84c26c0baab8f071270d0fef23175c24d738c73c Mon Sep 17 00:00:00 2001
-From: Brecht Van Lommel 
-Date: Mon, 19 Apr 2021 13:49:22 +0200
-Subject: [PATCH] Fix crash generating closure functions calls with LLVM 11
-
-Generating code for prepare_closure and gen_closure was crashing.
-The code now matches the implementation of the removed LLVM function.
-
-Signed-off-by: Brecht Van Lommel 

- src/liboslexec/llvm_util.cpp | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
-index 445f64000..3d468de27 100644
 a/src/liboslexec/llvm_util.cpp
-+++ b/src/liboslexec/llvm_util.cpp
-@@ -3430,8 +3430,9 @@ LLVM_Util::call_function (llvm::Value *func, 
cspan args)
- #endif
- //llvm_gen_debug_printf (std::string("start ") + std::string(name));
- #if OSL_LLVM_VERSION >= 110
--OSL_DASSERT(llvm::isa(func));
--llvm::Value *r = builder().CreateCall(llvm::cast(func), 
llvm::ArrayRef(args.data(), args.size()));
-+llvm::Value* r = builder().CreateCall(
-+
llvm::cast(func->getType()->getPointerElementType()), func,
-+llvm::ArrayRef(args.data(), args.size()));
- #else
- llvm::Value *r = builder().CreateCall (func, llvm::ArrayRef(args.data(), args.size()));
- #endif

diff --git a/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch 
b/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch
deleted file mode 100644
index dcf9ac863f73..
--- a/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-commit f76ea6220a5f0d59f5f43d3d6d526f1fd09b90f7
-Author: Euan Haahr 
-Date:   Fri Feb 5 22:51:14 2021 +
-
-Various fixes for LLVM 12 compatibility (1351)
-
-Removed use of options.PrintMachineCode since this has been removed as
-of llvm 12. Converted uses of DebugLoc::get to DILocation::get since
-it has been deprecated and removed as of llvm 12.
-
-PrintMachine code will only be used if llvm is lower than version 12.
-TODO: Needs to be re-added in the new way for LLVM12. (LG just doesn't
-have time to figure this out right now.)
-
-Pass adjustment as various things have been deprecated or changed
-names. (LG)
-
-Signed-off-by: Euan Haahr 
-Signed-off-by: Larry Gritz 
-
-diff --git a/src/liboslexec/llvm_passes.h b/src/liboslexec/llvm_passes.h
-index 4ec3489c..7c14fc76 100644
 a/src/liboslexec/llvm_passes.h
-+++ b/src/liboslexec/llvm_passes.h
-@@ -73,9 +73,14 @@ public:
- // 16 bit and 32 bit native mask representation to be passed as a
- // livein.
- m_native_mask_type = llvm::FixedVectorType::get(llvm_type_int32, 
WidthT);
-+#  if OSL_LLVM_VERSION >= 112
-+m_wide_zero_initializer = llvm::ConstantDataVector::getSplat(WidthT,
-+llvm::ConstantInt::get(M.getContext(), llvm::APInt(32,0)));
-+#  else
- m_wide_zero_initializer = llvm::ConstantVector::getSplat(
- llvm::ElementCount(WidthT, false),
-

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

2022-02-15 Thread Sam James

commit: 967d8224791b0c4f99b837c84f17a4bb8b34f6c8
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 12 18:15:05 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 15 19:49:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=967d8224

media-libs/osl: adjust to unslotted OpenEXR

Bug: https://bugs.gentoo.org/833158
Bug: https://bugs.gentoo.org/831357
Bug: https://bugs.gentoo.org/832862
Bug: https://bugs.gentoo.org/821247
Signed-off-by: Sam James  gentoo.org>

 .../osl/files/osl-1.11.16.0-openexr-3-imath.patch  | 126 -
 .../osl/files/osl-1.12.4.1-openexr-3-imath.patch   | 126 -
 ...1.11.17.0-r1.ebuild => osl-1.11.17.0-r2.ebuild} |   6 +-
 3 files changed, 1 insertion(+), 257 deletions(-)

diff --git a/media-libs/osl/files/osl-1.11.16.0-openexr-3-imath.patch 
b/media-libs/osl/files/osl-1.11.16.0-openexr-3-imath.patch
deleted file mode 100644
index 10bb23fffa0e..
--- a/media-libs/osl/files/osl-1.11.16.0-openexr-3-imath.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff --git a/src/include/OSL/oslconfig.h.in b/src/include/OSL/oslconfig.h.in
-index f735b0f..8063f68 100644
 a/src/include/OSL/oslconfig.h.in
-+++ b/src/include/OSL/oslconfig.h.in
-@@ -13,9 +13,9 @@
- // All the things we need from Imath.
- #define OSL_USING_IMATH @OSL_USING_IMATH@
- #if OSL_USING_IMATH >= 3
--#   include 
--#   include 
--#   include 
-+#   include 
-+#   include 
-+#   include 
- #else
- // OpenEXR 2.x lacks the Cuda decorators we need, so we replicated some
- // Imath files in OSL/Imathx, adding the decorations needed for them to
-diff --git a/src/liboslquery/py_osl.h b/src/liboslquery/py_osl.h
-index ee8284f..4988b44 100644
 a/src/liboslquery/py_osl.h
-+++ b/src/liboslquery/py_osl.h
-@@ -26,7 +26,7 @@
- #include 
- 
- #if OSL_USING_IMATH >= 3
--#include 
-+#include 
- #else
- #include 
- #endif
-diff --git a/src/include/OSL/Imathx/ImathColor.h 
b/src/include/OSL/Imathx/ImathColor.h
-index d0b035f..1cbb28f 100644
 a/src/include/OSL/Imathx/ImathColor.h
-+++ b/src/include/OSL/Imathx/ImathColor.h
-@@ -44,7 +44,7 @@
- //
- 
- #include "ImathVec.h"
--#include 
-+#include 
- // #include "half.h"
- 
- #ifndef IMATH_HOSTDEVICE
-diff --git a/src/include/OSL/Imathx/ImathFun.h 
b/src/include/OSL/Imathx/ImathFun.h
-index 1413c48..576b588 100644
 a/src/include/OSL/Imathx/ImathFun.h
-+++ b/src/include/OSL/Imathx/ImathFun.h
-@@ -43,10 +43,10 @@
- //
- 
//-
- 
--#include 
-+#include 
- #include "ImathLimits.h"
--#include 
--#include 
-+#include 
-+#include 
- 
- IMATH_INTERNAL_NAMESPACE_HEADER_ENTER
- 
-diff --git a/src/include/OSL/Imathx/ImathLimits.h 
b/src/include/OSL/Imathx/ImathLimits.h
-index 09fa419..ed19eaa 100644
 a/src/include/OSL/Imathx/ImathLimits.h
-+++ b/src/include/OSL/Imathx/ImathLimits.h
-@@ -43,7 +43,7 @@
- //
- //
- 
--#include 
-+#include 
- #include 
- #include 
- 
-diff --git a/src/include/OSL/Imathx/ImathMatrix.h 
b/src/include/OSL/Imathx/ImathMatrix.h
-index 65f386b..f2b10cc 100644
 a/src/include/OSL/Imathx/ImathMatrix.h
-+++ b/src/include/OSL/Imathx/ImathMatrix.h
-@@ -43,12 +43,12 @@
- //
- //
- 
--#include 
-+#include 
- #include "ImathFun.h"
--#include 
-+#include 
- #include "ImathVec.h"
--#include 
--#include 
-+#include 
-+#include 
- 
- #include 
- #include 
-diff --git a/src/include/OSL/Imathx/ImathVec.h 
b/src/include/OSL/Imathx/ImathVec.h
-index e52af61..4cd696b 100644
 a/src/include/OSL/Imathx/ImathVec.h
-+++ b/src/include/OSL/Imathx/ImathVec.h
-@@ -43,10 +43,10 @@
- //
- //
- 
--#include 
-+#include 
- #include "ImathLimits.h"
--#include 
--#include 
-+#include 
-+#include 
- 
- #include 
- #include 
-diff --git a/src/liboslexec/shadingsys.cpp b/src/liboslexec/shadingsys.cpp
-index 1d36ff1..6fc9d38 100644
 a/src/liboslexec/shadingsys.cpp
-+++ b/src/liboslexec/shadingsys.cpp
-@@ -27,7 +27,7 @@
- using namespace OSL;
- using namespace OSL::pvt;
- 
--#include   // Just for OPENEXR_VERSION_STRING
-+#include   // Just for OPENEXR_VERSION_STRING
- 
- // avoid naming conflicts with MSVC macros
- #ifdef _MSC_VER

diff --git a/media-libs/osl/files/osl-1.12.4.1-openexr-3-imath.patch 
b/media-libs/osl/files/osl-1.12.4.1-openexr-3-imath.patch
deleted file mode 100644
index ffee5d8a543d..
--- a/media-libs/osl/files/osl-1.12.4.1-openexr-3-imath.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff --git a/src/include/OSL/oslconfig.h.in b/src/include/OSL/oslconfig.h.in
-index 29abe88..b9de57c 100644
 a/src/include/OSL/oslconfig.h.in
-+++ b/src/include/OSL/oslconfig.h.in
-@@ -12,9 +12,9 @@
- // All the things we need from Imath.
- #define OSL_USING_IMATH @OSL_USING_IMATH@

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

2022-02-13 Thread Sam James

commit: d937ca78168d1a272458883282c5d39799c53ba2
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 14 02:06:34 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 14 02:07:30 2022 +
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  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..
--- 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:=
-

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

2022-02-13 Thread Sam James

commit: 55b7e5e507861ea760e758983b8b1906ed7336df
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 14 02:07:01 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 14 02:07:33 2022 +
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  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..
--- 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:=
-   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:=
-

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

2022-02-11 Thread Sam James

commit: 177d9b9ffb35e21ac4923682402d797174694e2d
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 12 04:42:39 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 12 04:42:39 2022 +
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  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.12.0:=

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

2022-02-11 Thread Sam James

commit: 2fc41152ac338bc847b0878ab276d3512ebf346f
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 12 03:45:23 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 12 03:55:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fc41152

media-libs/osl: add 1.12.4.1

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

 media-libs/osl/Manifest|   1 +
 .../osl/files/osl-1.12.4.1-openexr-3-imath.patch   | 126 +
 media-libs/osl/osl-1.12.4.1.ebuild | 103 +
 3 files changed, 230 insertions(+)

diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 1c6d13087eb8..f3343cf6bdd1 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,3 +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.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/files/osl-1.12.4.1-openexr-3-imath.patch 
b/media-libs/osl/files/osl-1.12.4.1-openexr-3-imath.patch
new file mode 100644
index ..ffee5d8a543d
--- /dev/null
+++ b/media-libs/osl/files/osl-1.12.4.1-openexr-3-imath.patch
@@ -0,0 +1,126 @@
+diff --git a/src/include/OSL/oslconfig.h.in b/src/include/OSL/oslconfig.h.in
+index 29abe88..b9de57c 100644
+--- a/src/include/OSL/oslconfig.h.in
 b/src/include/OSL/oslconfig.h.in
+@@ -12,9 +12,9 @@
+ // All the things we need from Imath.
+ #define OSL_USING_IMATH @OSL_USING_IMATH@
+ #if OSL_USING_IMATH >= 3
+-#   include 
+-#   include 
+-#   include 
++#   include 
++#   include 
++#   include 
+ #else
+ // OpenEXR 2.x lacks the Cuda decorators we need, so we replicated some
+ // Imath files in OSL/Imathx, adding the decorations needed for them to
+diff --git a/src/include/OSL/Imathx/ImathColor.h 
b/src/include/OSL/Imathx/ImathColor.h
+index d0b035f..1cbb28f 100644
+--- a/src/include/OSL/Imathx/ImathColor.h
 b/src/include/OSL/Imathx/ImathColor.h
+@@ -44,7 +44,7 @@
+ //
+ 
+ #include "ImathVec.h"
+-#include 
++#include 
+ // #include "half.h"
+ 
+ #ifndef IMATH_HOSTDEVICE
+diff --git a/src/include/OSL/Imathx/ImathFun.h 
b/src/include/OSL/Imathx/ImathFun.h
+index 1413c48..576b588 100644
+--- a/src/include/OSL/Imathx/ImathFun.h
 b/src/include/OSL/Imathx/ImathFun.h
+@@ -43,10 +43,10 @@
+ //
+ 
//-
+ 
+-#include 
++#include 
+ #include "ImathLimits.h"
+-#include 
+-#include 
++#include 
++#include 
+ 
+ IMATH_INTERNAL_NAMESPACE_HEADER_ENTER
+ 
+diff --git a/src/include/OSL/Imathx/ImathLimits.h 
b/src/include/OSL/Imathx/ImathLimits.h
+index 09fa419..ed19eaa 100644
+--- a/src/include/OSL/Imathx/ImathLimits.h
 b/src/include/OSL/Imathx/ImathLimits.h
+@@ -43,7 +43,7 @@
+ //
+ //
+ 
+-#include 
++#include 
+ #include 
+ #include 
+ 
+diff --git a/src/include/OSL/Imathx/ImathMatrix.h 
b/src/include/OSL/Imathx/ImathMatrix.h
+index a4063dd..678f970 100644
+--- a/src/include/OSL/Imathx/ImathMatrix.h
 b/src/include/OSL/Imathx/ImathMatrix.h
+@@ -43,12 +43,12 @@
+ //
+ //
+ 
+-#include 
++#include 
+ #include "ImathFun.h"
+-#include 
++#include 
+ #include "ImathVec.h"
+-#include 
+-#include 
++#include 
++#include 
+ 
+ #include 
+ #include 
+diff --git a/src/include/OSL/Imathx/ImathVec.h 
b/src/include/OSL/Imathx/ImathVec.h
+index e52af61..4cd696b 100644
+--- a/src/include/OSL/Imathx/ImathVec.h
 b/src/include/OSL/Imathx/ImathVec.h
+@@ -43,10 +43,10 @@
+ //
+ //
+ 
+-#include 
++#include 
+ #include "ImathLimits.h"
+-#include 
+-#include 
++#include 
++#include 
+ 
+ #include 
+ #include 
+diff --git

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

2022-02-11 Thread Sam James

commit: e9ffcaa3e6e45bafa379b3fae35ab9fbf087f6e9
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 12 03:35:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 12 03:55:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9ffcaa3

media-libs/osl: drop 1.12.0.2

Signed-off-by: Sam James  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..
--- 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
-}

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

2022-02-11 Thread Sam James

commit: 7883e603e80dde477736b5ccc16db0eea2f9655c
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 12 02:34:25 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 12 03:55:33 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7883e603

media-libs/osl: flip over to OpenEXR 3

Things are getting complicated with trying to keep Blender
on OpenEXR 2. Blender needs to switch as a result, but
so do its dependencies.

Bug: https://bugs.gentoo.org/831357
Bug: https://bugs.gentoo.org/832862
Bug: https://bugs.gentoo.org/831425
Signed-off-by: Sam James  gentoo.org>

 .../osl/files/osl-1.11.16.0-openexr-3-imath.patch  | 126 +
 media-libs/osl/osl-1.11.16.0-r3.ebuild | 113 ++
 2 files changed, 239 insertions(+)

diff --git a/media-libs/osl/files/osl-1.11.16.0-openexr-3-imath.patch 
b/media-libs/osl/files/osl-1.11.16.0-openexr-3-imath.patch
new file mode 100644
index ..10bb23fffa0e
--- /dev/null
+++ b/media-libs/osl/files/osl-1.11.16.0-openexr-3-imath.patch
@@ -0,0 +1,126 @@
+diff --git a/src/include/OSL/oslconfig.h.in b/src/include/OSL/oslconfig.h.in
+index f735b0f..8063f68 100644
+--- a/src/include/OSL/oslconfig.h.in
 b/src/include/OSL/oslconfig.h.in
+@@ -13,9 +13,9 @@
+ // All the things we need from Imath.
+ #define OSL_USING_IMATH @OSL_USING_IMATH@
+ #if OSL_USING_IMATH >= 3
+-#   include 
+-#   include 
+-#   include 
++#   include 
++#   include 
++#   include 
+ #else
+ // OpenEXR 2.x lacks the Cuda decorators we need, so we replicated some
+ // Imath files in OSL/Imathx, adding the decorations needed for them to
+diff --git a/src/liboslquery/py_osl.h b/src/liboslquery/py_osl.h
+index ee8284f..4988b44 100644
+--- a/src/liboslquery/py_osl.h
 b/src/liboslquery/py_osl.h
+@@ -26,7 +26,7 @@
+ #include 
+ 
+ #if OSL_USING_IMATH >= 3
+-#include 
++#include 
+ #else
+ #include 
+ #endif
+diff --git a/src/include/OSL/Imathx/ImathColor.h 
b/src/include/OSL/Imathx/ImathColor.h
+index d0b035f..1cbb28f 100644
+--- a/src/include/OSL/Imathx/ImathColor.h
 b/src/include/OSL/Imathx/ImathColor.h
+@@ -44,7 +44,7 @@
+ //
+ 
+ #include "ImathVec.h"
+-#include 
++#include 
+ // #include "half.h"
+ 
+ #ifndef IMATH_HOSTDEVICE
+diff --git a/src/include/OSL/Imathx/ImathFun.h 
b/src/include/OSL/Imathx/ImathFun.h
+index 1413c48..576b588 100644
+--- a/src/include/OSL/Imathx/ImathFun.h
 b/src/include/OSL/Imathx/ImathFun.h
+@@ -43,10 +43,10 @@
+ //
+ 
//-
+ 
+-#include 
++#include 
+ #include "ImathLimits.h"
+-#include 
+-#include 
++#include 
++#include 
+ 
+ IMATH_INTERNAL_NAMESPACE_HEADER_ENTER
+ 
+diff --git a/src/include/OSL/Imathx/ImathLimits.h 
b/src/include/OSL/Imathx/ImathLimits.h
+index 09fa419..ed19eaa 100644
+--- a/src/include/OSL/Imathx/ImathLimits.h
 b/src/include/OSL/Imathx/ImathLimits.h
+@@ -43,7 +43,7 @@
+ //
+ //
+ 
+-#include 
++#include 
+ #include 
+ #include 
+ 
+diff --git a/src/include/OSL/Imathx/ImathMatrix.h 
b/src/include/OSL/Imathx/ImathMatrix.h
+index 65f386b..f2b10cc 100644
+--- a/src/include/OSL/Imathx/ImathMatrix.h
 b/src/include/OSL/Imathx/ImathMatrix.h
+@@ -43,12 +43,12 @@
+ //
+ //
+ 
+-#include 
++#include 
+ #include "ImathFun.h"
+-#include 
++#include 
+ #include "ImathVec.h"
+-#include 
+-#include 
++#include 
++#include 
+ 
+ #include 
+ #include 
+diff --git a/src/include/OSL/Imathx/ImathVec.h 
b/src/include/OSL/Imathx/ImathVec.h
+index e52af61..4cd696b 100644
+--- a/src/include/OSL/Imathx/ImathVec.h
 b/src/include/OSL/Imathx/ImathVec.h
+@@ -43,10 +43,10 @@
+ //
+ //
+ 
+-#include 
++#include 
+ #include "ImathLimits.h"
+-#include 
+-#include 
++#include 
++#include 
+ 
+ #include 
+ #include 
+diff --git a/src/liboslexec/shadingsys.cpp b/src/liboslexec/shadingsys.cpp
+index 1d36ff1..6fc9d38 100644
+--- a/src/liboslexec/shadingsys.cpp
 b/src/liboslexec/shadingsys.cpp
+@@ -27,7 +27,7 @@
+ using namespace OSL;
+ using namespace OSL::pvt;
+ 
+-#include   // Just for OPENEXR_VERSION_STRING
++#include   // Just for OPENEXR_VERSION_STRING
+ 
+ // avoid naming conflicts with MSVC macros
+ #ifdef _MSC_VER

diff --git a/media-libs/osl/osl-1.11.16.0-r3.ebuild 
b/media-libs/osl/osl-1.11.16.0-r3.ebuild
new file mode 100644
index ..58e331049861
--- /dev/null
+++ b/media-libs/osl/osl-1.11.16.0-r3.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

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

2022-02-11 Thread Sam James

commit: a777fb693192e9ebdad9635e9270c33e2adbe892
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 12 03:35:17 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 12 03:55:34 2022 +
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  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

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

2022-02-11 Thread Sam James

commit: 8e668cea9c3af527b7d00f77558f6b244d7ab7ad
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 12 03:47:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 12 03:55:37 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e668cea

media-libs/osl: add 1.11.17.0

Signed-off-by: Sam James  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 ..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:=
+

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

2021-12-01 Thread Sam James

commit: 4a75e3cc1b8326d387b156282e4f9635b4a97197
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  2 04:54:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  2 04:54:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a75e3cc

media-libs/osl: try again to force ilmbase

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

 media-libs/osl/files/osl-1.11.16.0-no-imath.patch | 49 +++
 media-libs/osl/osl-1.11.16.0-r2.ebuild|  7 ++--
 2 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/media-libs/osl/files/osl-1.11.16.0-no-imath.patch 
b/media-libs/osl/files/osl-1.11.16.0-no-imath.patch
new file mode 100644
index ..a8e5c1f23116
--- /dev/null
+++ b/media-libs/osl/files/osl-1.11.16.0-no-imath.patch
@@ -0,0 +1,49 @@
+Force finding OpenEXR / IlmBase instead of imath for now.
+--- a/src/cmake/modules/FindOpenEXR.cmake
 b/src/cmake/modules/FindOpenEXR.cmake
+@@ -39,43 +39,10 @@
+ #
+ 
+ # First, try to fine just the right config files
+-find_package(Imath CONFIG)
+-if (NOT TARGET Imath::Imath)
+-# Couldn't find Imath::Imath, maybe it's older and has IlmBase?
+-find_package(IlmBase CONFIG)
+-endif ()
++find_package(IlmBase CONFIG)
+ find_package(OpenEXR CONFIG)
+ 
+-if (TARGET OpenEXR::OpenEXR AND TARGET Imath::Imath)
+-# OpenEXR 3.x if both of these targets are found
+-set (FOUND_OPENEXR_WITH_CONFIG 1)
+-if (NOT OpenEXR_FIND_QUIETLY)
+-message (STATUS "Found CONFIG for OpenEXR 3 
(OPENEXR_VERSION=${OpenEXR_VERSION})")
+-endif ()
+-
+-# Mimic old style variables
+-set (OPENEXR_VERSION ${OpenEXR_VERSION})
+-get_target_property(IMATH_INCLUDES Imath::Imath 
INTERFACE_INCLUDE_DIRECTORIES)
+-get_target_property(ILMBASE_INCLUDES Imath::Imath 
INTERFACE_INCLUDE_DIRECTORIES)
+-get_target_property(ILMBASE_IMATH_LIBRARY Imath::Imath 
INTERFACE_LINK_LIBRARIES)
+-get_target_property(IMATH_LIBRARY Imath::Imath INTERFACE_LINK_LIBRARIES)
+-get_target_property(OPENEXR_IEX_LIBRARY OpenEXR::Iex 
INTERFACE_LINK_LIBRARIES)
+-get_target_property(OPENEXR_ILMTHREAD_LIBRARY OpenEXR::IlmThread 
INTERFACE_LINK_LIBRARIES)
+-set (ILMBASE_LIBRARIES ${ILMBASE_IMATH_LIBRARY})
+-set (ILMBASE_FOUND true)
+-
+-get_target_property(OPENEXR_INCLUDES OpenEXR::OpenEXR 
INTERFACE_INCLUDE_DIRECTORIES)
+-get_target_property(OPENEXR_ILMIMF_LIBRARY OpenEXR::OpenEXR 
INTERFACE_LINK_LIBRARIES)
+-set (OPENEXR_LIBRARIES ${OPENEXR_ILMIMF_LIBRARY} ${OPENEXR_IEX_LIBRARY} 
${OPENEXR_ILMTHREAD_LIBRARY} ${ILMBASE_LIBRARIES})
+-set (OPENEXR_FOUND true)
+-
+-# Link with pthreads if required
+-find_package (Threads)
+-if (CMAKE_USE_PTHREADS_INIT)
+-list (APPEND ILMBASE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
+-endif ()
+-
+-elseif (TARGET OpenEXR::IlmImf AND TARGET IlmBase::Imath AND
++if (TARGET OpenEXR::IlmImf AND TARGET IlmBase::Imath AND
+ (OPENEXR_VERSION VERSION_GREATER_EQUAL 2.4 OR OpenEXR_VERSION 
VERSION_GREATER_EQUAL 2.4))
+ # OpenEXR 2.4 or 2.5 with exported config
+ set (FOUND_OPENEXR_WITH_CONFIG 1)

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 ceada4f92ae6..3dd9f84f2cf7 100644
--- a/media-libs/osl/osl-1.11.16.0-r2.ebuild
+++ b/media-libs/osl/osl-1.11.16.0-r2.ebuild
@@ -63,6 +63,10 @@ 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}"
 }
@@ -85,9 +89,6 @@ 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}"

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

2021-12-01 Thread Sam James

commit: bc6e096f405b997ca1d3b2fcbc9e8e68b19b8980
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  2 03:52:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  2 03:53:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc6e096f

media-libs/osl: pin to openexr:0

Signed-off-by: Sam James  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:=

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

2021-12-01 Thread Sam James

commit: 96ffde43f96fb831a4477f71bb7bb7fa84b0b0f2
Author: Sam James  gentoo  org>
AuthorDate: Thu Dec  2 03:49:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Dec  2 03:49:34 2021 +
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  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:=

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

2021-12-01 Thread Sam James

commit: 4b89d007ec8f092429d9c69fa7a1de89b29525c0
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec  1 19:35:13 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  1 19:35:37 2021 +
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  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

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

2021-12-01 Thread Sam James

commit: ecee0ed7ac882147acef761205edbfc9215d77b6
Author: Sam James  gentoo  org>
AuthorDate: Wed Dec  1 17:03:11 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Dec  1 17:03:11 2021 +
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  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=(

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

2021-11-08 Thread Michał Górny

commit: a3e65f827aabdfbba225946787f045621fca394b
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Nov  8 10:58:28 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Nov  8 11:25:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3e65f82

media-libs/osl: Remove versions requiring LLVM 10

Signed-off-by: Michał Górny  gentoo.org>

 media-libs/osl/Manifest|   2 -
 .../osl/files/osl-1.10.5-fix-install-shaders.patch |  35 ---
 media-libs/osl/osl-1.10.13.ebuild  |  87 -
 media-libs/osl/osl-1.11.9.0-r1.ebuild  | 106 -
 media-libs/osl/osl-1.11.9.0.ebuild |  94 --
 5 files changed, 324 deletions(-)

diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 3643c48076f..1c6d13087eb 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,5 +1,3 @@
-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/files/osl-1.10.5-fix-install-shaders.patch 
b/media-libs/osl/files/osl-1.10.5-fix-install-shaders.patch
deleted file mode 100644
index 8e45efd96ab..000
--- a/media-libs/osl/files/osl-1.10.5-fix-install-shaders.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 296ee89fcdec8ff6e514a3aebf5cb6c177f7f0c1 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Mon, 10 Jun 2019 13:02:14 +0200
-Subject: [PATCH] fix install location of shaders (Gentoo specific)
-
-Signed-off-by: Bernd Waibel 

- src/shaders/CMakeLists.txt   | 2 +-
- src/shaders/MaterialX/CMakeLists.txt | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/shaders/CMakeLists.txt b/src/shaders/CMakeLists.txt
-index 9b263ff..5c47918 100644
 a/src/shaders/CMakeLists.txt
-+++ b/src/shaders/CMakeLists.txt
-@@ -63,4 +63,4 @@ add_custom_target (shaders ALL
-SOURCES ${shader_source} ${shader_headers})
- 
- install (FILES ${shader_headers} ${shader_source} ${shader_objs}
--DESTINATION shaders)
-+DESTINATION include/OSL/shaders)
-diff --git a/src/shaders/MaterialX/CMakeLists.txt 
b/src/shaders/MaterialX/CMakeLists.txt
-index 88b52f3..f0e0a23 100644
 a/src/shaders/MaterialX/CMakeLists.txt
-+++ b/src/shaders/MaterialX/CMakeLists.txt
-@@ -258,5 +258,5 @@ add_custom_target (mxshaders ALL
-SOURCES ${shader_source} ${mx_shader_headers})
- 
- install (FILES ${mx_shader_headers} ${mx_shader_objs} ${mx_shader_osls}
-- DESTINATION shaders/MaterialX)
-+ DESTINATION include/OSL/shaders/MaterialX)
- 
--- 
-2.21.0
-

diff --git a/media-libs/osl/osl-1.10.13.ebuild 
b/media-libs/osl/osl-1.10.13.ebuild
deleted file mode 100644
index 57d75feb4aa..000
--- a/media-libs/osl/osl-1.10.13.ebuild
+++ /dev/null
@@ -1,87 +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=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

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

2021-11-02 Thread Sam James

commit: 228ca6f3edc218317f22a8c65b13cc6366726525
Author: Sam James  gentoo  org>
AuthorDate: Tue Nov  2 20:28:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov  2 20:28:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=228ca6f3

media-libs/osl: add 1.11.16.0

Signed-off-by: Sam James  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 000..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:=
+

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

2021-11-02 Thread Sam James

commit: c5806771f57b92a5736d6525301403771c9e1132
Author: Sam James  gentoo  org>
AuthorDate: Tue Nov  2 20:14:32 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Nov  2 20:15:04 2021 +
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  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:=
+

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

2021-10-03 Thread Sam James

commit: 1eda236a9d434df2cadf8b091be91c9cd421893b
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct  4 00:21:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct  4 00:21:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1eda236a

media-libs/osl: fix MisplacedEclassVar again

Signed-off-by: Sam James  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"

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

2021-10-03 Thread Sam James

commit: b8f26837493d36eee145c656abfabf3d99581c19
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct  4 00:11:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct  4 00:11:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f26837

media-libs/osl: fix MisplacedEclassVar

Signed-off-by: Sam James  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"

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

2021-10-03 Thread Sam James

commit: e2f3431518e4bf310d623077877f3d9b6c605cdd
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct  4 00:08:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct  4 00:08:28 2021 +
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  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

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

2021-09-18 Thread Sam James

commit: a11d1c3b5d9364b7b3a870d19fa34cb0a4499028
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 19 05:23:19 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 19 05:23:19 2021 +
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  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

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

2021-09-18 Thread Sam James

commit: a4d45643e7cc8d701b4a089a49489da9283a2fa4
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 19 05:16:52 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 19 05:20:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4d45643

media-libs/osl: add 1.11.15.0

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

 media-libs/osl/Manifest|   1 +
 media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch |  24 +
 media-libs/osl/osl-1.11.15.0.ebuild| 108 +
 3 files changed, 133 insertions(+)

diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index d880f7d1d0f..a23760d3674 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,3 +1,4 @@
 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.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/files/osl-1.11.15.0-fix-cmake.patch 
b/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch
new file mode 100644
index 000..020370d54bc
--- /dev/null
+++ b/media-libs/osl/files/osl-1.11.15.0-fix-cmake.patch
@@ -0,0 +1,24 @@
+https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/commit/14bd942f1bbb621c729f01c982925acd6d263d58.patch
+
+From: debaetsd 
+Date: Tue, 29 Dec 2020 22:01:21 +0100
+Subject: [PATCH] fixed cmake setup when tests are disabled (#1319)
+
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -252,11 +252,9 @@ install (EXPORT OSL_EXPORTED_TARGETS
+ FILE ${OSL_TARGETS_EXPORT_NAME}
+ NAMESPACE ${PROJECT_NAME}::)
+ 
+-
+-
+-
+-osl_add_all_tests()
+-
++if (${PROJECT_NAME}_BUILD_TESTS AND NOT ${PROJECT_NAME}_IS_SUBPROJECT)
++  osl_add_all_tests()
++endif ()
+ 
+ if (NOT ${PROJECT_NAME}_IS_SUBPROJECT)
+ include (packaging)
+

diff --git a/media-libs/osl/osl-1.11.15.0.ebuild 
b/media-libs/osl/osl-1.11.15.0.ebuild
new file mode 100644
index 000..612465934cb
--- /dev/null
+++ b/media-libs/osl/osl-1.11.15.0.ebuild
@@ -0,0 +1,108 @@
+# 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 
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:=
+

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

2021-09-18 Thread Sam James

commit: 2e6aff0061e5cd9531e7489647958ecc6ca8bb5a
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 19 05:19:22 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 19 05:20:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e6aff00

media-libs/osl: fix MisplacedEclassVar

Signed-off-by: Sam James  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"

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

2021-09-18 Thread Sam James

commit: 67c51d91eb835704c73e7e48c2cf08f8c4c26911
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 19 05:11:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 19 05:20:23 2021 +
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  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 000..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:=
+   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:=
+

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

2021-09-18 Thread Sam James

commit: fa9a4efe37206ad099ca8f0ae0140ad29541fb72
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 19 03:29:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 19 03:29:16 2021 +
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  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

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

2021-09-18 Thread Sam James

commit: 99dfafe2c16183644730233e34bc7038e677a25b
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 19 03:08:04 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 19 03:08:04 2021 +
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  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

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

2021-09-18 Thread Sam James

commit: 7f04236b86ba9bcf2de6f76f1585448192f0e752
Author: Sam James  gentoo  org>
AuthorDate: Sun Sep 19 03:08:16 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Sep 19 03:08:16 2021 +
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  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

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

2021-06-09 Thread Sam James

commit: 7da3d02dd4d346906f0bdf7cd0df04f542706bb8
Author: Sebastian Parborg  gmail  com>
AuthorDate: Tue Apr 27 23:42:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun 10 00:19:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7da3d02d

media-libs/osl: bump to 1.12.0.2

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

 media-libs/osl/Manifest |   1 +
 media-libs/osl/files/osl-1.12.0.2-llvm-11.patch |  29 +++
 media-libs/osl/files/osl-1.12.0.2-llvm-12.patch | 240 
 media-libs/osl/osl-1.12.0.2.ebuild  |  88 +
 4 files changed, 358 insertions(+)

diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index db1eb09c70c..d880f7d1d0f 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,2 +1,3 @@
 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
+DIST osl-1.12.0.2.tar.gz 16205315 BLAKE2B 
543d120e981f093c121b4abb4c36d7d8c127555c8986df931a3040136e3ae3d84d602d73395604cd492f8d192e408f585cd6579fe6283c974778f0b99092985d
 SHA512 
cdcd1fb348f6f2f1f889ed1895bac545e10b73e700959bc09b1df2a40cd86e69ba43a1dfaf26dedaec9c23aa17b74428d4bccc9cf7f4d27ae2fc5152adb6c010

diff --git a/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch 
b/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch
new file mode 100644
index 000..a47bcd4e47d
--- /dev/null
+++ b/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch
@@ -0,0 +1,29 @@
+From 84c26c0baab8f071270d0fef23175c24d738c73c Mon Sep 17 00:00:00 2001
+From: Brecht Van Lommel 
+Date: Mon, 19 Apr 2021 13:49:22 +0200
+Subject: [PATCH] Fix crash generating closure functions calls with LLVM 11
+
+Generating code for prepare_closure and gen_closure was crashing.
+The code now matches the implementation of the removed LLVM function.
+
+Signed-off-by: Brecht Van Lommel 
+---
+ src/liboslexec/llvm_util.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
+index 445f64000..3d468de27 100644
+--- a/src/liboslexec/llvm_util.cpp
 b/src/liboslexec/llvm_util.cpp
+@@ -3430,8 +3430,9 @@ LLVM_Util::call_function (llvm::Value *func, 
cspan args)
+ #endif
+ //llvm_gen_debug_printf (std::string("start ") + std::string(name));
+ #if OSL_LLVM_VERSION >= 110
+-OSL_DASSERT(llvm::isa(func));
+-llvm::Value *r = builder().CreateCall(llvm::cast(func), 
llvm::ArrayRef(args.data(), args.size()));
++llvm::Value* r = builder().CreateCall(
++
llvm::cast(func->getType()->getPointerElementType()), func,
++llvm::ArrayRef(args.data(), args.size()));
+ #else
+ llvm::Value *r = builder().CreateCall (func, llvm::ArrayRef(args.data(), args.size()));
+ #endif

diff --git a/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch 
b/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch
new file mode 100644
index 000..dcf9ac863f7
--- /dev/null
+++ b/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch
@@ -0,0 +1,240 @@
+commit f76ea6220a5f0d59f5f43d3d6d526f1fd09b90f7
+Author: Euan Haahr 
+Date:   Fri Feb 5 22:51:14 2021 +
+
+Various fixes for LLVM 12 compatibility (1351)
+
+Removed use of options.PrintMachineCode since this has been removed as
+of llvm 12. Converted uses of DebugLoc::get to DILocation::get since
+it has been deprecated and removed as of llvm 12.
+
+PrintMachine code will only be used if llvm is lower than version 12.
+TODO: Needs to be re-added in the new way for LLVM12. (LG just doesn't
+have time to figure this out right now.)
+
+Pass adjustment as various things have been deprecated or changed
+names. (LG)
+
+Signed-off-by: Euan Haahr 
+Signed-off-by: Larry Gritz 
+
+diff --git a/src/liboslexec/llvm_passes.h b/src/liboslexec/llvm_passes.h
+index 4ec3489c..7c14fc76 100644
+--- a/src/liboslexec/llvm_passes.h
 b/src/liboslexec/llvm_passes.h
+@@ -73,9 +73,14 @@ public:
+ // 16 bit and 32 bit native mask representation to be passed as a
+ // livein.
+ m_native_mask_type = llvm::FixedVectorType::get(llvm_type_int32, 
WidthT);
++#  if OSL_LLVM_VERSION >= 112
++m_wide_zero_initializer = llvm::ConstantDataVector::getSplat(WidthT,
++llvm::ConstantInt::get(M.getContext(), llvm::APInt(32,0)));
++#  else
+ m_wide_zero_initializer =

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

2021-03-05 Thread Sam James

commit: 3314ae26b35c5519ab08da1ee6859cc14bd97587
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar  5 18:38:48 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar  5 18:38:48 2021 +
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  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

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

2021-02-21 Thread Sam James

commit: dd0ae549dec56c651996f458dc60a5d5027945c4
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 22 07:12:33 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 22 07:12:33 2021 +
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  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

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

2020-12-10 Thread Joonas Niilola

commit: 40e5c615573535fd9685875d19a3ce10f27bc5ed
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Dec 11 07:56:30 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Dec 11 07:58:11 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40e5c615

media-libs/osl: remove old 1.10.10

Signed-off-by: Joonas Niilola  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..000
--- 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:=
-

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

2020-12-10 Thread Joonas Niilola

commit: 206b84cc385c0f2a6d09102d8a862f637808bde4
Author: Joonas Niilola  gentoo  org>
AuthorDate: Fri Dec 11 07:56:03 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Fri Dec 11 07:58:11 2020 +
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  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

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

2020-12-01 Thread Joonas Niilola

commit: beb901a124bd4b8b9c85e074ef3f607c81004c55
Author: Adrian Grigo  yahoo  com  au>
AuthorDate: Thu Nov 26 23:09:30 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Dec  1 11:22:04 2020 +
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  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  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 000..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:=
+

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

2020-12-01 Thread Joonas Niilola

commit: cf4b1ff64f961b0fd360e4f74351fa3325081890
Author: Adrian Grigo  yahoo  com  au>
AuthorDate: Fri Nov 27 00:27:24 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Tue Dec  1 11:22:09 2020 +
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  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  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 000..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:=
+

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

2020-07-30 Thread Michał Górny

commit: 119c07b35e1c47c67cff033ffcf2ce30dfca0662
Author: Michał Górny  gentoo  org>
AuthorDate: Wed Jul 29 11:44:37 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Jul 30 22:09:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=119c07b3

media-libs/osl: Remove old (LLVM 8)

Signed-off-by: Michał Górny  gentoo.org>

 media-libs/osl/Manifest|  1 -
 5-upstream-patch-to-find-openexr-version.patch | 76 ---
 media-libs/osl/osl-1.10.5.ebuild   | 88 --
 3 files changed, 165 deletions(-)

diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 1ccafafa6ad..2001775196d 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,2 +1 @@
 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/files/osl-1.10.5-upstream-patch-to-find-openexr-version.patch 
b/media-libs/osl/files/osl-1.10.5-upstream-patch-to-find-openexr-version.patch
deleted file mode 100644
index cc270ff5281..000
--- 
a/media-libs/osl/files/osl-1.10.5-upstream-patch-to-find-openexr-version.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 9efdcfafcdfbb7666171b6016b725183a71fceb0 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Tue, 25 Jun 2019 19:44:14 +0200
-Subject: [PATCH] src/cmake/modules/FindOpenEXR.cmake: patch to find openexr
-
-This upstream patch (see
-https://github.com/imageworks/OpenShadingLanguage/pull/1022/files)
-uses pkg-config variables to get the correct versions for openexr
-on multilib installations.
-
-Signed-off-by: Bernd Waibel 

- src/cmake/modules/FindOpenEXR.cmake | 20 +++-
- 1 file changed, 15 insertions(+), 5 deletions(-)
-
-diff --git a/src/cmake/modules/FindOpenEXR.cmake 
b/src/cmake/modules/FindOpenEXR.cmake
-index 6c6b39c..4a9de4b 100644
 a/src/cmake/modules/FindOpenEXR.cmake
-+++ b/src/cmake/modules/FindOpenEXR.cmake
-@@ -25,8 +25,12 @@ endif ()
- # Attempt to find OpenEXR with pkgconfig
- find_package(PkgConfig)
- if (PKG_CONFIG_FOUND)
--pkg_check_modules(_ILMBASE QUIET IlmBase>=2.0.0)
--pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0)
-+if (NOT ILMBASE_ROOT_DIR)
-+pkg_check_modules(_ILMBASE QUIET QUIET IlmBase>=2.0.0)
-+endif()
-+if (NOT OPENEXR_ROOT_DIR)
-+pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0)
-+endif()
- endif (PKG_CONFIG_FOUND)
- 
- # List of likely places to find the headers -- note priority override of
-@@ -60,7 +64,11 @@ find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h
- find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h)
- 
- # Try to figure out version number
--if (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
-+if (DEFINED _OPENEXR_VERSION AND NOT "${_OPENEXR_VERSION}" STREQUAL "")
-+set (OPENEXR_VERSION "${_OPENEXR_VERSION}")
-+string (REGEX REPLACE "([0-9]+)\\.[0-9\\.]+" "\\1" OPENEXR_VERSION_MAJOR 
"${_OPENEXR_VERSION}")
-+string (REGEX REPLACE "[0-9]+\\.([0-9]+)(\\.[0-9]+)?" "\\1" 
OPENEXR_VERSION_MINOR "${_OPENEXR_VERSION}")
-+elseif (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
- # Must be at least 2.0
- file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX 
"^#define OPENEXR_VERSION_STRING .*$")
- string (REGEX MATCHALL "[0-9]+[.0-9]+" OPENEXR_VERSION ${TMP})
-@@ -93,6 +101,8 @@ set (GENERIC_LIBRARY_PATHS
- /opt/local/lib
- $ENV{PROGRAM_FILES}/OpenEXR/lib/static )
- 
-+# message (STATUS "Generic lib paths: ${GENERIC_LIBRARY_PATHS}")
-+
- # Handle request for static libs by altering CMAKE_FIND_LIBRARY_SUFFIXES.
- # We will restore it at the end of this file.
- set (_openexr_orig_suffixes ${CMAKE_FIND_LIBRARY_SUFFIXES})
-@@ -114,14 +124,14 @@ foreach (COMPONENT ${_openexr_components})
- # First try with the version embedded
- set (FULL_COMPONENT_NAME 
${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
- find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME}
--  PATHS ${OPENEXR_LIBRARY_DIR}
-+  PATHS ${OPENEXR_LIBRARY_DIR} $ENV{OPENEXR_LIBRARY_DIR}
- ${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH)
- # Again, with no directory restrictions
- find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME})
- # Try again without the version
- set (FULL_COMPONENT_NAME

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

2020-07-30 Thread Sam James

commit: dc1fdb8720716fc88037fbdcdf710635316594f4
Author: Sam James  gentoo  org>
AuthorDate: Thu Jul 30 22:03:42 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jul 30 22:03:53 2020 +
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  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

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

2020-06-10 Thread Michał Górny

commit: 5a3113bc81109fc80c75bdb711c25bcaaa161f46
Author: Adrian Grigo  yahoo  com  au>
AuthorDate: Tue May 12 01:24:28 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Wed Jun 10 07:31:51 2020 +
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  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  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 000..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:=
+

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

2020-03-22 Thread Andreas Sturmlechner

commit: 644803619331091d1288fb46d35d86eb25834ca8
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 22 18:22:02 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 22 18:24:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=64480361

media-libs/osl: Drop 1.8.12, 1.9.6 and 1.9.9

Closes: https://bugs.gentoo.org/98
Closes: https://bugs.gentoo.org/669508
Closes: https://bugs.gentoo.org/673440
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/osl/Manifest   |   3 -
 media-libs/osl/files/osl-1.8.12-cmake-fixes.patch | 332 --
 media-libs/osl/osl-1.8.12.ebuild  |  70 -
 media-libs/osl/osl-1.9.6.ebuild   |  69 -
 media-libs/osl/osl-1.9.9.ebuild   |  68 -
 5 files changed, 542 deletions(-)

diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index f0b2131df27..26e99aaa370 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,4 +1 @@
 DIST osl-1.10.5.tar.gz 13543151 BLAKE2B 
3c67834d9ab6d4d725ecde622c402707593b9aaf25f1e94f9ed6b004c28fa9b7b90cfd0d320cb2898f77f8883ac14a71310abaf63a5b06704565c5a3bdea09b4
 SHA512 
d704b623836edca4c3fe9c18f33b8d76f4625036228fc977732c600e23e16da4cb4bf311607019b251d734b63a184bde0f7726f144ecd5bcd7866938d95bfdff
-DIST osl-1.8.12.tar.gz 14572814 BLAKE2B 
edf742b104e723e1e3e56b2fb28b1cd4c81921b04a00b8c0f58cf174105a78881283837b550fb4a67d38f5f0a37327fac7a17310974895ed747e8813e6c8ad7b
 SHA512 
29bb0a23d9e1aa445e87b7080be056f939a1828fa87f001cc1503a8c76d21a5620c69146158d27800db71b1abee71a0c39804d85aea7b5899b0cb7ca1c617b56
-DIST osl-1.9.6.tar.gz 14765052 BLAKE2B 
c6c82d02d49d263361b5b3ba03fca8f35f16199d7d30bbeb50a6b2ee16efcb06c9ce515f749b38b2428365c27a23bf673e9be64d1453c7a49ab0f0d09002
 SHA512 
e2eb8487038795630bfb38cfb7a39f0cc6877f83689d1e00327b9d95c4b5270c263546a02dff1511272d1d2f429757e11fa28095f9d16cb170b777b531678961
-DIST osl-1.9.9.tar.gz 14771575 BLAKE2B 
ffbfa935c0d6568c9b35048d5b05965abc75775f4a4f56a434a331a45f4963b3e5cb74fb965748a5fb94cdd3a4201a4745ce564646cbbe535ca2646a734dc33c
 SHA512 
7f3a16bc654676f8e82bf87a2c33914997f1468772ad27bf284c848e9b02adddaf37cb6ef8bde16c81b9076247bca5463a1a5660023efd67d9ac20969ae99647

diff --git a/media-libs/osl/files/osl-1.8.12-cmake-fixes.patch 
b/media-libs/osl/files/osl-1.8.12-cmake-fixes.patch
deleted file mode 100644
index 6ad5d94ac93..000
--- a/media-libs/osl/files/osl-1.8.12-cmake-fixes.patch
+++ /dev/null
@@ -1,332 +0,0 @@
-From cb34603cce0a8814dc66f76ecc5ceeb04a8d3791 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs 
-Date: Fri, 18 Aug 2017 13:37:54 +0100
-Subject: [PATCH] OpenShadingLanguage/RB-1.8: Change to GNUInstallDirs for
- install paths
-
-The variables: BIN_INSTALL_DIR, LIB_INSTALL_DIR, INCLUDE_INSTALL_DIR,
-DOC_INSTALL_DIR, and MAN_INSTALL_DIR are defined but never used.
-Instead, hard coded paths to lib, include, and bin were used. This
-will cause difficulty on multi-lib systems or in cases where they
-are named differently. The existing variables were replaced by the
-GNUInstallDirs variables, which is compatible on all systems.
-
-The macro install_targets was defined, but never used in code,
-so all library installs were changed to use it.
-Thus all library installs now use GNUInstallDirs.
-
-INSTALL_DOCS variable is defined, so it's now controlling if
-the documentation is being installed.
-
-Signed-off by: Jonathan Scruggs 

- CMakeLists.txt | 66 +-
- src/cmake/util_macros.cmake|  6 ++--
- src/doc/CMakeLists.txt |  6 ++--
- src/include/CMakeLists.txt |  2 +-
- src/liboslcomp/CMakeLists.txt  |  2 +-
- src/liboslexec/CMakeLists.txt  |  2 +-
- src/liboslnoise/CMakeLists.txt |  2 +-
- src/liboslquery/CMakeLists.txt |  2 +-
- src/osl.imageio/CMakeLists.txt | 19 +---
- src/oslc/CMakeLists.txt|  2 +-
- src/oslinfo/CMakeLists.txt |  2 +-
- src/testrender/CMakeLists.txt  |  2 +-
- src/testshade/CMakeLists.txt   |  6 ++--
- 13 files changed, 32 insertions(+), 87 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 305047c0..da4635ab 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -248,6 +248,8 @@ set (OSL_BUILD_PLUGINS ON CACHE BOOL "Bool OSL plugins, 
for example OIIO plugin"
- set (USE_CCACHE ON CACHE BOOL "Use ccache if found")
- set (CODECOV OFF CACHE BOOL "Build code coverage tests")
- option (USE_BOOST_WAVE "Use Boost Wave for C preprocessor (alternative is to 
use clang)" OFF)
-+set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
-+set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
- 
- # Use ccache if found
- find_program (CCACHE_FOUND ccache)
-@@ -349,6 +351,14 @@ if (OSL_NAMESPACE)
- endif ()
- message(STATUS "Setting Namespace to: ${OSL_NAMESPACE}")
- 
-+include (GNUInstallDirs)
-+
-+message (STATUS

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

2020-03-22 Thread Mikle Kolyada

commit: a03b68d524c1e85dd3efa771ad80e5bc30257490
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sun Mar 22 18:01:45 2020 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sun Mar 22 18:01:45 2020 +
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  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

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

2020-03-22 Thread Andreas Sturmlechner

commit: 02144b8da2eb37cc3efdc1d48984d8ce41121975
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Mar 22 14:39:06 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Mar 22 14:40:47 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02144b8d

media-libs/osl: Restrict 1.10.5 to https://bugs.gentoo.org/704696
Package-Manager: Portage-2.3.94, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner  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:=
+

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

2019-07-15 Thread Michał Górny

commit: f818cd84057598a58ad19b708ef26233aca35459
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Jul 15 13:27:12 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Jul 15 13:36:34 2019 +
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  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.


-   
-   SIMD Optimization
-   
-   
-   SIMD Optimization
-   
Use media-libs/partio
Build the osltoy binary

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

2019-06-25 Thread Andreas Sturmlechner

commit: cae197b786f2108e0a98ad5857bde5ea95aa0d2f
Author: Bernd Waibel  gmail  com>
AuthorDate: Tue Jun 18 11:19:00 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 25 18:54:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cae197b7

media-libs/osl: bump to version 1.10.5

Use upstream provided patch to find openexr version.

Closes: https://bugs.gentoo.org/686480
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Bernd Waibel  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12074
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/osl/Manifest|  1 +
 .../osl/files/osl-1.10.5-fix-install-shaders.patch | 35 +
 5-upstream-patch-to-find-openexr-version.patch | 76 +++
 media-libs/osl/metadata.xml|  1 +
 media-libs/osl/osl-1.10.5.ebuild   | 88 ++
 5 files changed, 201 insertions(+)

diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index d618646e7f1..f0b2131df27 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,3 +1,4 @@
+DIST osl-1.10.5.tar.gz 13543151 BLAKE2B 
3c67834d9ab6d4d725ecde622c402707593b9aaf25f1e94f9ed6b004c28fa9b7b90cfd0d320cb2898f77f8883ac14a71310abaf63a5b06704565c5a3bdea09b4
 SHA512 
d704b623836edca4c3fe9c18f33b8d76f4625036228fc977732c600e23e16da4cb4bf311607019b251d734b63a184bde0f7726f144ecd5bcd7866938d95bfdff
 DIST osl-1.8.12.tar.gz 14572814 BLAKE2B 
edf742b104e723e1e3e56b2fb28b1cd4c81921b04a00b8c0f58cf174105a78881283837b550fb4a67d38f5f0a37327fac7a17310974895ed747e8813e6c8ad7b
 SHA512 
29bb0a23d9e1aa445e87b7080be056f939a1828fa87f001cc1503a8c76d21a5620c69146158d27800db71b1abee71a0c39804d85aea7b5899b0cb7ca1c617b56
 DIST osl-1.9.6.tar.gz 14765052 BLAKE2B 
c6c82d02d49d263361b5b3ba03fca8f35f16199d7d30bbeb50a6b2ee16efcb06c9ce515f749b38b2428365c27a23bf673e9be64d1453c7a49ab0f0d09002
 SHA512 
e2eb8487038795630bfb38cfb7a39f0cc6877f83689d1e00327b9d95c4b5270c263546a02dff1511272d1d2f429757e11fa28095f9d16cb170b777b531678961
 DIST osl-1.9.9.tar.gz 14771575 BLAKE2B 
ffbfa935c0d6568c9b35048d5b05965abc75775f4a4f56a434a331a45f4963b3e5cb74fb965748a5fb94cdd3a4201a4745ce564646cbbe535ca2646a734dc33c
 SHA512 
7f3a16bc654676f8e82bf87a2c33914997f1468772ad27bf284c848e9b02adddaf37cb6ef8bde16c81b9076247bca5463a1a5660023efd67d9ac20969ae99647

diff --git a/media-libs/osl/files/osl-1.10.5-fix-install-shaders.patch 
b/media-libs/osl/files/osl-1.10.5-fix-install-shaders.patch
new file mode 100644
index 000..8e45efd96ab
--- /dev/null
+++ b/media-libs/osl/files/osl-1.10.5-fix-install-shaders.patch
@@ -0,0 +1,35 @@
+From 296ee89fcdec8ff6e514a3aebf5cb6c177f7f0c1 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Mon, 10 Jun 2019 13:02:14 +0200
+Subject: [PATCH] fix install location of shaders (Gentoo specific)
+
+Signed-off-by: Bernd Waibel 
+---
+ src/shaders/CMakeLists.txt   | 2 +-
+ src/shaders/MaterialX/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/shaders/CMakeLists.txt b/src/shaders/CMakeLists.txt
+index 9b263ff..5c47918 100644
+--- a/src/shaders/CMakeLists.txt
 b/src/shaders/CMakeLists.txt
+@@ -63,4 +63,4 @@ add_custom_target (shaders ALL
+SOURCES ${shader_source} ${shader_headers})
+ 
+ install (FILES ${shader_headers} ${shader_source} ${shader_objs}
+-DESTINATION shaders)
++DESTINATION include/OSL/shaders)
+diff --git a/src/shaders/MaterialX/CMakeLists.txt 
b/src/shaders/MaterialX/CMakeLists.txt
+index 88b52f3..f0e0a23 100644
+--- a/src/shaders/MaterialX/CMakeLists.txt
 b/src/shaders/MaterialX/CMakeLists.txt
+@@ -258,5 +258,5 @@ add_custom_target (mxshaders ALL
+SOURCES ${shader_source} ${mx_shader_headers})
+ 
+ install (FILES ${mx_shader_headers} ${mx_shader_objs} ${mx_shader_osls}
+- DESTINATION shaders/MaterialX)
++ DESTINATION include/OSL/shaders/MaterialX)
+ 
+-- 
+2.21.0
+

diff --git 
a/media-libs/osl/files/osl-1.10.5-upstream-patch-to-find-openexr-version.patch 
b/media-libs/osl/files/osl-1.10.5-upstream-patch-to-find-openexr-version.patch
new file mode 100644
index 000..cc270ff5281
--- /dev/null
+++ 
b/media-libs/osl/files/osl-1.10.5-upstream-patch-to-find-openexr-version.patch
@@ -0,0 +1,76 @@
+From 9efdcfafcdfbb7666171b6016b725183a71fceb0 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Tue, 25 Jun 2019 19:44:14 +0200
+Subject: [PATCH] src/cmake/modules/FindOpenEXR.cmake: patch to find openexr
+
+This upstream patch (see
+https://github.com/imageworks/OpenShadingLanguage/pull/1022/files)
+uses pkg-config variables to get the correct versions for openexr
+on multilib installations.
+
+Signed-off-by: Bernd Waibel 
+---
+ src/cmake/modules/FindOpenEXR.cmake | 20 +++-
+ 1 file changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/src/cmake/modules/FindOpenEXR.cmake

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

2018-08-15 Thread Jonathan Scruggs

commit: 4e09fa2eb9d86ed0dfcd6391ff42efe5e71d34e0
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Wed Aug 15 17:41:10 2018 +
Commit: Jonathan Scruggs  gentoo  org>
CommitDate: Wed Aug 15 20:08:17 2018 +
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 
c6c82d02d49d263361b5b3ba03fca8f35f16199d7d30bbeb50a6b2ee16efcb06c9ce515f749b38b2428365c27a23bf673e9be64d1453c7a49ab0f0d09002
 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 000..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
+}

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

2018-03-30 Thread Aaron Bauman

commit: 581f39f5cb35fbae2c6ae6b11d5a3d56aedfe8c3
Author: Aaron Bauman  gentoo  org>
AuthorDate: Fri Mar 30 16:03:28 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Mar 30 16:04:13 2018 +
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_} )

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

2018-01-30 Thread Jonathan Scruggs

commit: 4947589313e37504f472f4d5414b4f0d4d3e7af0
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Mon Jan 29 15:16:35 2018 +
Commit: Jonathan Scruggs  gentoo  org>
CommitDate: Tue Jan 30 21:01:24 2018 +
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 
c6c82d02d49d263361b5b3ba03fca8f35f16199d7d30bbeb50a6b2ee16efcb06c9ce515f749b38b2428365c27a23bf673e9be64d1453c7a49ab0f0d09002
 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.


+   
+   SIMD Optimization
+   
+   
+   SIMD Optimization
+   
Use media-libs/partio



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 000..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
+}

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

2018-01-27 Thread Jonathan Scruggs

commit: 40d6ec988c90e5cd627fd8a118b2fe5fc8bad349
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Sat Jan 27 14:54:37 2018 +
Commit: Jonathan Scruggs  gentoo  org>
CommitDate: Sat Jan 27 17:19:01 2018 +
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 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   j.scru...@gmail.com
+   dracw...@gentoo.org
Jonathan Scruggs

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

2018-01-12 Thread Craig Andrews

commit: b8dc39e0e6aacef522c4e1597f53b8fa286f4e79
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Sat Dec 30 10:23:50 2017 +
Commit: Craig Andrews  gentoo  org>
CommitDate: Fri Jan 12 21:06:55 2018 +
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"

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

2017-12-23 Thread David Seifert

commit: 58d64aeec2469a0295a101bdaf8b57c533835b2d
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Sat Dec 23 11:14:24 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Dec 23 21:21:14 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d64aee

media-libs/osl: New package

A small but rich language for programmable shading in advanced
renderers and other applications, ideal for describing materials,
lights, displacement, and pattern generation.

New dependency for media-gfx/blender.
Closes: https://github.com/gentoo/gentoo/pull/6609

 media-libs/osl/Manifest   |   1 +
 media-libs/osl/files/osl-1.8.12-cmake-fixes.patch | 332 ++
 media-libs/osl/metadata.xml   |  27 ++
 media-libs/osl/osl-1.8.12.ebuild  |  70 +
 4 files changed, 430 insertions(+)

diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
new file mode 100644
index 000..b3d37043f05
--- /dev/null
+++ b/media-libs/osl/Manifest
@@ -0,0 +1 @@
+DIST osl-1.8.12.tar.gz 14572814 BLAKE2B 
edf742b104e723e1e3e56b2fb28b1cd4c81921b04a00b8c0f58cf174105a78881283837b550fb4a67d38f5f0a37327fac7a17310974895ed747e8813e6c8ad7b
 SHA512 
29bb0a23d9e1aa445e87b7080be056f939a1828fa87f001cc1503a8c76d21a5620c69146158d27800db71b1abee71a0c39804d85aea7b5899b0cb7ca1c617b56

diff --git a/media-libs/osl/files/osl-1.8.12-cmake-fixes.patch 
b/media-libs/osl/files/osl-1.8.12-cmake-fixes.patch
new file mode 100644
index 000..6ad5d94ac93
--- /dev/null
+++ b/media-libs/osl/files/osl-1.8.12-cmake-fixes.patch
@@ -0,0 +1,332 @@
+From cb34603cce0a8814dc66f76ecc5ceeb04a8d3791 Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs 
+Date: Fri, 18 Aug 2017 13:37:54 +0100
+Subject: [PATCH] OpenShadingLanguage/RB-1.8: Change to GNUInstallDirs for
+ install paths
+
+The variables: BIN_INSTALL_DIR, LIB_INSTALL_DIR, INCLUDE_INSTALL_DIR,
+DOC_INSTALL_DIR, and MAN_INSTALL_DIR are defined but never used.
+Instead, hard coded paths to lib, include, and bin were used. This
+will cause difficulty on multi-lib systems or in cases where they
+are named differently. The existing variables were replaced by the
+GNUInstallDirs variables, which is compatible on all systems.
+
+The macro install_targets was defined, but never used in code,
+so all library installs were changed to use it.
+Thus all library installs now use GNUInstallDirs.
+
+INSTALL_DOCS variable is defined, so it's now controlling if
+the documentation is being installed.
+
+Signed-off by: Jonathan Scruggs 
+---
+ CMakeLists.txt | 66 +-
+ src/cmake/util_macros.cmake|  6 ++--
+ src/doc/CMakeLists.txt |  6 ++--
+ src/include/CMakeLists.txt |  2 +-
+ src/liboslcomp/CMakeLists.txt  |  2 +-
+ src/liboslexec/CMakeLists.txt  |  2 +-
+ src/liboslnoise/CMakeLists.txt |  2 +-
+ src/liboslquery/CMakeLists.txt |  2 +-
+ src/osl.imageio/CMakeLists.txt | 19 +---
+ src/oslc/CMakeLists.txt|  2 +-
+ src/oslinfo/CMakeLists.txt |  2 +-
+ src/testrender/CMakeLists.txt  |  2 +-
+ src/testshade/CMakeLists.txt   |  6 ++--
+ 13 files changed, 32 insertions(+), 87 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 305047c0..da4635ab 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -248,6 +248,8 @@ set (OSL_BUILD_PLUGINS ON CACHE BOOL "Bool OSL plugins, 
for example OIIO plugin"
+ set (USE_CCACHE ON CACHE BOOL "Use ccache if found")
+ set (CODECOV OFF CACHE BOOL "Build code coverage tests")
+ option (USE_BOOST_WAVE "Use Boost Wave for C preprocessor (alternative is to 
use clang)" OFF)
++set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
++set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
+ 
+ # Use ccache if found
+ find_program (CCACHE_FOUND ccache)
+@@ -349,6 +351,14 @@ if (OSL_NAMESPACE)
+ endif ()
+ message(STATUS "Setting Namespace to: ${OSL_NAMESPACE}")
+ 
++include (GNUInstallDirs)
++
++message (STATUS "CMAKE_INSTALL_PREFIX is ${CMAKE_INSTALL_PREFIX}")
++message (STATUS "CMAKE_INSTALL_LIBDIR is ${CMAKE_INSTALL_LIBDIR}")
++message (STATUS "CMAKE_INSTALL_BINDIR is ${CMAKE_INSTALL_BINDIR}")
++message (STATUS "CMAKE_INSTALL_DOCDIR is ${CMAKE_INSTALL_DOCDIR}")
++message (STATUS "CMAKE_INSTALL_INCLUDEDIR is ${CMAKE_INSTALL_INCLUDEDIR}")
++
+ set (CMAKE_MODULE_PATH
+  "${PROJECT_SOURCE_DIR}/src/cmake/modules"
+  "${PROJECT_SOURCE_DIR}/src/cmake")
+@@ -363,58 +373,6 @@ include_directories (
+   )
+ 
+ 
+-###
+-# Paths for install tree customization.  Note that relative paths are relative
+-# to CMAKE_INSTALL_PREFIX.
+-set (DEFAULT_BIN_INSTALL_DIR   "bin")
+-set (DEFAULT_LIB_INSTALL_DIR   "lib")
+-set (DEFAULT_INCLUDE_INSTALL_DIR "include/OSL")
+-if (UNIX AND NOT SELF_CONTAINED_INSTALL_TREE)
+-# Try to be well-behaved and install into reasonable places

71 matches

Mail list logo