[gentoo-commits] repo/gentoo:master commit in: media-libs/osl/files/, media-libs/osl/
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/files/, media-libs/osl/
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 a/src/liboslexec/shad
[gentoo-commits] repo/gentoo:master commit in: media-libs/osl/files/, media-libs/osl/
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 f
[gentoo-commits] repo/gentoo:master commit in: media-libs/osl/files/, media-libs/osl/
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 avx512f:av
[gentoo-commits] repo/gentoo:master commit in: media-libs/osl/files/, media-libs/osl/
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/files/, media-libs/osl/
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 "CMAKE_INSTALL_
[gentoo-commits] repo/gentoo:master commit in: media-libs/osl/files/, media-libs/osl/
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
b/src/cmake/modules/FindOpenEX
[gentoo-commits] repo/gentoo:master commit in: media-libs/osl/files/, media-libs/osl/
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 according to
+-# the "standard" unix direct
