* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/
@ 2018-01-13 13:30 David Seifert
0 siblings, 0 replies; 10+ messages in thread
From: David Seifert @ 2018-01-13 13:30 UTC (permalink / raw
To: gentoo-commits
commit: 489c3c78999d7f5c20d86aa2b5e2493821ee5fd0
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Fri Jan 12 22:19:10 2018 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 13:30:07 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=489c3c78
media-libs/opencolorio: version bump to 1.1.0
Closes: https://github.com/gentoo/gentoo/pull/6842
media-libs/opencolorio/Manifest | 1 +
.../files/opencolorio-1.1.0-cmake-fixes.patch | 173 +++++++++++++++++++++
media-libs/opencolorio/opencolorio-1.1.0.ebuild | 85 ++++++++++
3 files changed, 259 insertions(+)
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 63d78b13800..78f98ec8306 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,3 +1,4 @@
DIST opencolorio-1.0.9-yaml-0.5-compat-v2.patch.bz2 15418 BLAKE2B 6eaabec7780cb4be9ec4b0b16f79b7114b187b13e3027b6cae3662c6a2b6dacb6566e36fbdf7b2edc77855be505e4cd2c84e16b58d49ccdc59341359419b7cc4 SHA512 8383bc84e209b67aa34c6420348634d0d2a34f1dafda6a10b0c4a15776c2094057a38b00d078b59b648131178f2d65f695890204dbee411602689a0bb7419ecc
DIST opencolorio-1.0.9.tar.gz 12473406 BLAKE2B 54c867521b66d7479c175f65046ffd50ce41fb665c640cf5097b7178cc11dbf17cd324e7d861e4a56c990a109d7f80041d5e83a2438bbfb550e2d8affab7c2da SHA512 f5310cd6d3048d5f307adb41ac1ac807f087a6344c96324cb0f13d0eae1fa3fe5f8005f17adf77664044daf762902223b650b5d8c1636c7801183cd3b4e03ac8
DIST opencolorio-1.0.9_p20170719.tar.gz 13752783 BLAKE2B 2f6a0e095bb3fd56a49b6d43f5c4f3690a2c735c1cc84c337bcb19abf391bedd600bcb6fc512fd8e1c56fe1e337ee57358329490f2dc2c92362b8c939a579917 SHA512 1ee86cae951afed963bc62e251975a6c721553fc1bb7650faccb6160fcd6b3e030c509667cb7b2543a3ca32ed6777259d98bf25e2bb8150fee8054310b9d2590
+DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.0-cmake-fixes.patch b/media-libs/opencolorio/files/opencolorio-1.1.0-cmake-fixes.patch
new file mode 100644
index 00000000000..9cb3500d9da
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.1.0-cmake-fixes.patch
@@ -0,0 +1,173 @@
+diff -purN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2017-11-29 22:51:15.000000000 +0000
++++ b/CMakeLists.txt 2017-12-27 16:49:51.461300828 +0000
+@@ -59,6 +59,7 @@ endif()
+ include(ParseArguments)
+ include(OCIOMacros)
+ include(ExternalProject)
++include(GNUInstallDirs)
+
+ enable_language(CXX)
+
+@@ -531,7 +532,7 @@ endif()
+ configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
+ ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
+
+-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
++INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ocio/)
+
+ ###############################################################################
+ ### CPACK ###
+@@ -646,4 +647,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
+ message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
+ "
+ )
+-install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
++install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/CMake)
+diff -purN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+--- a/docs/CMakeLists.txt 2017-11-29 22:51:15.000000000 +0000
++++ b/docs/CMakeLists.txt 2017-12-27 16:53:28.976491353 +0000
+@@ -1,91 +1,5 @@
+
+ ###############################################################################
+-### External Doc Apps ###
+-
+-if (WIN32)
+- # Workaround to mimic *nix '> PYTHONPATH=XXX CMD'
+- # on windows, it becomes '> set PYTHONPATH=XXX \n call CMD'
+- # '\n' is here because '\\&' does not work.
+- set(PYT_PRE_CMD set PYTHONPATH=${PYTHONPATH} "\n" call )
+- # Unfortunately some windows tools require to have
+- # the paths with the '\' (not working with '//').
+- set(PYT_LIB_OUTPUT ${EXTDIST_ROOT})
+- string(REGEX REPLACE "/" "\\\\" PYT_LIB_OUTPUT ${PYT_LIB_OUTPUT})
+- set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH})
+- string(REGEX REPLACE "/" "\\\\" PYT_EXTDIST_BINPATH ${PYT_EXTDIST_BINPATH})
+-else()
+- set(PYT_PRE_CMD PYTHONPATH=${PYTHONPATH})
+- set(PYT_LIB_OUTPUT ${EXTDIST_ROOT})
+- set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH})
+-endif()
+-
+-# setuptools
+-# https://pypi.python.org/pypi/setuptools
+-set(SETUPTOOLS_VERSION 1.1.6)
+-
+-ExternalProject_Add(setuptools
+- URL ${CMAKE_SOURCE_DIR}/ext/setuptools-${SETUPTOOLS_VERSION}.tar.gz
+- BUILD_IN_SOURCE 1
+- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
+- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
+- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/setuptools-prefix/src/setuptools
+-)
+-
+-# docutils
+-# https://pypi.python.org/pypi/docutils
+-set(DOCUTILS_VERSION 0.11)
+-ExternalProject_Add(docutils
+- DEPENDS setuptools
+- URL ${CMAKE_SOURCE_DIR}/ext/docutils-${DOCUTILS_VERSION}.tar.gz
+- BUILD_IN_SOURCE 1
+- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
+- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
+- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docutils-prefix/src/docutils
+-)
+-
+-# jinja2
+-# https://pypi.python.org/pypi/Jinja2
+-set(JINJA2_VERSION 2.7.1)
+-ExternalProject_Add(Jinja2
+- DEPENDS setuptools
+- URL ${CMAKE_SOURCE_DIR}/ext/Jinja2-${JINJA2_VERSION}.tar.gz
+- BUILD_IN_SOURCE 1
+- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
+- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
+- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Jinja2-prefix/src/Jinja2
+-)
+-
+-# Pygments
+-# https://pypi.python.org/pypi/Pygments
+-set(PYGMENTS_VERSION 1.6)
+-ExternalProject_Add(Pygments
+- DEPENDS setuptools
+- URL ${CMAKE_SOURCE_DIR}/ext/Pygments-${PYGMENTS_VERSION}.tar.gz
+- BUILD_IN_SOURCE 1
+- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
+- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
+- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Pygments-prefix/src/Pygments
+-)
+-
+-# sphinx
+-# https://pypi.python.org/pypi/Sphinx
+-set(SPHINX_VERSION 1.2b3)
+-ExternalProject_Add(Sphinx
+- DEPENDS setuptools docutils Jinja2 Pygments
+- URL ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.tar.gz
+- PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch
+- BUILD_IN_SOURCE 1
+- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
+- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-scripts=${PYT_EXTDIST_BINPATH}
+- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Sphinx-prefix/src/Sphinx
+-)
+-
+-###############################################################################
+ ### Create Doc Targets ###
+
+ message(STATUS "Create sphinx conf.py from conf.py.in")
+@@ -122,7 +36,7 @@ else()
+ endif()
+
+ add_custom_target(doc ALL
+- COMMAND ${PYT_PRE_CMD} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
++ COMMAND sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
+ DEPENDS
+ ${DEPLIBS}
+ ${CMAKE_BINARY_DIR}/docs/conf.py
+@@ -133,20 +47,18 @@ add_custom_target(doc ALL
+ COMMENT "Building html docs"
+ SOURCES ${DOCFILES})
+
+-# note: ExternalProject will not build when added to a add_custom_target this
+-# works around this problem. This seems to be fixed in the cmake ^HEAD
+-add_dependencies(doc Sphinx)
+-
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
+- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
++ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
+ PATTERN .* EXCLUDE
+ )
+
++if(OCIO_BUILD_PDF_DOCS)
++
+ find_package(LATEX)
+ if(PDFLATEX_COMPILER)
+
+ add_custom_target(latex
+- COMMAND ${PYT_PRE_CMD} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
++ COMMAND sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
+ DEPENDS
+ OpenColorIO
+ ${CMAKE_BINARY_DIR}/docs/conf.py
+@@ -156,7 +68,6 @@ if(PDFLATEX_COMPILER)
+ ${RSTDOC_OUTPUT}
+ COMMENT "Building latex doc"
+ SOURCES ${DOCFILES})
+- add_dependencies(latex Sphinx)
+
+ add_custom_target(pdf ALL
+ COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex
+@@ -166,6 +77,8 @@ if(PDFLATEX_COMPILER)
+ add_dependencies(pdf latex)
+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
+- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
++ DESTINATION ${CMAKE_INSTALL_DOCDIR})
+
+ endif()
++
++endif()
diff --git a/media-libs/opencolorio/opencolorio-1.1.0.ebuild b/media-libs/opencolorio/opencolorio-1.1.0.ebuild
new file mode 100644
index 00000000000..c1504ae4a46
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-1.1.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Compatibility with Python 3 is declared by upstream, but it is broken in fact, check on bump
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-utils python-single-r1 vcs-snapshot
+
+DESCRIPTION="A color management framework for visual effects and animation"
+HOMEPAGE="http://opencolorio.org/"
+
+SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz \
+ -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc opengl pdf python cpu_flags_x86_sse2 test"
+REQUIRED_USE="
+ doc? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ opengl? (
+ media-libs/lcms:2
+ media-libs/openimageio
+ media-libs/glew:=
+ media-libs/freeglut
+ virtual/opengl
+ )
+ python? ( ${PYTHON_DEPS} )
+ >=dev-cpp/yaml-cpp-0.5
+ dev-libs/tinyxml"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ doc? (
+ pdf? ( dev-python/sphinx[latex,${PYTHON_USEDEP}] )
+ !pdf? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ )"
+
+# Restricting tests, bugs #439790 and #447908
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-cmake-fixes.patch" )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ use python && python_fix_shebang .
+}
+
+src_configure() {
+ # Missing features:
+ # - Truelight and Nuke are not in portage for now, so their support are disabled
+ # - Java bindings was not tested, so disabled
+ # Notes:
+ # - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
+ # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
+ local mycmakeargs=(
+ -DOCIO_BUILD_JNIGLUE=OFF
+ -DOCIO_BUILD_NUKE=OFF
+ -DOCIO_BUILD_SHARED=ON
+ -DOCIO_BUILD_STATIC=OFF
+ -DOCIO_STATIC_JNIGLUE=OFF
+ -DOCIO_BUILD_TRUELIGHT=OFF
+ -DUSE_EXTERNAL_LCMS=ON
+ -DUSE_EXTERNAL_TINYXML=ON
+ -DUSE_EXTERNAL_YAML=ON
+ -DOCIO_BUILD_DOCS="$(usex doc)"
+ -DOCIO_BUILD_APPS="$(usex opengl)"
+ -DOCIO_BUILD_PDF_DOCS="$(usex pdf)"
+ -DOCIO_BUILD_PYGLUE="$(usex python)"
+ -DOCIO_USE_SSE="$(usex cpu_flags_x86_sse2)"
+ -DOCIO_BUILD_TESTS="$(usex test)"
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ )
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/
@ 2018-01-13 13:30 David Seifert
0 siblings, 0 replies; 10+ messages in thread
From: David Seifert @ 2018-01-13 13:30 UTC (permalink / raw
To: gentoo-commits
commit: c096702b017761ba14439afd4d9ddbef302cb8ba
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Fri Jan 12 22:22:40 2018 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jan 13 13:30:13 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c096702b
media-libs/opencolorio: Remove 1.0.9_p20170719
media-libs/opencolorio/Manifest | 1 -
.../files/opencolorio-1.0.9-cmake-fixes-v1.patch | 150 ---------------------
.../opencolorio/opencolorio-1.0.9_p20170719.ebuild | 86 ------------
3 files changed, 237 deletions(-)
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 78f98ec8306..61692b3aa83 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,4 +1,3 @@
DIST opencolorio-1.0.9-yaml-0.5-compat-v2.patch.bz2 15418 BLAKE2B 6eaabec7780cb4be9ec4b0b16f79b7114b187b13e3027b6cae3662c6a2b6dacb6566e36fbdf7b2edc77855be505e4cd2c84e16b58d49ccdc59341359419b7cc4 SHA512 8383bc84e209b67aa34c6420348634d0d2a34f1dafda6a10b0c4a15776c2094057a38b00d078b59b648131178f2d65f695890204dbee411602689a0bb7419ecc
DIST opencolorio-1.0.9.tar.gz 12473406 BLAKE2B 54c867521b66d7479c175f65046ffd50ce41fb665c640cf5097b7178cc11dbf17cd324e7d861e4a56c990a109d7f80041d5e83a2438bbfb550e2d8affab7c2da SHA512 f5310cd6d3048d5f307adb41ac1ac807f087a6344c96324cb0f13d0eae1fa3fe5f8005f17adf77664044daf762902223b650b5d8c1636c7801183cd3b4e03ac8
-DIST opencolorio-1.0.9_p20170719.tar.gz 13752783 BLAKE2B 2f6a0e095bb3fd56a49b6d43f5c4f3690a2c735c1cc84c337bcb19abf391bedd600bcb6fc512fd8e1c56fe1e337ee57358329490f2dc2c92362b8c939a579917 SHA512 1ee86cae951afed963bc62e251975a6c721553fc1bb7650faccb6160fcd6b3e030c509667cb7b2543a3ca32ed6777259d98bf25e2bb8150fee8054310b9d2590
DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
diff --git a/media-libs/opencolorio/files/opencolorio-1.0.9-cmake-fixes-v1.patch b/media-libs/opencolorio/files/opencolorio-1.0.9-cmake-fixes-v1.patch
deleted file mode 100644
index 23f67cae55c..00000000000
--- a/media-libs/opencolorio/files/opencolorio-1.0.9-cmake-fixes-v1.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff -purN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2017-07-19 21:38:48.000000000 +0100
-+++ b/CMakeLists.txt 2017-08-15 14:14:02.223744929 +0100
-@@ -59,6 +59,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -519,7 +520,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -634,4 +635,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/CMake)
-diff -purN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
---- a/docs/CMakeLists.txt 2017-07-19 21:38:48.000000000 +0100
-+++ b/docs/CMakeLists.txt 2017-08-15 14:10:29.645282585 +0100
-@@ -1,68 +1,5 @@
-
- ###############################################################################
--### External Doc Apps ###
--
--# setuptools
--# https://pypi.python.org/pypi/setuptools
--set(SETUPTOOLS_VERSION 1.1.6)
--ExternalProject_Add(setuptools
-- URL ${CMAKE_SOURCE_DIR}/ext/setuptools-${SETUPTOOLS_VERSION}.tar.gz
-- BUILD_IN_SOURCE 1
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
--)
--
--# docutils
--# https://pypi.python.org/pypi/docutils
--set(DOCUTILS_VERSION 0.11)
--ExternalProject_Add(docutils
-- DEPENDS setuptools
-- URL ${CMAKE_SOURCE_DIR}/ext/docutils-${DOCUTILS_VERSION}.tar.gz
-- BUILD_IN_SOURCE 1
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
--)
--
--# jinja2
--# https://pypi.python.org/pypi/Jinja2
--set(JINJA2_VERSION 2.7.1)
--ExternalProject_Add(Jinja2
-- DEPENDS setuptools
-- URL ${CMAKE_SOURCE_DIR}/ext/Jinja2-${JINJA2_VERSION}.tar.gz
-- BUILD_IN_SOURCE 1
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
--)
--
--# Pygments
--# https://pypi.python.org/pypi/Pygments
--set(PYGMENTS_VERSION 1.6)
--ExternalProject_Add(Pygments
-- DEPENDS setuptools
-- URL ${CMAKE_SOURCE_DIR}/ext/Pygments-${PYGMENTS_VERSION}.tar.gz
-- BUILD_IN_SOURCE 1
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
--)
--
--# sphinx
--# https://pypi.python.org/pypi/Sphinx
--set(SPHINX_VERSION 1.2b3)
--ExternalProject_Add(Sphinx
-- DEPENDS setuptools docutils Jinja2 Pygments
-- URL ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.tar.gz
-- PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch
-- BUILD_IN_SOURCE 1
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} --install-scripts=${EXTDIST_ROOT}/bin
--)
--
--###############################################################################
- ### Create Doc Targets ###
-
- message(STATUS "Create sphinx conf.py from conf.py.in")
-@@ -99,7 +36,7 @@ else()
- endif()
-
- add_custom_target(doc ALL
-- COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
-+ COMMAND sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
- DEPENDS
- ${DEPLIBS}
- ${CMAKE_BINARY_DIR}/docs/conf.py
-@@ -110,20 +47,18 @@ add_custom_target(doc ALL
- COMMENT "Building html docs"
- SOURCES ${DOCFILES})
-
--# note: ExternalProject will not build when added to a add_custom_target this
--# works around this problem. This seems to be fixed in the cmake ^HEAD
--add_dependencies(doc Sphinx)
--
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-+if(OCIO_BUILD_PDF_DOCS)
-+
- find_package(LATEX)
- if(PDFLATEX_COMPILER)
-
- add_custom_target(latex
-- COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
-+ COMMAND sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
- DEPENDS
- OpenColorIO
- ${CMAKE_BINARY_DIR}/docs/conf.py
-@@ -133,7 +68,6 @@ if(PDFLATEX_COMPILER)
- ${RSTDOC_OUTPUT}
- COMMENT "Building latex doc"
- SOURCES ${DOCFILES})
-- add_dependencies(latex Sphinx)
-
- add_custom_target(pdf ALL
- COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex
-@@ -143,6 +77,8 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-+
-+endif()
diff --git a/media-libs/opencolorio/opencolorio-1.0.9_p20170719.ebuild b/media-libs/opencolorio/opencolorio-1.0.9_p20170719.ebuild
deleted file mode 100644
index cfcbd93bf47..00000000000
--- a/media-libs/opencolorio/opencolorio-1.0.9_p20170719.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Compatibility with Python 3 is declared by upstream, but it is broken in fact, check on bump
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit cmake-utils python-single-r1 vcs-snapshot
-
-DESCRIPTION="A color management framework for visual effects and animation"
-HOMEPAGE="http://opencolorio.org/"
-
-MY_GIT_COMMIT="7e7f10afce97254cdc1295a3594ddd5e6fb555d6"
-SRC_URI="https://github.com/imageworks/OpenColorIO/archive/${MY_GIT_COMMIT}.tar.gz \
- -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc opengl pdf python cpu_flags_x86_sse2 test"
-REQUIRED_USE="
- doc? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
- opengl? (
- media-libs/lcms:2
- media-libs/openimageio
- media-libs/glew:=
- media-libs/freeglut
- virtual/opengl
- )
- python? ( ${PYTHON_DEPS} )
- >=dev-cpp/yaml-cpp-0.5
- dev-libs/tinyxml"
-
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? (
- pdf? ( dev-python/sphinx[latex,${PYTHON_USEDEP}] )
- !pdf? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- )"
-
-# Restricting tests, bugs #439790 and #447908
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-1.0.9-cmake-fixes-v1.patch" )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- use python && python_fix_shebang .
-}
-
-src_configure() {
- # Missing features:
- # - Truelight and Nuke are not in portage for now, so their support are disabled
- # - Java bindings was not tested, so disabled
- # Notes:
- # - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
- # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
- local mycmakeargs=(
- -DOCIO_BUILD_JNIGLUE=OFF
- -DOCIO_BUILD_NUKE=OFF
- -DOCIO_BUILD_SHARED=ON
- -DOCIO_BUILD_STATIC=OFF
- -DOCIO_STATIC_JNIGLUE=OFF
- -DOCIO_BUILD_TRUELIGHT=OFF
- -DUSE_EXTERNAL_LCMS=ON
- -DUSE_EXTERNAL_TINYXML=ON
- -DUSE_EXTERNAL_YAML=ON
- -DOCIO_BUILD_DOCS="$(usex doc)"
- -DOCIO_BUILD_APPS="$(usex opengl)"
- -DOCIO_BUILD_PDF_DOCS="$(usex pdf)"
- -DOCIO_BUILD_PYGLUE="$(usex python)"
- -DOCIO_USE_SSE="$(usex cpu_flags_x86_sse2)"
- -DOCIO_BUILD_TESTS="$(usex test)"
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
- )
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/
@ 2021-04-28 7:21 Sergei Trofimovich
0 siblings, 0 replies; 10+ messages in thread
From: Sergei Trofimovich @ 2021-04-28 7:21 UTC (permalink / raw
To: gentoo-commits
commit: 7e726d850502018b6760da78dbd4a419603016b8
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 28 07:21:14 2021 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Wed Apr 28 07:21:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e726d85
media-libs/opencolorio: drop -Werror
Reported-by: Austin Kilgore
Closes: https://bugs.gentoo.org/786198
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
.../opencolorio/files/opencolorio-1.1.1-no-werror.patch | 12 ++++++++++++
media-libs/opencolorio/opencolorio-1.1.1.ebuild | 1 +
2 files changed, 13 insertions(+)
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.1-no-werror.patch b/media-libs/opencolorio/files/opencolorio-1.1.1-no-werror.patch
new file mode 100644
index 00000000000..df8fa210253
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.1.1-no-werror.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/786198
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -23,8 +23,6 @@ if(WIN32)
+ if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
+ set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
+ endif()
+-else()
+- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
+ endif()
+
+ # SHARED
diff --git a/media-libs/opencolorio/opencolorio-1.1.1.ebuild b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
index 481f2561de4..a20bb6f44ae 100644
--- a/media-libs/opencolorio/opencolorio-1.1.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
@@ -53,6 +53,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.1.0-remove-Werror.patch"
"${FILESDIR}/${PN}-1.1.1-yaml-cpp-boost-check.patch"
"${FILESDIR}/${P}-fix-self-assign-clang.patch"
+ "${FILESDIR}/${P}-no-werror.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/
@ 2022-02-15 19:51 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2022-02-15 19:51 UTC (permalink / raw
To: gentoo-commits
commit: 5cf44c5ab2ca709df6fb7b90434d02487faed323
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 17:58:14 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 19:49:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cf44c5a
media-libs/opencolorio: adjust to unslotted OpenEXR
Bug: https://bugs.gentoo.org/833158
Closes: https://bugs.gentoo.org/831357
Closes: https://bugs.gentoo.org/832862
Closes: https://bugs.gentoo.org/821247
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/opencolorio-2.1.1-imath-openexr-3.patch | 75 ----------------------
...2.1.1-r3.ebuild => opencolorio-2.1.1-r4.ebuild} | 4 --
2 files changed, 79 deletions(-)
diff --git a/media-libs/opencolorio/files/opencolorio-2.1.1-imath-openexr-3.patch b/media-libs/opencolorio/files/opencolorio-2.1.1-imath-openexr-3.patch
deleted file mode 100644
index bf606889865d..000000000000
--- a/media-libs/opencolorio/files/opencolorio-2.1.1-imath-openexr-3.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-diff --git a/share/cmake/modules/FindImath.cmake b/share/cmake/modules/FindImath.cmake
-index 44a55e8..8a2d7ca 100644
---- a/share/cmake/modules/FindImath.cmake
-+++ b/share/cmake/modules/FindImath.cmake
-@@ -49,6 +49,7 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
- find_path(Imath_INCLUDE_DIR
- NAMES
- Imath/ImathConfig.h
-+ Imath-3/IMathConfig.h
- HINTS
- ${Imath_ROOT}
- ${PC_Imath_INCLUDE_DIRS}
-@@ -90,8 +91,8 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
-
- # Get version from config header file
- if(Imath_INCLUDE_DIR)
-- if(EXISTS "${Imath_INCLUDE_DIR}/Imath/ImathConfig.h")
-- set(_Imath_CONFIG "${Imath_INCLUDE_DIR}/Imath/ImathConfig.h")
-+ if(EXISTS "${Imath_INCLUDE_DIR}/Imath-3/ImathConfig.h")
-+ set(_Imath_CONFIG "${Imath_INCLUDE_DIR}/Imath-3/ImathConfig.h")
- endif()
- endif()
-
-diff --git a/src/utils/Half.h.in b/src/utils/Half.h.in
-index 3784341..237f3ed 100644
---- a/src/utils/Half.h.in
-+++ b/src/utils/Half.h.in
-@@ -8,7 +8,7 @@
- #define OCIO_USE_IMATH_HALF @OCIO_USE_IMATH_HALF@
-
- #if OCIO_USE_IMATH_HALF
--# include <Imath/half.h>
-+# include <Imath-3/half.h>
- #else
- # include <OpenEXR/half.h>
- #endif
-diff --git a/vendor/aftereffects/vc/vc15/utils/Half.h b/vendor/aftereffects/vc/vc15/utils/Half.h
-index 5035750..5144e72 100644
---- a/vendor/aftereffects/vc/vc15/utils/Half.h
-+++ b/vendor/aftereffects/vc/vc15/utils/Half.h
-@@ -8,7 +8,7 @@
- #define OCIO_USE_IMATH_HALF 0
-
- #if OCIO_USE_IMATH_HALF
--# include <Imath/half.h>
-+# include <Imath-3/half.h>
- #else
- # include <OpenEXR/half.h>
- #endif
-diff --git a/vendor/aftereffects/xcode/xcode12/utils/Half.h b/vendor/aftereffects/xcode/xcode12/utils/Half.h
-index 5035750..5144e72 100644
---- a/vendor/aftereffects/xcode/xcode12/utils/Half.h
-+++ b/vendor/aftereffects/xcode/xcode12/utils/Half.h
-@@ -8,7 +8,7 @@
- #define OCIO_USE_IMATH_HALF 0
-
- #if OCIO_USE_IMATH_HALF
--# include <Imath/half.h>
-+# include <Imath-3/half.h>
- #else
- # include <OpenEXR/half.h>
- #endif
-diff --git a/vendor/aftereffects/xcode/xcode9/utils/Half.h b/vendor/aftereffects/xcode/xcode9/utils/Half.h
-index 5035750..5144e72 100644
---- a/vendor/aftereffects/xcode/xcode9/utils/Half.h
-+++ b/vendor/aftereffects/xcode/xcode9/utils/Half.h
-@@ -8,7 +8,7 @@
- #define OCIO_USE_IMATH_HALF 0
-
- #if OCIO_USE_IMATH_HALF
--# include <Imath/half.h>
-+# include <Imath-3/half.h>
- #else
- # include <OpenEXR/half.h>
- #endif
diff --git a/media-libs/opencolorio/opencolorio-2.1.1-r3.ebuild b/media-libs/opencolorio/opencolorio-2.1.1-r4.ebuild
similarity index 98%
rename from media-libs/opencolorio/opencolorio-2.1.1-r3.ebuild
rename to media-libs/opencolorio/opencolorio-2.1.1-r4.ebuild
index 65a48f36c3c7..f90a88c6c238 100644
--- a/media-libs/opencolorio/opencolorio-2.1.1-r3.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.1.1-r4.ebuild
@@ -59,10 +59,6 @@ RESTRICT="test"
CMAKE_BUILD_TYPE=RelWithDebInfo
-PATCHES=(
- "${FILESDIR}"/${PN}-2.1.1-imath-openexr-3.patch
-)
-
pkg_setup() {
use python && python-single-r1_pkg_setup
}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/
@ 2022-05-07 7:17 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2022-05-07 7:17 UTC (permalink / raw
To: gentoo-commits
commit: 16594ec389119cfd9c6058b5b00972b80cd532d7
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 7 07:08:56 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 7 07:17:00 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16594ec3
media-libs/opencolorio: fix build with GCC 12
Closes: https://bugs.gentoo.org/841479
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch | 14 ++++++++++++++
media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild | 4 ++++
2 files changed, 18 insertions(+)
diff --git a/media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch b/media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch
new file mode 100644
index 000000000000..0bf00862e51b
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-2.1.1-gcc12.patch
@@ -0,0 +1,14 @@
+https://src.fedoraproject.org/rpms/OpenColorIO/raw/rawhide/f/OCIO-strlen.patch
+https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/4fa94918c2cf572dcaf61ca07016f3b5c231c14c
+https://bugs.gentoo.org/841479
+--- a/src/OpenColorIO/FileRules.cpp
++++ b/src/OpenColorIO/FileRules.cpp
+@@ -3,6 +3,7 @@
+
+ #include <algorithm>
+ #include <cctype>
++#include <cstring>
+ #include <map>
+ #include <regex>
+ #include <sstream>
+
diff --git a/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild b/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
index 942486329016..b8d6102d7296 100644
--- a/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.1.1-r7.ebuild
@@ -55,6 +55,10 @@ RESTRICT="test"
CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=(
+ "${FILESDIR}"/${P}-gcc12.patch
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/
@ 2022-06-06 1:25 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2022-06-06 1:25 UTC (permalink / raw
To: gentoo-commits
commit: 98e9e578139ff41ae4f18ce00fe81d19c22142dc
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 01:22:46 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 01:24:43 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e9e578
media-libs/opencolorio: drop 1.1.1-r3, 2.0.1-r2, 2.0.3, 2.1.1-r2
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencolorio/Manifest | 3 -
.../files/opencolorio-1.1.0-remove-Werror.patch | 17 ---
...1.1.0-remove-building-of-bundled-programs.patch | 154 ---------------------
...nstallDirs-and-fix-cmake-install-location.patch | 102 --------------
.../files/opencolorio-1.1.0-yaml-cpp-0.6.patch | 54 --------
...ecific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch | 38 -----
.../opencolorio-1.1.1-fix-self-assign-clang.patch | 14 --
.../files/opencolorio-1.1.1-no-werror.patch | 12 --
.../opencolorio-1.1.1-yaml-cpp-boost-check.patch | 35 -----
media-libs/opencolorio/opencolorio-1.1.1-r3.ebuild | 106 --------------
media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild | 96 -------------
media-libs/opencolorio/opencolorio-2.0.3.ebuild | 97 -------------
media-libs/opencolorio/opencolorio-2.1.1-r2.ebuild | 100 -------------
13 files changed, 828 deletions(-)
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 1cfa23094bad..fbccb7669120 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,5 +1,2 @@
-DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B f5642f08db84f2b8da44d0dbf58313c78263496fc6f1f209b93fd303bbf9477033317b44eb8bb2b13a70afa19422f4fa312d52a3fa6598031a2aa50b33bbfccf SHA512 bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
-DIST opencolorio-2.0.1.tar.gz 9945107 BLAKE2B cb4b152205642abd847b7263db838dbb922004017b9f19f7b2bd81d97f64e6f7d008c5a3f734475f510180ae9cc3a84688631e69c0587e0c77599b75b07d9159 SHA512 5787cc4cadb0a1832c925712ca0dfef6e843082b9461460e1798326c6fceaa97bee78e5298651e6a8a3662b348eab5ab9791e94c3efcac337da07229fb559338
-DIST opencolorio-2.0.3.tar.gz 10813503 BLAKE2B a853f2a39b4c3c0005056f0278355f01a8d62ec90054d3f1ce29501ce8fc96628d68eb3d942bb0cc33c71dcaa1a7421684bdd79b190a5eda5c5b5c6b9190017c SHA512 cb8d6d4e2481bfe9449f665ff888ad6ffb2d2e82f1a132b7cd3a74c88b2084f469c362511e57b964d3aee7c1badd41422640ab3a857402fa6a90c8bdf4cc60bb
DIST opencolorio-2.1.1.tar.gz 11013141 BLAKE2B ffece30b9f37acd10665a716d519c9807f6398e5e59baedd194376a1424a6d875781c027d998567b2a241da6388a780c94d95237b0b4d64b836cc5ccccd4383c SHA512 86585ec860d460b158f24efb82f202deced7ce96a6bfefd42f39cad9c112add68cca6935f383f5d718c07fe1c121d8ed8b0d2069321f1dafb8ce68b49bc75194
DIST opencolorio-2.1.2.tar.gz 11021014 BLAKE2B 2612c31c88a86255b3b0389241649aaaf3754f065eec57e8438d3b594d9f8fcac81c71fe06cf0acf0680e40d0fbe019ad16a34a1371a7a3a57a21017f5efb463 SHA512 594e808fb1c175d5b14eb540be0dfb6f41cd37b5bf7df8c2d24d44dfe4986643ea68e52d0282eb3b25283489789001a57a201de1eecc1560fc9461780c7da353
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.0-remove-Werror.patch b/media-libs/opencolorio/files/opencolorio-1.1.0-remove-Werror.patch
deleted file mode 100644
index 2814f703f81d..000000000000
--- a/media-libs/opencolorio/files/opencolorio-1.1.0-remove-Werror.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/pyglue/CMakeLists.txt b/src/pyglue/CMakeLists.txt
-index a90ca1c..35de89a 100644
---- a/src/pyglue/CMakeLists.txt
-+++ b/src/pyglue/CMakeLists.txt
-@@ -22,9 +22,9 @@ endif()
-
- # Process all warnings as errors
- # Unfortunately Windows still has a warning
--if(UNIX)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
--endif()
-+#if(UNIX)
-+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
-+#endif()
-
- find_package(PythonLibs)
- if(NOT PYTHONLIBS_FOUND)
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.0-remove-building-of-bundled-programs.patch b/media-libs/opencolorio/files/opencolorio-1.1.0-remove-building-of-bundled-programs.patch
deleted file mode 100644
index 9041677c9ce4..000000000000
--- a/media-libs/opencolorio/files/opencolorio-1.1.0-remove-building-of-bundled-programs.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From 967369b36c9684d7ffb73a926c442d8991a3afef Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Mon, 15 Jan 2018 13:09:31 +0000
-Subject: [PATCH 3/3] Remove building of bundled programs
-
----
- docs/CMakeLists.txt | 98 ++---------------------------------------------------
- 1 file changed, 3 insertions(+), 95 deletions(-)
-
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index a822a19..d588139 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -1,90 +1,4 @@
-
--###############################################################################
--### External Doc Apps ###
--
--if (WIN32)
-- # Workaround to mimic *nix '> PYTHONPATH=XXX CMD'
-- # on windows, it becomes '> set PYTHONPATH=XXX \n call CMD'
-- # '\n' is here because '\\&' does not work.
-- set(PYT_PRE_CMD set PYTHONPATH=${PYTHONPATH} "\n" call )
-- # Unfortunately some windows tools require to have
-- # the paths with the '\' (not working with '//').
-- set(PYT_LIB_OUTPUT ${EXTDIST_ROOT})
-- string(REGEX REPLACE "/" "\\\\" PYT_LIB_OUTPUT ${PYT_LIB_OUTPUT})
-- set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH})
-- string(REGEX REPLACE "/" "\\\\" PYT_EXTDIST_BINPATH ${PYT_EXTDIST_BINPATH})
--else()
-- set(PYT_PRE_CMD PYTHONPATH=${PYTHONPATH})
-- set(PYT_LIB_OUTPUT ${EXTDIST_ROOT})
-- set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH})
--endif()
--
--# setuptools
--# https://pypi.python.org/pypi/setuptools
--set(SETUPTOOLS_VERSION 1.1.6)
--
--ExternalProject_Add(setuptools
-- URL ${CMAKE_SOURCE_DIR}/ext/setuptools-${SETUPTOOLS_VERSION}.tar.gz
-- BUILD_IN_SOURCE 1
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
-- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
-- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/setuptools-prefix/src/setuptools
--)
--
--# docutils
--# https://pypi.python.org/pypi/docutils
--set(DOCUTILS_VERSION 0.11)
--ExternalProject_Add(docutils
-- DEPENDS setuptools
-- URL ${CMAKE_SOURCE_DIR}/ext/docutils-${DOCUTILS_VERSION}.tar.gz
-- BUILD_IN_SOURCE 1
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
-- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
-- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docutils-prefix/src/docutils
--)
--
--# jinja2
--# https://pypi.python.org/pypi/Jinja2
--set(JINJA2_VERSION 2.7.1)
--ExternalProject_Add(Jinja2
-- DEPENDS setuptools
-- URL ${CMAKE_SOURCE_DIR}/ext/Jinja2-${JINJA2_VERSION}.tar.gz
-- BUILD_IN_SOURCE 1
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
-- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
-- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Jinja2-prefix/src/Jinja2
--)
--
--# Pygments
--# https://pypi.python.org/pypi/Pygments
--set(PYGMENTS_VERSION 1.6)
--ExternalProject_Add(Pygments
-- DEPENDS setuptools
-- URL ${CMAKE_SOURCE_DIR}/ext/Pygments-${PYGMENTS_VERSION}.tar.gz
-- BUILD_IN_SOURCE 1
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
-- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
-- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Pygments-prefix/src/Pygments
--)
--
--# sphinx
--# https://pypi.python.org/pypi/Sphinx
--set(SPHINX_VERSION 1.2b3)
--ExternalProject_Add(Sphinx
-- DEPENDS setuptools docutils Jinja2 Pygments
-- URL ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.tar.gz
-- PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch
-- BUILD_IN_SOURCE 1
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
-- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-scripts=${PYT_EXTDIST_BINPATH}
-- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Sphinx-prefix/src/Sphinx
--)
--
- ###############################################################################
- ### Create Doc Targets ###
-
-@@ -122,7 +36,7 @@ else()
- endif()
-
- add_custom_target(doc ALL
-- COMMAND ${PYT_PRE_CMD} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
-+ COMMAND sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
- DEPENDS
- ${DEPLIBS}
- ${CMAKE_BINARY_DIR}/docs/conf.py
-@@ -131,11 +45,7 @@ add_custom_target(doc ALL
- developers/api/OpenColorTypes.rst
- ${RSTDOC_OUTPUT}
- COMMENT "Building html docs"
- SOURCES ${DOCFILES})
--
--# note: ExternalProject will not build when added to a add_custom_target this
--# works around this problem. This seems to be fixed in the cmake ^HEAD
--add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
- DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-@@ -146,8 +56,8 @@ find_package(LATEX)
- find_package(LATEX)
- if(PDFLATEX_COMPILER)
-
-- add_custom_target(latex
-- COMMAND ${PYT_PRE_CMD} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
-+ add_custom_target(latex ALL
-+ COMMAND sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
- DEPENDS
- OpenColorIO
- ${CMAKE_BINARY_DIR}/docs/conf.py
-@@ -156,14 +66,12 @@ if(PDFLATEX_COMPILER)
- ${RSTDOC_OUTPUT}
- COMMENT "Building latex doc"
- SOURCES ${DOCFILES})
-- add_dependencies(latex Sphinx)
-
- add_custom_target(pdf ALL
- COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-latex
- COMMENT "Building pdf doc"
- SOURCES ${DOCFILES})
-- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
- DESTINATION ${CMAKE_INSTALL_DOCDIR})
---
-2.15.1
-
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch b/media-libs/opencolorio/files/opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch
deleted file mode 100644
index e4c6296f1d7f..000000000000
--- a/media-libs/opencolorio/files/opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From c43cc918c3e79e324f11ca47e95bfe36e9e0dd15 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Sun, 14 Jan 2018 19:59:31 +0000
-Subject: [PATCH] Add GNUInstallDirs variables and fix install location for
- cmake files
-
-GNUInstallDirs is supported on all platforms and variables are set
-to the standard GNU locations.
-
-This patch corrects the location where the CMake files are
-installed.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- CMakeLists.txt | 9 +++++----
- docs/CMakeLists.txt | 4 ++--
- export/pkgconfig/OpenColorIO.pc.in | 6 ++----
- 3 files changed, 9 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index b05c7e4..452fa1e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,6 +59,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
-
- enable_language(CXX)
-
-@@ -531,7 +532,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
- ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
-
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
-
- ###############################################################################
- ### CPACK ###
-@@ -596,7 +597,7 @@ if(TARGET OpenColorIO_STATIC)
- set(OCIO_STATIC_COMPILE_DEFINITIONS )
- endif()
- endif()
--install(EXPORT OpenColorIO DESTINATION cmake)
-+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
- file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- "
- get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
-@@ -608,7 +609,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
-
- ## targets libraries + associated definitions
- if(NOT TARGET OpenColorIO)
-- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
-+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
- if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
- message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
- set(OpenColorIO_LIBRARY OpenColorIO)
-@@ -646,4 +647,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
- message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
- "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
-diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
-index 3fd0299..a822a19 100644
---- a/docs/CMakeLists.txt
-+++ b/docs/CMakeLists.txt
-@@ -138,7 +138,7 @@ add_custom_target(doc ALL
- add_dependencies(doc Sphinx)
-
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
- PATTERN .* EXCLUDE
- )
-
-@@ -166,6 +166,6 @@ if(PDFLATEX_COMPILER)
- add_dependencies(pdf latex)
-
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
-
- endif()
-diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
-index 81ab4ce3..c4553a4f 100644
---- a/export/pkgconfig/OpenColorIO.pc.in
-+++ b/export/pkgconfig/OpenColorIO.pc.in
-@@ -1,7 +1,5 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
--includedir=${prefix}/include
--libdir=${exec_prefix}/lib@LIB_SUFFIX@
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-
- Name: OpenColorIO
- Description: A color management framework for visual effects and animation
---
-2.15.1
-
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.0-yaml-cpp-0.6.patch b/media-libs/opencolorio/files/opencolorio-1.1.0-yaml-cpp-0.6.patch
deleted file mode 100644
index 2094e1ed58b8..000000000000
--- a/media-libs/opencolorio/files/opencolorio-1.1.0-yaml-cpp-0.6.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-commit 8ce96cc5d590a1c094fb316968f2db8464f3be82
-Author: Joakim Nohlgård <joakim.nohlgard@eistec.se>
-Date: Fri Mar 30 13:47:28 2018 +0200
-
- OCIOYaml: Remove forward declarations to use system yaml-cpp headers
-
-diff --git a/src/core/OCIOYaml.cpp b/src/core/OCIOYaml.cpp
-index 68fcef6..8047d7e 100644
---- a/src/core/OCIOYaml.cpp
-+++ b/src/core/OCIOYaml.cpp
-@@ -30,43 +30,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
- #include <OpenColorIO/OpenColorIO.h>
-
--#ifndef WIN32
--
--// fwd declare yaml-cpp visibility
--#pragma GCC visibility push(hidden)
--namespace YAML {
-- class Exception;
-- class BadDereference;
-- class RepresentationException;
-- class EmitterException;
-- class ParserException;
-- class InvalidScalar;
-- class KeyNotFound;
-- template <typename T> class TypedKeyNotFound;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpace>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Config>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Exception>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::GpuShaderDesc>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ImageDesc>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Look>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Processor>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Transform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::AllocationTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::CDLTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpaceTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::DisplayTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ExponentTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::FileTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::GroupTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::LogTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::LookTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::MatrixTransform>;
-- template <> class TypedKeyNotFound<OCIO_NAMESPACE::TruelightTransform>;
--}
--#pragma GCC visibility pop
--
--#endif
--
- #ifdef WIN32
- #pragma warning( push )
- #pragma warning( disable: 4146 )
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.1-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch b/media-libs/opencolorio/files/opencolorio-1.1.1-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch
deleted file mode 100644
index 0f0fb4e649d6..000000000000
--- a/media-libs/opencolorio/files/opencolorio-1.1.1-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 80c08e5bee5bd9fc37a6aeff4b7b7bb8edb3c831 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Sun, 6 Jun 2021 20:42:48 +0200
-Subject: [PATCH] [Gentoo specific]OCIOMacros.cmake: remove LIB_SUFFIX
-
-We don't use LIB_SUFFIX for python's site-packages dir, so remove it
-from the PYTHON_VARIANT_PATH to ensure, python modules are installed
-to the correct location.
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- share/cmake/OCIOMacros.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/share/cmake/OCIOMacros.cmake b/share/cmake/OCIOMacros.cmake
-index b9fb239..0ce9e62 100644
---- a/share/cmake/OCIOMacros.cmake
-+++ b/share/cmake/OCIOMacros.cmake
-@@ -241,14 +241,14 @@ MACRO(OCIOFindPython)
- if(WIN32)
- set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/${PYTHON_UCS}/site-packages")
- else()
-- set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/python${PYTHON_VERSION}/${PYTHON_UCS}/site-packages")
-+ set(PYTHON_VARIANT_PATH "lib/python${PYTHON_VERSION}/${PYTHON_UCS}/site-packages")
- endif()
- else()
- # Ignore UCS value and install into lib/python2.6/site-packages dir
- if(WIN32)
- set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/site-packages")
- else()
-- set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/python${PYTHON_VERSION}/site-packages")
-+ set(PYTHON_VARIANT_PATH "lib/python${PYTHON_VERSION}/site-packages")
- endif()
- endif()
-
---
-2.31.1
-
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.1-fix-self-assign-clang.patch b/media-libs/opencolorio/files/opencolorio-1.1.1-fix-self-assign-clang.patch
deleted file mode 100644
index c6193277458f..000000000000
--- a/media-libs/opencolorio/files/opencolorio-1.1.1-fix-self-assign-clang.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://bugs.gentoo.org/754966
-https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/563
-Fixed upstream in a larger set of changes.
---- a/src/core/Config.cpp
-+++ b/src/core/Config.cpp
-@@ -330,7 +330,7 @@
- sanitytext_ = rhs.sanitytext_;
-
- cacheids_ = rhs.cacheids_;
-- cacheidnocontext_ = cacheidnocontext_;
-+ cacheidnocontext_ = rhs.cacheidnocontext_;
- }
- return *this;
- }
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.1-no-werror.patch b/media-libs/opencolorio/files/opencolorio-1.1.1-no-werror.patch
deleted file mode 100644
index df8fa2102534..000000000000
--- a/media-libs/opencolorio/files/opencolorio-1.1.1-no-werror.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-https://bugs.gentoo.org/786198
---- a/src/core/CMakeLists.txt
-+++ b/src/core/CMakeLists.txt
-@@ -23,8 +23,6 @@ if(WIN32)
- if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
- endif()
--else()
-- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
- endif()
-
- # SHARED
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.1-yaml-cpp-boost-check.patch b/media-libs/opencolorio/files/opencolorio-1.1.1-yaml-cpp-boost-check.patch
deleted file mode 100644
index 0f3c3e3ba19b..000000000000
--- a/media-libs/opencolorio/files/opencolorio-1.1.1-yaml-cpp-boost-check.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-This check is redundant. The appropriate versions of yaml-cpp
-already had a dependency on Boost, but that's not even the case anymore.
-
-Check has been dropped upstream since.
-https://bugs.gentoo.org/747553
-----
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index eb20913..434e38b 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -272,24 +272,6 @@ if(USE_EXTERNAL_YAML)
- mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND)
-
- if(YAML_CPP_FOUND)
-- if(YAML_CPP_VERSION VERSION_GREATER "0.5.0")
-- # Need to also get the boost headers here, as yaml-cpp 0.5.0+ requires them.
-- # Don't bother doing this step if we are already including the boost headers for shared_ptr
-- if(NOT OCIO_USE_BOOST_PTR)
-- set(Boost_ADDITIONAL_VERSIONS "1.49" "1.45" "1.44" "1.43" "1.43.0" "1.42"
-- "1.42.0" "1.41" "1.41.0" "1.40"
-- "1.40.0" "1.39" "1.39.0" "1.38"
-- "1.38.0" "1.37" "1.37.0" "1.34.1"
-- "1_34_1")
-- set(Boost_USE_MULTITHREADED ON)
-- find_package(Boost 1.34)
-- if(NOT Boost_FOUND)
-- message(FATAL_ERROR "Error: Detected system yaml-cpp version ${YAML_CPP_VERSION} is greater than 0.5.0, and therefore requires boost, but a boost installation could not be found.")
-- endif()
--
-- set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${Boost_INCLUDE_DIR})
-- endif()
-- endif()
- set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${YAML_CPP_INCLUDE_DIRS})
- else(YAML_CPP_FOUND)
- message(FATAL_ERROR "ERROR: System yaml-cpp library was not found. Make sure the library is installed and the pkg-config file exists.")
diff --git a/media-libs/opencolorio/opencolorio-1.1.1-r3.ebuild b/media-libs/opencolorio/opencolorio-1.1.1-r3.ebuild
deleted file mode 100644
index 4a6a5c7dd95f..000000000000
--- a/media-libs/opencolorio/opencolorio-1.1.1-r3.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9} )
-
-inherit cmake python-single-r1
-
-DESCRIPTION="color management framework for visual effects and animation"
-HOMEPAGE="https://opencolorio.org/"
-SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/OpenColorIO-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
-REQUIRED_USE="
- doc? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Not compatible with oiio 2.3
-# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
-# bug #821073
-RDEPEND="
- <dev-cpp/yaml-cpp-0.7.0:=
- dev-libs/tinyxml
- opengl? (
- media-libs/lcms:2
- <media-libs/openimageio-2.3:=
- media-libs/glew:=
- media-libs/freeglut
- virtual/opengl
- )
- python? ( ${PYTHON_DEPS} )
-"
-
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- doc? (
- $(python_gen_cond_dep '
- dev-python/sphinx[${PYTHON_USEDEP}]
- ')
- )
-"
-
-# Restricting tests, bugs #439790 and #447908
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch"
- "${FILESDIR}/${PN}-1.1.0-remove-building-of-bundled-programs.patch"
- "${FILESDIR}/${PN}-1.1.0-yaml-cpp-0.6.patch"
- "${FILESDIR}/${PN}-1.1.0-remove-Werror.patch"
- "${FILESDIR}/${PN}-1.1.1-yaml-cpp-boost-check.patch"
- "${FILESDIR}/${P}-fix-self-assign-clang.patch"
- "${FILESDIR}/${P}-no-werror.patch"
- "${FILESDIR}/${P}-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch"
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- use python && python_fix_shebang .
-}
-
-src_configure() {
- # Missing features:
- # - Truelight and Nuke are not in portage for now, so their support are disabled
- # - Java bindings was not tested, so disabled
- # Notes:
- # - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
- # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
- local mycmakeargs=(
- -DOCIO_BUILD_JNIGLUE=OFF
- -DOCIO_BUILD_NUKE=OFF
- -DOCIO_BUILD_SHARED=ON
- -DOCIO_BUILD_STATIC=$(usex static-libs)
- -DOCIO_STATIC_JNIGLUE=OFF
- -DOCIO_BUILD_TRUELIGHT=OFF
- -DUSE_EXTERNAL_LCMS=ON
- -DUSE_EXTERNAL_TINYXML=ON
- -DUSE_EXTERNAL_YAML=ON
- -DOCIO_BUILD_DOCS=$(usex doc)
- -DOCIO_BUILD_APPS=$(usex opengl)
- -DOCIO_BUILD_PYGLUE=$(usex python)
- -DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
- -DOCIO_BUILD_TESTS=$(usex test)
- )
-
- if use python; then
- mycmakeargs+=(
- -DPYTHON=${PYTHON}
- -DPYTHON_LIBRARY=$(python_get_library_path)
- )
- fi
-
- use doc && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON ) # broken
- cmake_src_configure
-}
diff --git a/media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild b/media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild
deleted file mode 100644
index 8b6fd27357c6..000000000000
--- a/media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="A color management framework for visual effects and animation"
-HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO"
-SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/OpenColorIO-${PV}"
-
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
-LICENSE="BSD"
-SLOT="0"
-IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
-REQUIRED_USE="
- doc? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Not compatible with oiio 2.3
-# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
-# bug #821073
-RDEPEND="
- dev-cpp/pystring
- dev-python/pybind11
- media-libs/ilmbase
- dev-cpp/yaml-cpp:=
- dev-libs/tinyxml
- opengl? (
- media-libs/lcms:2
- <media-libs/openimageio-2.3:=
- media-libs/glew:=
- media-libs/freeglut
- virtual/opengl
- )
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=dev-util/cmake-3.16.2-r1
- virtual/pkgconfig
- doc? (
- $(python_gen_cond_dep '
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/testresources[${PYTHON_USEDEP}]
- ')
- )
-"
-
-# Restricting tests, bugs #439790 and #447908
-RESTRICT="test"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- sed -i -e "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
- sed -i -e "s|ARCHIVE DESTINATION lib|ARCHIVE DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
-}
-
-src_configure() {
- # Missing features:
- # - Truelight and Nuke are not in portage for now, so their support are disabled
- # - Java bindings was not tested, so disabled
- # Notes:
- # - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
- # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
- -DOCIO_BUILD_STATIC=$(usex static-libs)
- -DOCIO_BUILD_DOCS=$(usex doc)
- -DOCIO_BUILD_APPS=$(usex opengl)
- -DOCIO_BUILD_PYTHON=$(usex python)
- -DOCIO_BUILD_JAVA=OFF
- -DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
- -DOCIO_BUILD_TESTS=$(usex test)
- -DOCIO_BUILD_GPU_TESTS=$(usex test)
- -DOCIO_BUILD_FROZEN_DOCS=$(usex doc)
- -DOCIO_INSTALL_EXT_PACKAGES=NONE
- )
-
- # We need this to work around asserts that can trigger even in proper use cases.
- # See https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1235
- append-flags -DNDEBUG
-
- cmake_src_configure
-}
diff --git a/media-libs/opencolorio/opencolorio-2.0.3.ebuild b/media-libs/opencolorio/opencolorio-2.0.3.ebuild
deleted file mode 100644
index 9897f5ded789..000000000000
--- a/media-libs/opencolorio/opencolorio-2.0.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="A color management framework for visual effects and animation"
-HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO"
-SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/OpenColorIO-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
-REQUIRED_USE="
- doc? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Not compatible with oiio 2.3
-# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
-# bug #821073
-RDEPEND="
- dev-cpp/pystring
- dev-python/pybind11
- media-libs/ilmbase
- dev-cpp/yaml-cpp:=
- dev-libs/tinyxml
- opengl? (
- media-libs/lcms:2
- <media-libs/openimageio-2.3:=
- media-libs/glew:=
- media-libs/freeglut
- virtual/opengl
- )
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=dev-util/cmake-3.16.2-r1
- virtual/pkgconfig
- doc? (
- $(python_gen_cond_dep '
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/testresources[${PYTHON_USEDEP}]
- ')
- )
-"
-
-# Restricting tests, bugs #439790 and #447908
-RESTRICT="test"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- sed -i -e "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
- sed -i -e "s|ARCHIVE DESTINATION lib|ARCHIVE DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
-}
-
-src_configure() {
- # Missing features:
- # - Truelight and Nuke are not in portage for now, so their support are disabled
- # - Java bindings was not tested, so disabled
- # Notes:
- # - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
- # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
- local mycmakeargs=(
- -DBUILD_SHARED_LIBS=ON
- -DOCIO_BUILD_STATIC=$(usex static-libs)
- -DOCIO_BUILD_DOCS=$(usex doc)
- -DOCIO_BUILD_APPS=$(usex opengl)
- -DOCIO_BUILD_PYTHON=$(usex python)
- -DOCIO_PYTHON_VERSION="${EPYTHON/python/}"
- -DOCIO_BUILD_JAVA=OFF
- -DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
- -DOCIO_BUILD_TESTS=$(usex test)
- -DOCIO_BUILD_GPU_TESTS=$(usex test)
- -DOCIO_BUILD_FROZEN_DOCS=$(usex doc)
- -DOCIO_INSTALL_EXT_PACKAGES=NONE
- )
-
- # We need this to work around asserts that can trigger even in proper use cases.
- # See https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1235
- append-flags -DNDEBUG
-
- cmake_src_configure
-}
diff --git a/media-libs/opencolorio/opencolorio-2.1.1-r2.ebuild b/media-libs/opencolorio/opencolorio-2.1.1-r2.ebuild
deleted file mode 100644
index 579e0b7623fa..000000000000
--- a/media-libs/opencolorio/opencolorio-2.1.1-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit cmake flag-o-matic python-single-r1
-
-DESCRIPTION="A color management framework for visual effects and animation"
-HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO"
-SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/OpenColorIO-${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
-REQUIRED_USE="
- doc? ( python )
- python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-# Not compatible with oiio 2.3
-# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
-# bug #821073
-# 2.1.1 should be?
-RDEPEND="
- dev-cpp/pystring
- dev-python/pybind11
- >=dev-cpp/yaml-cpp-0.7.0:=
- dev-libs/tinyxml
- media-libs/ilmbase:=
- opengl? (
- media-libs/lcms:2
- media-libs/openimageio:=
- media-libs/glew:=
- media-libs/freeglut
- virtual/opengl
- )
- python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- >=dev-util/cmake-3.16.2-r1
- virtual/pkgconfig
- doc? (
- $(python_gen_cond_dep '
- dev-python/sphinx[${PYTHON_USEDEP}]
- dev-python/testresources[${PYTHON_USEDEP}]
- ')
- )
-"
-
-# Restricting tests, bugs #439790 and #447908
-RESTRICT="test"
-
-CMAKE_BUILD_TYPE=RelWithDebInfo
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- sed -i -e "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
- sed -i -e "s|ARCHIVE DESTINATION lib|ARCHIVE DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
-}
-
-src_configure() {
- # Missing features:
- # - Truelight and Nuke are not in portage for now, so their support are disabled
- # - Java bindings was not tested, so disabled
- # Notes:
- # - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
- # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
- local mycmakeargs=(
- # Don't use imath yet, needs some poking to find the right headers
- -DOCIO_USE_OPENEXR_HALF=ON
- -DBUILD_SHARED_LIBS=ON
- -DOCIO_BUILD_STATIC=$(usex static-libs)
- -DOCIO_BUILD_DOCS=$(usex doc)
- -DOCIO_BUILD_APPS=$(usex opengl)
- -DOCIO_BUILD_PYTHON=$(usex python)
- -DOCIO_PYTHON_VERSION="${EPYTHON/python/}"
- -DOCIO_BUILD_JAVA=OFF
- -DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
- -DOCIO_BUILD_TESTS=$(usex test)
- -DOCIO_BUILD_GPU_TESTS=$(usex test)
- -DOCIO_BUILD_FROZEN_DOCS=$(usex doc)
- -DOCIO_INSTALL_EXT_PACKAGES=NONE
- )
-
- # We need this to work around asserts that can trigger even in proper use cases.
- # See https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1235
- append-flags -DNDEBUG
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/
@ 2022-09-01 2:06 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2022-09-01 2:06 UTC (permalink / raw
To: gentoo-commits
commit: 855ef95061367779af0f38f7afd291af21616403
Author: brahmajit das <listout <AT> protonmail <DOT> com>
AuthorDate: Tue Aug 23 09:25:51 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 1 02:05:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=855ef950
media-libs/opencolorio: Fix strtol_l on musl
Fix strtol_l missing on musl. On musl libc use strtol
Taken from Alpine Linux, please refer:
https://git.alpinelinux.org/aports/tree/community/opencolorio/0002-fix-strtol.patch
Closes: https://bugs.gentoo.org/829453
Signed-off-by: brahmajit das <listout <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/26855
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/opencolorio-2.1.2-musl-strtol.patch | 27 ++++++++++++++++++++++
media-libs/opencolorio/opencolorio-2.1.2.ebuild | 1 +
2 files changed, 28 insertions(+)
diff --git a/media-libs/opencolorio/files/opencolorio-2.1.2-musl-strtol.patch b/media-libs/opencolorio/files/opencolorio-2.1.2-musl-strtol.patch
new file mode 100644
index 000000000000..87059614ff03
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-2.1.2-musl-strtol.patch
@@ -0,0 +1,27 @@
+# Fix strtol_l missing on musl. On musl libc use strtol
+# Taken from Alpine Linux, please refer:
+# https://git.alpinelinux.org/aports/tree/community/opencolorio/0002-fix-strtol.patch?id=dd7ba461824ab0618f0493cbb450b221fdc2513c
+# Please refer: https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1624
+--- a/src/utils/NumberUtils.h
++++ b/src/utils/NumberUtils.h
+@@ -68,7 +68,7 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ tempval = ::strtod_l(first, &endptr, loc.local);
+ #endif
+
+- if (errno != 0)
++ if (errno != 0 && errno != EINVAL)
+ {
+ return {first + (endptr - first), std::errc::result_out_of_range};
+ }
+@@ -139,8 +139,10 @@ really_inline from_chars_result from_chars(const char *first, const char *last,
+ long int
+ #ifdef _WIN32
+ tempval = _strtol_l(first, &endptr, 0, loc.local);
+-#else
++#elif defined(__GLIBC__)
+ tempval = ::strtol_l(first, &endptr, 0, loc.local);
++#else
++ tempval = ::strtol(first, &endptr, 0);
+ #endif
+
+ if (errno != 0)
diff --git a/media-libs/opencolorio/opencolorio-2.1.2.ebuild b/media-libs/opencolorio/opencolorio-2.1.2.ebuild
index 17b4b7fb8e1f..eda322b00de6 100644
--- a/media-libs/opencolorio/opencolorio-2.1.2.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.1.2.ebuild
@@ -55,6 +55,7 @@ RESTRICT="test"
PATCHES=(
"${FILESDIR}"/${PN}-2.1.1-gcc12.patch
+ "${FILESDIR}"/${PN}-2.1.2-musl-strtol.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/
@ 2023-07-19 20:59 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-07-19 20:59 UTC (permalink / raw
To: gentoo-commits
commit: 585ca5fdc0b38af79b53f68defb4deb4f735c356
Author: Paul Zander <negril.nx <AT> gmail <DOT> com>
AuthorDate: Wed Jun 28 12:39:38 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jul 19 20:59:16 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=585ca5fd
media-libs/opencolorio: add 2.2.1
add support for sys-libs/minizip-ng:4
Bug: https://bugs.gentoo.org/895714
Closes: https://bugs.gentoo.org/829604
Closes: https://bugs.gentoo.org/895714
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/31876
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/opencolorio/Manifest | 1 +
...ncolorio-2.2.1-adjust-python-installation.patch | 17 +++
.../opencolorio-2.2.1-support-minizip-ng-4.patch | 92 +++++++++++++++
media-libs/opencolorio/metadata.xml | 9 +-
media-libs/opencolorio/opencolorio-2.2.1.ebuild | 130 +++++++++++++++++++++
5 files changed, 248 insertions(+), 1 deletion(-)
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 0302db0fdbed..debed58d79d4 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1 +1,2 @@
DIST opencolorio-2.1.3.tar.gz 11024701 BLAKE2B bcd1eb6a74260f451e49ef40e729bfc4c354ab255d96c261fbf865c586f285fe876ed54b05276f3b6b25ece4fd261672fe1dd519041ffad77d7c78efc8cf161d SHA512 b26fcfa3ea12ab6e4b019a13ce79ebcfd215c674acb348f2d9f85f749b2a5beccd395ed1cc9954e4b3cb83a160b24a8d7d81994ac1d9ea8cfe074b81d6b8a061
+DIST opencolorio-2.2.1.tar.gz 11336775 BLAKE2B b463d6a0a7e7fec0a890fa8a0cd06ed269f925c5986dfb82eb53728a09d884c89e6c4dfe112706ce27351d4440909ff9680387028d1dc887e7d866b30c39c54f SHA512 d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9
diff --git a/media-libs/opencolorio/files/opencolorio-2.2.1-adjust-python-installation.patch b/media-libs/opencolorio/files/opencolorio-2.2.1-adjust-python-installation.patch
new file mode 100644
index 000000000000..6f023310eb8d
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-2.2.1-adjust-python-installation.patch
@@ -0,0 +1,17 @@
+From 5ca483b67404a9ba2230f2f03ff3255eceb3d2bc Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sun, 19 Feb 2023 23:14:44 +0100
+Subject: [PATCH] [Gentoo-specific] adjust python installation
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/src/bindings/python/CMakeLists.txt
++++ b/src/bindings/python/CMakeLists.txt
+@@ -230,7 +230,7 @@ target_compile_definitions(PyOpenColorIO
+ if(WIN32)
+ set(_Python_VARIANT_PATH "${CMAKE_INSTALL_LIBDIR}/site-packages")
+ else()
+- set(_Python_VARIANT_PATH "${CMAKE_INSTALL_LIBDIR}/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages")
++ set(_Python_VARIANT_PATH "${CMAKE_INSTALL_PREFIX}/lib/python${Python_VERSION_MAJOR}.${Python_VERSION_MINOR}/site-packages")
+ endif()
+
+ # Create an internal global variable to access it in another scope but not publicly visible
diff --git a/media-libs/opencolorio/files/opencolorio-2.2.1-support-minizip-ng-4.patch b/media-libs/opencolorio/files/opencolorio-2.2.1-support-minizip-ng-4.patch
new file mode 100644
index 000000000000..8ee4ceaf9970
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-2.2.1-support-minizip-ng-4.patch
@@ -0,0 +1,92 @@
+# From https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1806
+From d15ccddd4d20d66749577d7444de861112f6864c Mon Sep 17 00:00:00 2001
+From: Brad Smith <brad@comstyle.com>
+Date: Thu, 29 Jun 2023 09:57:28 -0400
+Subject: [PATCH] Add support for minizip-ng 4 API
+
+Signed-off-by: Brad Smith <brad@comstyle.com>
+---
+ src/OpenColorIO/OCIOZArchive.cpp | 22 +++++++++++++++++++++-
+ src/apps/ocioarchive/main.cpp | 4 ++++
+ 2 files changed, 25 insertions(+), 1 deletion(-)
+
+diff --git a/src/OpenColorIO/OCIOZArchive.cpp b/src/OpenColorIO/OCIOZArchive.cpp
+index 85fc7bb76..24d836e95 100644
+--- a/src/OpenColorIO/OCIOZArchive.cpp
++++ b/src/OpenColorIO/OCIOZArchive.cpp
+@@ -225,7 +225,11 @@ void archiveConfig(std::ostream & ostream, const Config & config, const char * c
+ std::string configStr = ss.str();
+
+ // Write zip to memory stream.
++#if MZ_VERSION_BUILD >= 040000
++ write_mem_stream = mz_stream_mem_create();
++#else
+ mz_stream_mem_create(&write_mem_stream);
++#endif
+ mz_stream_mem_set_grow_size(write_mem_stream, 128 * 1024);
+ mz_stream_open(write_mem_stream, NULL, MZ_OPEN_MODE_CREATE);
+
+@@ -237,7 +241,11 @@ void archiveConfig(std::ostream & ostream, const Config & config, const char * c
+ options.compress_level = ArchiveCompressionLevels::BEST;
+
+ // Create the writer handle.
++#if MZ_VERSION_BUILD >= 040000
++ archiver = mz_zip_writer_create();
++#else
+ mz_zip_writer_create(&archiver);
++#endif
+
+ // Archive options.
+ // Compression method
+@@ -332,7 +340,11 @@ void ExtractOCIOZArchive(const char * archivePath, const char * destination)
+ std::string outputDestination = pystring::os::path::normpath(destination);
+
+ // Create zip reader.
++#if MZ_VERSION_BUILD >= 040000
++ extracter = mz_zip_reader_create();
++#else
+ mz_zip_reader_create(&extracter);
++#endif
+
+ MinizipNgHandlerGuard extracterGuard(extracter, false, false);
+
+@@ -450,7 +462,11 @@ std::vector<uint8_t> getFileStringFromArchiveFile(const std::string & filepath,
+ std::vector<uint8_t> buffer;
+
+ // Create the reader object.
++#if MZ_VERSION_BUILD >= 040000
++ reader = mz_zip_reader_create();
++#else
+ mz_zip_reader_create(&reader);
++#endif
+
+ MinizipNgHandlerGuard extracterGuard(reader, false, true);
+
+@@ -510,7 +526,11 @@ void getEntriesMappingFromArchiveFile(const std::string & archivePath,
+ void *reader = NULL;
+
+ // Create the reader object.
++#if MZ_VERSION_BUILD >= 040000
++ reader = mz_zip_reader_create();
++#else
+ mz_zip_reader_create(&reader);
++#endif
+
+ MinizipNgHandlerGuard extracterGuard(reader, false, false);
+
+diff --git a/src/apps/ocioarchive/main.cpp b/src/apps/ocioarchive/main.cpp
+index 190cadee5..68054a6da 100644
+--- a/src/apps/ocioarchive/main.cpp
++++ b/src/apps/ocioarchive/main.cpp
+@@ -235,7 +235,11 @@ int main(int argc, const char **argv)
+ }
+
+ std::string path = args[0];
++#if MZ_VERSION_BUILD >= 040000
++ reader = mz_zip_reader_create();
++#else
+ mz_zip_reader_create(&reader);
++#endif
+ struct tm tmu_date;
+
+ err = mz_zip_reader_open_file(reader, path.c_str());
diff --git a/media-libs/opencolorio/metadata.xml b/media-libs/opencolorio/metadata.xml
index 8c99b35a00f1..6485e6974262 100644
--- a/media-libs/opencolorio/metadata.xml
+++ b/media-libs/opencolorio/metadata.xml
@@ -2,7 +2,14 @@
<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<!-- maintainer-needed -->
- <longdescription lang="en">OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation.</longdescription>
+ <longdescription lang="en">
+ OpenColorIO (OCIO) is a complete color management solution geared
+ towards motion picture production with an emphasis on visual effects
+ and computer animation.
+ </longdescription>
+ <use>
+ <flag name="apps">Build the OCIO command line apps</flag>
+ </use>
<upstream>
<remote-id type="github">AcademySoftwareFoundation/OpenColorIO</remote-id>
</upstream>
diff --git a/media-libs/opencolorio/opencolorio-2.2.1.ebuild b/media-libs/opencolorio/opencolorio-2.2.1.ebuild
new file mode 100644
index 000000000000..ab405183a85e
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-2.2.1.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit cmake python-single-r1 virtualx
+
+DESCRIPTION="A color management framework for visual effects and animation"
+HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO"
+SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/OpenColorIO-${PV}"
+
+LICENSE="BSD"
+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 static-libs test"
+# TODO: drop opengl? It does nothing without building either the apps or the testsuite
+REQUIRED_USE="
+ apps? ( opengl )
+ doc? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ test? ( opengl )
+"
+
+RDEPEND="
+ dev-cpp/pystring
+ >=dev-cpp/yaml-cpp-0.7.0:=
+ dev-libs/expat
+ >=dev-libs/imath-3.1.5:=
+ sys-libs/minizip-ng
+ sys-libs/zlib
+ apps? (
+ media-libs/lcms:2
+ >=media-libs/openexr-3.1.5:=
+ )
+ opengl? (
+ media-libs/freeglut
+ media-libs/glew:=
+ media-libs/libglvnd
+ )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
+ )
+"
+DEPEND="${RDEPEND}"
+# TODO: OSL tests would need OIIO, leading to a circular dependency. If OIIO
+# isn't found this test will be skipped (automagic if found?)
+BDEPEND="
+ virtual/pkgconfig
+ doc? (
+ app-doc/doxygen
+ $(python_gen_cond_dep '
+ dev-python/breathe[${PYTHON_USEDEP}]
+ dev-python/recommonmark[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/sphinx-tabs[${PYTHON_USEDEP}]
+ dev-python/testresources[${PYTHON_USEDEP}]
+ ')
+ )
+ opengl? (
+ media-libs/freeglut
+ media-libs/glew:=
+ media-libs/libglvnd
+ )
+"
+# test? (
+# >=media-libs/openimageio-2.2.14
+# >=media-libs/osl-1.11
+# )
+# "
+
+# Restricting tests, bugs #439790 and #447908
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.2.1-adjust-python-installation.patch
+ "${FILESDIR}"/${PN}-2.2.1-support-minizip-ng-4.patch
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # Avoid automagic test dependency on OSL, bug #833933
+ # Can cause problems during e.g. OpenEXR unsplitting migration
+ cmake_run_in tests cmake_comment_add_subdirectory osl
+}
+
+src_configure() {
+ # Missing features:
+ # - Truelight and Nuke are not in portage for now, so their support are disabled
+ # - Java bindings was not tested, so disabled
+ # Notes:
+ # - OpenImageIO or OpenEXR (default) is required for building ociodisplay and
+ # 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)
+ -DOCIO_BUILD_GPU_TESTS=$(usex test)
+ -DOCIO_BUILD_JAVA=OFF
+ -DOCIO_BUILD_PYTHON=$(usex python)
+ -DOCIO_BUILD_TESTS=$(usex test)
+ -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ -DOCIO_USE_OIIO_CMAKE_CONFIG=ON
+ -DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
+ )
+ use python && mycmakeargs+=(
+ -DOCIO_PYTHON_VERSION="${EPYTHON/python/}"
+ -DPython_EXECUTABLE="${PYTHON}"
+ -DPYTHON_VARIANT_PATH=$(python_get_sitedir)
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ virtx cmake_src_test
+}
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/
@ 2023-10-28 21:46 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2023-10-28 21:46 UTC (permalink / raw
To: gentoo-commits
commit: bd8b5905e24067d0d4679e8b4e945fe5396b0442
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Sat Oct 28 09:29:58 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Oct 28 21:43:56 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd8b5905
media-libs/opencolorio: fix 2.2.1 doc with newer doxygen
Closes: https://bugs.gentoo.org/916329
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../opencolorio-2.2.1-support-doxygen-1.9.7.patch | 184 +++++++++++++++++++++
media-libs/opencolorio/opencolorio-2.2.1.ebuild | 1 +
2 files changed, 185 insertions(+)
diff --git a/media-libs/opencolorio/files/opencolorio-2.2.1-support-doxygen-1.9.7.patch b/media-libs/opencolorio/files/opencolorio-2.2.1-support-doxygen-1.9.7.patch
new file mode 100644
index 000000000000..b3b4db802e96
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-2.2.1-support-doxygen-1.9.7.patch
@@ -0,0 +1,184 @@
+https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/94da59daeb4647faa9b134665ad156f37cfa021d
+
+From 94da59daeb4647faa9b134665ad156f37cfa021d Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Achard?= <remiachard@gmail.com>
+Date: Tue, 30 May 2023 19:33:25 +0100
+Subject: [PATCH] Fix documentation build on Doxygen 1.9.7
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Rémi Achard <remiachard@gmail.com>
+---
+ include/OpenColorIO/OpenColorIO.h | 29 ++++++----------------------
+ include/OpenColorIO/OpenColorTypes.h | 25 +++++-------------------
+ 2 files changed, 11 insertions(+), 43 deletions(-)
+
+diff --git a/include/OpenColorIO/OpenColorIO.h b/include/OpenColorIO/OpenColorIO.h
+index 313b9c631..1352771ff 100644
+--- a/include/OpenColorIO/OpenColorIO.h
++++ b/include/OpenColorIO/OpenColorIO.h
+@@ -733,11 +733,8 @@ class OCIOEXPORT Config
+ const char * getRoleColorSpace(const char * roleName) const noexcept;
+
+ /**
+- * \defgroup Methods related to displays and views.
+- * @{
+- */
+-
+- /**
++ * Methods related to displays and views.
++ *
+ * The following methods only manipulate active displays and views. Active
+ * displays and views are defined from an env. variable or from the config file.
+ *
+@@ -854,11 +851,8 @@ class OCIOEXPORT Config
+ /// Clear all the displays.
+ void clearDisplays();
+
+- /** @} */
+-
+ /**
+- * \defgroup Methods related to the Virtual Display.
+- * @{
++ * Methods related to the Virtual Display.
+ *
+ * ... (See descriptions for the non-virtual methods above.)
+ *
+@@ -938,8 +932,6 @@ class OCIOEXPORT Config
+ */
+ int instantiateDisplayFromICCProfile(const char * ICCProfileFilepath);
+
+- /** @} */
+-
+ /**
+ * \brief
+ *
+@@ -1087,8 +1079,7 @@ class OCIOEXPORT Config
+ void clearViewTransforms();
+
+ /**
+- * \defgroup Methods related to named transforms.
+- * @{
++ * Methods related to named transforms.
+ */
+
+ /**
+@@ -1131,8 +1122,6 @@ class OCIOEXPORT Config
+ /// Clear all named transforms.
+ void clearNamedTransforms();
+
+- /** @} */
+-
+ //
+ // File Rules
+ //
+@@ -2051,8 +2040,7 @@ class OCIOEXPORT ColorSpaceSet
+ const Impl * getImpl() const { return m_impl; }
+ };
+
+-/** \defgroup ColorSpaceSetOperators
+- * @{
++/** ColorSpaceSetOperators
+ */
+
+ /**
+@@ -2092,8 +2080,6 @@ extern OCIOEXPORT ConstColorSpaceSetRcPtr operator&&(const ConstColorSpaceSetRcP
+ extern OCIOEXPORT ConstColorSpaceSetRcPtr operator-(const ConstColorSpaceSetRcPtr & lcss,
+ const ConstColorSpaceSetRcPtr & rcss);
+
+-/** @}*/
+-
+
+ //
+ // Look
+@@ -3669,8 +3655,7 @@ class OCIOEXPORT SystemMonitors
+ virtual bool isSupported() const noexcept = 0;
+
+ /**
+- * \defgroup Methods to access some information of the attached and active monitors.
+- * @{
++ * Methods to access some information of the attached and active monitors.
+ */
+
+ /// Get the number of active monitors reported by the operating system.
+@@ -3687,8 +3672,6 @@ class OCIOEXPORT SystemMonitors
+ /// Get the ICC profile path associated to the monitor.
+ virtual const char * getProfileFilepath(size_t idx) const = 0;
+
+- /** @} */
+-
+ protected:
+ SystemMonitors() = default;
+ virtual ~SystemMonitors() = default;
+diff --git a/include/OpenColorIO/OpenColorTypes.h b/include/OpenColorIO/OpenColorTypes.h
+index c400568ea..0df8310e9 100644
+--- a/include/OpenColorIO/OpenColorTypes.h
++++ b/include/OpenColorIO/OpenColorTypes.h
+@@ -726,8 +726,7 @@ extern OCIOEXPORT ExposureContrastStyle ExposureContrastStyleFromString(const ch
+ extern OCIOEXPORT const char * NegativeStyleToString(NegativeStyle style);
+ extern OCIOEXPORT NegativeStyle NegativeStyleFromString(const char * style);
+
+-/** \defgroup Env. variables.
+- * @{
++/** Env. variables.
+ *
+ * These environmental variables are used by the OpenColorIO library.
+ * For variables that allow specifying more than one token, they should be separated by commas.
+@@ -776,10 +775,7 @@ extern OCIOEXPORT const char * OCIO_OPTIMIZATION_FLAGS_ENVVAR;
+ */
+ extern OCIOEXPORT const char * OCIO_USER_CATEGORIES_ENVVAR;
+
+-/** @}*/
+-
+-/** \defgroup VarsRoles
+- * @{
++/** VarsRoles
+ */
+
+ // TODO: Move to .rst
+@@ -852,10 +848,7 @@ extern OCIOEXPORT const char * ROLE_INTERCHANGE_SCENE;
+ */
+ extern OCIOEXPORT const char * ROLE_INTERCHANGE_DISPLAY;
+
+-/** @}*/
+-
+-/** \defgroup VarsSharedView
+- * @{
++/** VarsSharedView
+ */
+
+ /*!rst::
+@@ -870,10 +863,7 @@ Shared View
+ */
+ extern OCIOEXPORT const char * OCIO_VIEW_USE_DISPLAY_NAME;
+
+-/** @}*/
+-
+-/** \defgroup VarsFormatMetadata
+- * @{
++/** VarsFormatMetadata
+ */
+
+ // TODO: Move to .rst
+@@ -929,10 +919,7 @@ extern OCIOEXPORT const char * METADATA_NAME;
+ */
+ extern OCIOEXPORT const char * METADATA_ID;
+
+-/** @}*/
+-
+-/** \defgroup VarsCaches
+- * @{
++/** VarsCaches
+ */
+
+ /*!rst::
+@@ -963,8 +950,6 @@ extern OCIOEXPORT const char * OCIO_DISABLE_PROCESSOR_CACHES;
+ // variable to disable the fallback.
+ extern OCIOEXPORT const char * OCIO_DISABLE_CACHE_FALLBACK;
+
+-/** @}*/
+-
+
+ // Archive config feature
+ // Default filename (with extension) of an config.
diff --git a/media-libs/opencolorio/opencolorio-2.2.1.ebuild b/media-libs/opencolorio/opencolorio-2.2.1.ebuild
index 1c91f789cb30..ff0cf7ca4a81 100644
--- a/media-libs/opencolorio/opencolorio-2.2.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.2.1.ebuild
@@ -82,6 +82,7 @@ RESTRICT="!test? ( test )"
PATCHES=(
"${FILESDIR}/${PN}-2.2.1-adjust-python-installation.patch"
"${FILESDIR}/${PN}-2.2.1-support-minizip-ng-4.patch"
+ "${FILESDIR}/${PN}-${PV}-support-doxygen-1.9.7.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/
@ 2024-08-14 15:55 Sam James
0 siblings, 0 replies; 10+ messages in thread
From: Sam James @ 2024-08-14 15:55 UTC (permalink / raw
To: gentoo-commits
commit: 3197f504e0b61d5f940e411601cbdaba10d0c9d1
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Wed Aug 14 15:50:42 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 15:55:16 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3197f504
media-libs/opencolorio: fix build with gcc-15
Closes: https://bugs.gentoo.org/937408
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38148
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/opencolorio-2.3.2-include-cstdint.patch | 26 ++++++++++++++++++++++
media-libs/opencolorio/opencolorio-2.3.2.ebuild | 1 +
2 files changed, 27 insertions(+)
diff --git a/media-libs/opencolorio/files/opencolorio-2.3.2-include-cstdint.patch b/media-libs/opencolorio/files/opencolorio-2.3.2-include-cstdint.patch
new file mode 100644
index 000000000000..89f3b9465754
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-2.3.2-include-cstdint.patch
@@ -0,0 +1,26 @@
+From fb9b39dcb69746f9011087a6e1bc727872b86cfb Mon Sep 17 00:00:00 2001
+From: Paul Zander <negril.nx+gentoo@gmail.com>
+Date: Wed, 14 Aug 2024 17:43:30 +0200
+Subject: [PATCH] Fix compilation on GCC 15
+
+Bug: https://bugs.gentoo.org/937408
+Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com>
+---
+ include/OpenColorIO/OpenColorIO.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/include/OpenColorIO/OpenColorIO.h b/include/OpenColorIO/OpenColorIO.h
+index 784cf8d..7e04976 100644
+--- a/include/OpenColorIO/OpenColorIO.h
++++ b/include/OpenColorIO/OpenColorIO.h
+@@ -6,6 +6,7 @@
+ #define INCLUDED_OCIO_OPENCOLORIO_H
+
+ #include <cstddef>
++#include <cstdint>
+ #include <iosfwd>
+ #include <limits>
+ #include <stdexcept>
+--
+2.46.0
+
diff --git a/media-libs/opencolorio/opencolorio-2.3.2.ebuild b/media-libs/opencolorio/opencolorio-2.3.2.ebuild
index 70d5fb6ebc07..a9aa47ecd117 100644
--- a/media-libs/opencolorio/opencolorio-2.3.2.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.3.2.ebuild
@@ -90,6 +90,7 @@ RESTRICT="test" #"!test? ( test )"
PATCHES=(
"${FILESDIR}/${PN}-2.2.1-adjust-python-installation.patch"
+ "${FILESDIR}/${PN}-2.3.2-include-cstdint.patch"
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2024-08-14 15:55 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-06-06 1:25 [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-08-14 15:55 Sam James
2023-10-28 21:46 Sam James
2023-07-19 20:59 Sam James
2022-09-01 2:06 Sam James
2022-05-07 7:17 Sam James
2022-02-15 19:51 Sam James
2021-04-28 7:21 Sergei Trofimovich
2018-01-13 13:30 David Seifert
2018-01-13 13:30 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox