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

[Sam James]

commit:     d3136fca6cd93c40398e1a9ce7cff4e3a2a9f88d
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 27 02:58:24 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Oct 27 02:58:24 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3136fca

Revert "media-libs/OpenColorIO: drop misleading static-libs flag"

This reverts commit 67feac3eb03a837b48659761463dee05a6e98054.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/OpenColorIO/OpenColorIO-2.1.3.ebuild | 3 ++-
 media-libs/OpenColorIO/OpenColorIO-2.2.1.ebuild | 3 ++-
 media-libs/OpenColorIO/OpenColorIO-2.3.0.ebuild | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/media-libs/OpenColorIO/OpenColorIO-2.1.3.ebuild 
b/media-libs/OpenColorIO/OpenColorIO-2.1.3.ebuild
index 3f0ec84665c6..cdc060041ea3 100644
--- a/media-libs/OpenColorIO/OpenColorIO-2.1.3.ebuild
+++ b/media-libs/OpenColorIO/OpenColorIO-2.1.3.ebuild
@@ -16,7 +16,7 @@ LICENSE="BSD"
 # to force rebuild of consumers due to changing to openexr 3 changing API.
 SLOT="0/$(ver_cut 1-2).1"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv"
-IUSE="cpu_flags_x86_sse2 doc opengl python test"
+IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
 REQUIRED_USE="
        doc? ( python )
        python? ( ${PYTHON_REQUIRED_USE} )
@@ -81,6 +81,7 @@ src_configure() {
        # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE 
opengl)
        local mycmakeargs=(
                -DOCIO_USE_OPENEXR_HALF=OFF
+               -DOCIO_BUILD_STATIC=$(usex static-libs)
                -DOCIO_BUILD_DOCS=$(usex doc)
                -DOCIO_BUILD_APPS=$(usex opengl)
                -DOCIO_BUILD_PYTHON=$(usex python)

diff --git a/media-libs/OpenColorIO/OpenColorIO-2.2.1.ebuild 
b/media-libs/OpenColorIO/OpenColorIO-2.2.1.ebuild
index 80f90760f17c..0690447e44cb 100644
--- a/media-libs/OpenColorIO/OpenColorIO-2.2.1.ebuild
+++ b/media-libs/OpenColorIO/OpenColorIO-2.2.1.ebuild
@@ -16,7 +16,7 @@ SLOT="0/$(ver_cut 1-2)"
 # minizip-ng: ~arm ~arm64 ~ppc64 ~riscv
 # osl: ~riscv
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apps cpu_flags_x86_sse2 doc opengl python test"
+IUSE="apps cpu_flags_x86_sse2 doc opengl python static-libs test"
 # TODO: drop opengl? It does nothing without building either the apps or the 
testsuite
 REQUIRED_USE="
        apps? ( opengl )
@@ -104,6 +104,7 @@ src_configure() {
        #       ocioconvert (USE opengl)
        # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE 
opengl)
        local mycmakeargs=(
+               -DBUILD_SHARED_LIBS=$(usex !static-libs)
                -DOCIO_BUILD_APPS=$(usex apps)
                -DOCIO_BUILD_DOCS=$(usex doc)
                -DOCIO_BUILD_FROZEN_DOCS=$(usex doc)

diff --git a/media-libs/OpenColorIO/OpenColorIO-2.3.0.ebuild 
b/media-libs/OpenColorIO/OpenColorIO-2.3.0.ebuild
index 3d6d69685dd4..89a3ed8c0199 100644
--- a/media-libs/OpenColorIO/OpenColorIO-2.3.0.ebuild
+++ b/media-libs/OpenColorIO/OpenColorIO-2.3.0.ebuild
@@ -16,7 +16,7 @@ SLOT="0/$(ver_cut 1-2)"
 # minizip-ng: ~arm ~arm64 ~ppc64 ~riscv
 # osl: ~riscv
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
-IUSE="apps cpu_flags_x86_sse2 doc opengl python test"
+IUSE="apps cpu_flags_x86_sse2 doc opengl python static-libs test"
 # TODO: drop opengl? It does nothing without building either the apps or the 
testsuite
 REQUIRED_USE="
        apps? ( opengl )
@@ -104,6 +104,7 @@ src_configure() {
        #       ocioconvert (USE opengl)
        # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE 
opengl)
        local mycmakeargs=(
+               "-DBUILD_SHARED_LIBS=$(usex !static-libs)"
                "-DOCIO_BUILD_APPS=$(usex apps)"
                "-DOCIO_BUILD_DOCS=$(usex doc)"
                "-DOCIO_BUILD_FROZEN_DOCS=$(usex doc)"