commit: 9561ebc2ab427a9c1add754a140e426a180a7337
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 02:58:52 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 02:58:52 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9561ebc2
Revert "media-libs/osl -> media-libs/OpenShadingLanguage: rename"
This reverts commit 0c878b342a1445b3a8e3439e194f38b3a0248331.
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/blender/blender-3.3.6-r1.ebuild | 2 +-
media-gfx/blender/blender-3.3.8.ebuild | 2 +-
media-gfx/blender/blender-3.4.1-r3.ebuild | 2 +-
media-gfx/blender/blender-3.5.1-r1.ebuild | 2 +-
media-gfx/blender/blender-3.6.0.ebuild | 2 +-
media-gfx/blender/blender-9999.ebuild | 2 +-
media-libs/OpenColorIO/OpenColorIO-2.2.1.ebuild | 2 +-
media-libs/OpenColorIO/OpenColorIO-2.3.0.ebuild | 2 +-
media-libs/OpenShadingLanguage/Manifest | 3 ---
media-libs/osl/Manifest | 3 +++
media-libs/{OpenShadingLanguage => osl}/metadata.xml | 2 +-
.../osl-1.12.11.0.ebuild} | 5 +++--
.../osl-1.12.13.0.ebuild} | 5 +++--
.../OpenShadingLanguage-1.12.7.0.ebuild => osl/osl-1.12.7.0.ebuild} | 5 +++--
profiles/arch/powerpc/ppc64/64le/package.mask | 2 +-
profiles/arch/powerpc/ppc64/package.mask | 2 +-
profiles/updates/4Q-2023 | 1 -
17 files changed, 23 insertions(+), 21 deletions(-)
diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild
b/media-gfx/blender/blender-3.3.6-r1.ebuild
index f228b85b096b..5c0e1c0aea53 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -98,7 +98,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/c-blosc:=
)
optix? ( <dev-libs/optix-7.5.0 )
- osl? ( >=media-libs/OpenShadingLanguage-1.11.16.0-r3:= )
+ osl? ( >=media-libs/osl-1.11.16.0-r3:= )
pdf? ( media-libs/libharu )
potrace? ( media-gfx/potrace )
pugixml? ( dev-libs/pugixml )
diff --git a/media-gfx/blender/blender-3.3.8.ebuild
b/media-gfx/blender/blender-3.3.8.ebuild
index f0d90eccb2d6..b5f8b62bf605 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -98,7 +98,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/c-blosc:=
)
optix? ( <dev-libs/optix-7.5.0 )
- osl? ( >=media-libs/OpenShadingLanguage-1.11.16.0-r3:= )
+ osl? ( >=media-libs/osl-1.11.16.0-r3:= )
pdf? ( media-libs/libharu )
potrace? ( media-gfx/potrace )
pugixml? ( dev-libs/pugixml )
diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild
b/media-gfx/blender/blender-3.4.1-r3.ebuild
index ce1a498991a1..ed1983b39c85 100644
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -93,7 +93,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/c-blosc:=
)
optix? ( <dev-libs/optix-7.5.0 )
- osl? ( >=media-libs/OpenShadingLanguage-1.11.16.0-r3:= )
+ osl? ( >=media-libs/osl-1.11.16.0-r3:= )
pdf? ( media-libs/libharu )
potrace? ( media-gfx/potrace )
pugixml? ( dev-libs/pugixml )
diff --git a/media-gfx/blender/blender-3.5.1-r1.ebuild
b/media-gfx/blender/blender-3.5.1-r1.ebuild
index 9d71790215eb..25d45ab3d9d0 100644
--- a/media-gfx/blender/blender-3.5.1-r1.ebuild
+++ b/media-gfx/blender/blender-3.5.1-r1.ebuild
@@ -95,7 +95,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/c-blosc:=
)
optix? ( <dev-libs/optix-7.5.0 )
- osl? ( >=media-libs/OpenShadingLanguage-1.11.16.0-r3:= )
+ osl? ( >=media-libs/osl-1.11.16.0-r3:= )
pdf? ( media-libs/libharu )
potrace? ( media-gfx/potrace )
pugixml? ( dev-libs/pugixml )
diff --git a/media-gfx/blender/blender-3.6.0.ebuild
b/media-gfx/blender/blender-3.6.0.ebuild
index 9d71790215eb..25d45ab3d9d0 100644
--- a/media-gfx/blender/blender-3.6.0.ebuild
+++ b/media-gfx/blender/blender-3.6.0.ebuild
@@ -95,7 +95,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/c-blosc:=
)
optix? ( <dev-libs/optix-7.5.0 )
- osl? ( >=media-libs/OpenShadingLanguage-1.11.16.0-r3:= )
+ osl? ( >=media-libs/osl-1.11.16.0-r3:= )
pdf? ( media-libs/libharu )
potrace? ( media-gfx/potrace )
pugixml? ( dev-libs/pugixml )
diff --git a/media-gfx/blender/blender-9999.ebuild
b/media-gfx/blender/blender-9999.ebuild
index 6040738583aa..5a3cd2cc8b6c 100644
--- a/media-gfx/blender/blender-9999.ebuild
+++ b/media-gfx/blender/blender-9999.ebuild
@@ -95,7 +95,7 @@ RDEPEND="${PYTHON_DEPS}
dev-libs/c-blosc:=
)
optix? ( <dev-libs/optix-7.5.0 )
- osl? ( >=media-libs/OpenShadingLanguage-1.11.16.0-r3:= )
+ osl? ( >=media-libs/osl-1.11.16.0-r3:= )
pdf? ( media-libs/libharu )
potrace? ( media-gfx/potrace )
pugixml? ( dev-libs/pugixml )
diff --git a/media-libs/OpenColorIO/OpenColorIO-2.2.1.ebuild
b/media-libs/OpenColorIO/OpenColorIO-2.2.1.ebuild
index 4498f1affad1..38f4472a22d7 100644
--- a/media-libs/OpenColorIO/OpenColorIO-2.2.1.ebuild
+++ b/media-libs/OpenColorIO/OpenColorIO-2.2.1.ebuild
@@ -71,7 +71,7 @@ BDEPEND="
"
# test? (
# >=media-libs/OpenImageIO-2.2.14
-# >=media-libs/OpenShadingLanguage-1.11
+# >=media-libs/osl-1.11
# )
# "
diff --git a/media-libs/OpenColorIO/OpenColorIO-2.3.0.ebuild
b/media-libs/OpenColorIO/OpenColorIO-2.3.0.ebuild
index 73514884cca5..8b363c55f40a 100644
--- a/media-libs/OpenColorIO/OpenColorIO-2.3.0.ebuild
+++ b/media-libs/OpenColorIO/OpenColorIO-2.3.0.ebuild
@@ -71,7 +71,7 @@ BDEPEND="
"
# test? (
# >=media-libs/OpenImageIO-2.2.14
-# >=media-libs/OpenShadingLanguage-1.11
+# >=media-libs/osl-1.11
# )
# "
diff --git a/media-libs/OpenShadingLanguage/Manifest
b/media-libs/OpenShadingLanguage/Manifest
deleted file mode 100644
index 47ed2b5ca5c7..000000000000
--- a/media-libs/OpenShadingLanguage/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST OpenShadingLanguage-1.12.11.0.tar.gz 20287156 BLAKE2B
178db816980929cc61a0deea63f715a9f10adc41c6dd264bca8df451ef9531c4ee9477f6374f160b2a7d6fb72289a3edcbe5a3e8050ff2fdcc6bfe57fda58626
SHA512
9cf7b08f43e66d280cb90bf8c579f3a7d949934ac8e7a9289113a4a34158a43e32c9b73863f2a94a628ebc1a988923c3a7d32f0944745ae7c74dc164fdd5125e
-DIST OpenShadingLanguage-1.12.13.0.tar.gz 20286745 BLAKE2B
75a2a5d10000ba26cd11463dde710d5be3b8b2d227de45263d8bd39fd87ca064f7c6d2b2f9cea2fdb8f29ccaa94d3ef60e2ff2e0e6d867385e2298dd10ef61b6
SHA512
d7e6ab79f77f2854cbb4fa2fbe5fc92659bb015b1bbffcee2ef86185cf20235990fa3b20308601aa298fedc85d3fcd4451b7b7ff0df7def97027efe4fb8a02bc
-DIST OpenShadingLanguage-1.12.7.0.tar.gz 20250356 BLAKE2B
a9398243546b1bfc1e3f9602f6112a72a8e7cb6ace54e93d0e5f30d943474e82c3317596597d6a09e0f2cf04b1b21f05c31a2357e3d667d710cd2aa340f5fd63
SHA512
ec0391dfc95140fee4fa8332991cdcb0978dafc436f3e07d0293e2baa2014b8765e6b60631ae5a8bbd6e16dbcf37f04c076d7d6b2d8bfa58b78471f0d92c433f
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
new file mode 100644
index 000000000000..7bf7586baeaa
--- /dev/null
+++ b/media-libs/osl/Manifest
@@ -0,0 +1,3 @@
+DIST osl-1.12.11.0.tar.gz 20287156 BLAKE2B
178db816980929cc61a0deea63f715a9f10adc41c6dd264bca8df451ef9531c4ee9477f6374f160b2a7d6fb72289a3edcbe5a3e8050ff2fdcc6bfe57fda58626
SHA512
9cf7b08f43e66d280cb90bf8c579f3a7d949934ac8e7a9289113a4a34158a43e32c9b73863f2a94a628ebc1a988923c3a7d32f0944745ae7c74dc164fdd5125e
+DIST osl-1.12.13.0.tar.gz 20286745 BLAKE2B
75a2a5d10000ba26cd11463dde710d5be3b8b2d227de45263d8bd39fd87ca064f7c6d2b2f9cea2fdb8f29ccaa94d3ef60e2ff2e0e6d867385e2298dd10ef61b6
SHA512
d7e6ab79f77f2854cbb4fa2fbe5fc92659bb015b1bbffcee2ef86185cf20235990fa3b20308601aa298fedc85d3fcd4451b7b7ff0df7def97027efe4fb8a02bc
+DIST osl-1.12.7.0.tar.gz 20250356 BLAKE2B
a9398243546b1bfc1e3f9602f6112a72a8e7cb6ace54e93d0e5f30d943474e82c3317596597d6a09e0f2cf04b1b21f05c31a2357e3d667d710cd2aa340f5fd63
SHA512
ec0391dfc95140fee4fa8332991cdcb0978dafc436f3e07d0293e2baa2014b8765e6b60631ae5a8bbd6e16dbcf37f04c076d7d6b2d8bfa58b78471f0d92c433f
diff --git a/media-libs/OpenShadingLanguage/metadata.xml
b/media-libs/osl/metadata.xml
similarity index 90%
rename from media-libs/OpenShadingLanguage/metadata.xml
rename to media-libs/osl/metadata.xml
index c79f02eeb110..a300ead37dfa 100644
--- a/media-libs/OpenShadingLanguage/metadata.xml
+++ b/media-libs/osl/metadata.xml
@@ -19,6 +19,6 @@
<flag name="qt5">Build the osltoy binary</flag>
</use>
<upstream>
- <remote-id
type="github">AcademySoftwareFoundation/OpenShadingLanguage</remote-id>
+ <remote-id
type="github">imageworks/OpenShadingLanguage</remote-id>
</upstream>
</pkgmetadata>
diff --git
a/media-libs/OpenShadingLanguage/OpenShadingLanguage-1.12.11.0.ebuild
b/media-libs/osl/osl-1.12.11.0.ebuild
similarity index 92%
rename from media-libs/OpenShadingLanguage/OpenShadingLanguage-1.12.11.0.ebuild
rename to media-libs/osl/osl-1.12.11.0.ebuild
index ef778e5abdf0..f73535ac16f9 100644
--- a/media-libs/OpenShadingLanguage/OpenShadingLanguage-1.12.11.0.ebuild
+++ b/media-libs/osl/osl-1.12.11.0.ebuild
@@ -11,9 +11,10 @@ LLVM_MAX_SLOT=15
inherit cmake llvm toolchain-funcs python-single-r1
DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage";
+HOMEPAGE="http://opensource.imageworks.com/?p=osl";
# If a development release, please don't keyword!
-SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
+S="${WORKDIR}/OpenShadingLanguage-${PV}"
LICENSE="BSD"
SLOT="0"
diff --git
a/media-libs/OpenShadingLanguage/OpenShadingLanguage-1.12.13.0.ebuild
b/media-libs/osl/osl-1.12.13.0.ebuild
similarity index 93%
rename from media-libs/OpenShadingLanguage/OpenShadingLanguage-1.12.13.0.ebuild
rename to media-libs/osl/osl-1.12.13.0.ebuild
index 1a4c73b60273..10cfd4a418fc 100644
--- a/media-libs/OpenShadingLanguage/OpenShadingLanguage-1.12.13.0.ebuild
+++ b/media-libs/osl/osl-1.12.13.0.ebuild
@@ -11,9 +11,10 @@ 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://github.com/AcademySoftwareFoundation/OpenShadingLanguage";
+HOMEPAGE="http://opensource.imageworks.com/?p=osl";
# If a development release, please don't keyword!
-SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/refs/tags/v${PV}.tar.gz
-> ${P}.tar.gz"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
+S="${WORKDIR}/OpenShadingLanguage-${PV}"
LICENSE="BSD"
SLOT="0"
diff --git a/media-libs/OpenShadingLanguage/OpenShadingLanguage-1.12.7.0.ebuild
b/media-libs/osl/osl-1.12.7.0.ebuild
similarity index 93%
rename from media-libs/OpenShadingLanguage/OpenShadingLanguage-1.12.7.0.ebuild
rename to media-libs/osl/osl-1.12.7.0.ebuild
index 1e05f9b4a6a6..070e6b3e9375 100644
--- a/media-libs/OpenShadingLanguage/OpenShadingLanguage-1.12.7.0.ebuild
+++ b/media-libs/osl/osl-1.12.7.0.ebuild
@@ -11,9 +11,10 @@ LLVM_MAX_SLOT=15
inherit cmake llvm toolchain-funcs python-single-r1
DESCRIPTION="Advanced shading language for production GI renderers"
-HOMEPAGE="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage";
+HOMEPAGE="http://opensource.imageworks.com/?p=osl";
# If a development release, please don't keyword!
-SRC_URI="https://github.com/AcademySoftwareFoundation/OpenShadingLanguage/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/v${PV}.tar.gz
-> ${P}.tar.gz"
+S="${WORKDIR}/OpenShadingLanguage-${PV}"
LICENSE="BSD"
SLOT="0"
diff --git a/profiles/arch/powerpc/ppc64/64le/package.mask
b/profiles/arch/powerpc/ppc64/64le/package.mask
index 681ebdbde549..f87dc61f813c 100644
--- a/profiles/arch/powerpc/ppc64/64le/package.mask
+++ b/profiles/arch/powerpc/ppc64/64le/package.mask
@@ -29,7 +29,7 @@
-media-libs/embree
-media-libs/OpenColorIO
-media-libs/OpenImageIO
--media-libs/OpenShadingLanguage
+-media-libs/osl
# Sam James <s...@gentoo.org> (2021-10-16)
# Fails with "No byte-swap function available on big-endian platform." on be
diff --git a/profiles/arch/powerpc/ppc64/package.mask
b/profiles/arch/powerpc/ppc64/package.mask
index 23e53c00bc4c..325c86ce6610 100644
--- a/profiles/arch/powerpc/ppc64/package.mask
+++ b/profiles/arch/powerpc/ppc64/package.mask
@@ -32,7 +32,7 @@ media-gfx/openvdb
media-libs/embree
media-libs/OpenColorIO
media-libs/OpenImageIO
-media-libs/OpenShadingLanguage
+media-libs/osl
# Sam James <s...@gentoo.org> (2021-10-16)
# Fails with "No byte-swap function available on big-endian platform."
diff --git a/profiles/updates/4Q-2023 b/profiles/updates/4Q-2023
index c0cc310026e7..ff5f6701dd69 100644
--- a/profiles/updates/4Q-2023
+++ b/profiles/updates/4Q-2023
@@ -7,4 +7,3 @@ move dev-python/sarif_om dev-python/sarif-om
move dev-python/memory_allocator dev-python/memory-allocator
move media-libs/openimageio media-libs/OpenImageIO
move media-libs/opencolorio media-libs/OpenColorIO
-move media-libs/osl media-libs/OpenShadingLanguage
