summaryrefslogtreecommitdiff
path: root/media-libs/opencolorio
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2022-06-29 12:04:12 +0100
committerV3n3RiX <venerix@koprulu.sector>2022-06-29 12:04:12 +0100
commit0f558761aa2dee1017b4751e4017205e015a9560 (patch)
tree037df795519468a25d9362b4e95cdaeb84eb1cf9 /media-libs/opencolorio
parent752d6256e5204b958b0ef7905675a940b5e9172f (diff)
gentoo resync : 29.12.2022
Diffstat (limited to 'media-libs/opencolorio')
-rw-r--r--media-libs/opencolorio/Manifest17
-rw-r--r--media-libs/opencolorio/files/opencolorio-1.1.0-remove-Werror.patch17
-rw-r--r--media-libs/opencolorio/files/opencolorio-1.1.0-remove-building-of-bundled-programs.patch154
-rw-r--r--media-libs/opencolorio/files/opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch102
-rw-r--r--media-libs/opencolorio/files/opencolorio-1.1.0-yaml-cpp-0.6.patch54
-rw-r--r--media-libs/opencolorio/files/opencolorio-1.1.1-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch38
-rw-r--r--media-libs/opencolorio/files/opencolorio-1.1.1-fix-self-assign-clang.patch14
-rw-r--r--media-libs/opencolorio/files/opencolorio-1.1.1-no-werror.patch12
-rw-r--r--media-libs/opencolorio/files/opencolorio-1.1.1-yaml-cpp-boost-check.patch35
-rw-r--r--media-libs/opencolorio/opencolorio-1.1.1-r3.ebuild106
-rw-r--r--media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild96
-rw-r--r--media-libs/opencolorio/opencolorio-2.0.3.ebuild97
-rw-r--r--media-libs/opencolorio/opencolorio-2.1.2.ebuild (renamed from media-libs/opencolorio/opencolorio-2.1.1-r2.ebuild)30
13 files changed, 19 insertions, 753 deletions
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index b19fab1d488e..1399a7597353 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,19 +1,6 @@
-AUX opencolorio-1.1.0-remove-Werror.patch 473 BLAKE2B add95a92f243df8abe26f51dbde7992ad398748ace899ead9346e6d640e2142ec895f9abe4601d5c5310f58b411d6fe0902720ba0f1319c027efd53361b39b33 SHA512 6eb2ee8567ba0c0cbe3be5468136834e8b8a62d6f2358f792d05fbf35aaebc17fb62b4bcbfc2f131ea6166236b6ea7b9951faeb916d61e09e5ce8636a18bdc35
-AUX opencolorio-1.1.0-remove-building-of-bundled-programs.patch 6108 BLAKE2B dfd13c22cdcf23e7af75b0c92dd1b85f86e9046c76eadb22b0c1b2bad06f1937bc0d2220a4e2c9a85c0b1b5e6d356b9257fd149ba503944d1bd1356b3d0d51bf SHA512 e14370a15e3e6fc5e3dc70fa52d4e11cf7ac35c2dbc8635e94c52cb02a47f10936e57b1b713f8ee2ca8481ed467e2e6835bf392468bd82d1236a50289df6584e
-AUX opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch 4002 BLAKE2B 8cadf37f7e4ccc2f14268ef71c5765fa43493f6c93ce651d1d2a7a2d5859238ba77802907ee84b0d5efcd6bd75f4ccd13d585f7822a4c8d285be586207e58752 SHA512 37f852d4f0620dd799a7aa09f0c651c72a311656c6ecb72429a440563ca936852a1227a92dca01afd97632f401babf875796f222a82362727ff7074bbe251ac5
-AUX opencolorio-1.1.0-yaml-cpp-0.6.patch 2315 BLAKE2B eaaa69e7bd76a1c40ad823eb1be9cec93d69c0b024521e31d17aa6f5b2c1e29607cf3d238cac1aba19cec3149450b1ab15d1236332ff807bdb872db62f00b3b7 SHA512 2436a404581b26db6416b013ce9de8302c20878d1c956f5ddb40c2d590c0df7a2a8c3108590330598441db51f4aae9b6d485af8b7034b22316fa42ccdc801fa5
-AUX opencolorio-1.1.1-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch 1512 BLAKE2B edb19e9e7249bcbec38d459ce9cf95d1577058665b95a9588242128d698c4cce8ac4a5f3f87fa1c06326e0ca9b50a2593ae0d060e0cbb4f3dd696831e515cc36 SHA512 a69a9a1d9dece47d388a9b20c24a1a9b55b4d2e6781bb38dafe26ab742e117d568abf89b933c584b5713999713b67719215b4fc355cadaa4093727b1a81e6ef7
-AUX opencolorio-1.1.1-fix-self-assign-clang.patch 493 BLAKE2B fbe85fc4385556deacd173ab44f5a5cbe32c2cd5b4541f1aaf20037840d5d8c7a61d5c314176cde7d0f08c80b6436b0b937c9fef10c3841948b6881601073df5 SHA512 8132a8352a36994550dd089a4858e11459fcbe0495bd07b6bc599a4b8bb7191da8ca6ae061cd1c04f52f586ac993e3656e8c03c6665f7160fa50b4a117f0cb22
-AUX opencolorio-1.1.1-no-werror.patch 349 BLAKE2B 79788a964466a884754dbdead8e252ff2422a52b56f3da8b0f256a52c714120fd2538b16e476271766a6130b97ec5025859e1320ca0a90c3ef5502fb0005f630 SHA512 d80fc47d8c4a768100cae38edcbf6741583507119d8cd8e2b6620cdc727599e5a1c170380cc25c711279b59c3432782c30315c7ffacbb78fcd1536dc12e3481a
-AUX opencolorio-1.1.1-yaml-cpp-boost-check.patch 1891 BLAKE2B 01331aeef0cde9cf4420f13dc1a2ec2bddf46e519e736a6fb653792074b412ab5d6cca364e4e4619b7b868891eee0786bc0c75df748eb8ac724410e61aa6c52a SHA512 4ddb466a56a27db82f5b83dbb96e42f6b6cf0749168459dd32e922345d6011f09961592f7d5611253cbad5d78952d52f1cdabfed011b4c376faafc0becc7422b
AUX opencolorio-2.1.1-gcc12.patch 421 BLAKE2B 9a16bf4f0fbf1a2fc277a46b547339415de07c07093f45fd7f4f445735f2c7bda437f75b5f7b30e72fd522af97e4995887312b7828d954ff4bc8a179f476f2c3 SHA512 1738924260ee3abf556207f3323c8cc45e3e5f9210ff46b8b1e9ac1766c39ac06cc50a61d0c77bdf10a318405f6f5dda84d15f4c004be950dce40e2dd3087f2b
-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
-EBUILD opencolorio-1.1.1-r3.ebuild 2750 BLAKE2B 22842c149b2d415b04932511630704b7e25276845d84aa65ebdd547f183f984e72214193fc9f73e0b0caa78ad246562a913b0b372fc843f17e7a7f419759cd92 SHA512 b010bf252e84634be4814e4c12f3503e2c47347a178b86ebf2bd4406c9507f0096a094c614107751bbb06a19d2aa9715f729996d1b5c93aa2ce616a0db813c28
-EBUILD opencolorio-2.0.1-r2.ebuild 2820 BLAKE2B 7efa8a9aba25285125fce2d7a6ffbe990764cfc5593ef323411547f9c99b351e1511432df6cdad27effa314984f8e81db6606a3f8d958773459074d02fd845ab SHA512 922483a225a736443a67bbcc1e318ca4969be6d161692f0a42bdf88d723f07b6b9b7a398e11af20e68291c956e0ba9825b71554058dbd8adce9dae67b674f7f2
-EBUILD opencolorio-2.0.3.ebuild 2865 BLAKE2B f59dc08bda96088c88cd2108353932f0781610d8c8b2148e4994e4653b8a80fa74585ab516acf04451c6596ef0467e232c487bffa540c2e7ddf18b4e7b835490 SHA512 2ef41f4c4c4d2009dc7624b22091245c1600387f87ae21439ba2e4e3e685e77ecc51a6c323901ecb37fa8e76055c1a591568bd6eb224d85d1e2e1098b5541cda
-EBUILD opencolorio-2.1.1-r2.ebuild 2987 BLAKE2B 84232f4da90329934d2dd430a058ee25cc9b9229f7cb583cd5a2ff103c71eab9a48013612410395c083f7d3cda02fc027f72c29f53753cf142e16736799e48c9 SHA512 59448793311c5833b07f5f7d5894178f92a787d208a08e13c93f3225884f0902e222e6066ae7f7090498a16b6da8a30561f916a4016257c767f4a12e06f0ce42
+DIST opencolorio-2.1.2.tar.gz 11021014 BLAKE2B 2612c31c88a86255b3b0389241649aaaf3754f065eec57e8438d3b594d9f8fcac81c71fe06cf0acf0680e40d0fbe019ad16a34a1371a7a3a57a21017f5efb463 SHA512 594e808fb1c175d5b14eb540be0dfb6f41cd37b5bf7df8c2d24d44dfe4986643ea68e52d0282eb3b25283489789001a57a201de1eecc1560fc9461780c7da353
EBUILD opencolorio-2.1.1-r7.ebuild 3235 BLAKE2B fc8fcf4425f54319d1682adbb75d10e826c0427e6e88df3235f8fc5eb0296ad95582d637adca5a4f8edc3acdb819ce5544c88e5da8ce5366c4fbae30959958d5 SHA512 a68e6e983ee08be66d6732304de7c775a4292797c13b350f93bdf4410cb2d47720869c7d4d66514be011df6aea70c407a6ddfccd975c2eef87cddab42f73e54c
+EBUILD opencolorio-2.1.2.ebuild 3211 BLAKE2B d25624a37c728daa4cd55a3f4bea0fbf24de5a4da9b0272a867e7a6130a973236cc1845854df64074ee0f67544f856eb135a318aa69a6ab3548667fc2cba1446 SHA512 15c374d5d95bf03d0701658ee7d8f380eba81fb3f6cf634c1397198401e7f29f7021870ff278087300691c3c25c22dfe9c90b0579e27623e515cfd4ff55d7fd4
MISC metadata.xml 460 BLAKE2B 564c46a6d12ec479bfbe92401cda933760a3fbfd72b83221f8edc927a01eb5f18ecab877184b95aa5bcc8af20a0c36fbff8c6f45bf7ce2996c795b0f8fac1c9c SHA512 d58b105d94f1f11e52f1e88b9cb24885b5369207c3fa2a6ab4c2133c22e2b47a887a8358b79ea53cc9bdd63a44bb18672e5d26d614074e0bc08539cb4e73b49a
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.2.ebuild
index 579e0b7623fa..17b4b7fb8e1f 100644
--- a/media-libs/opencolorio/opencolorio-2.1.1-r2.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.1.2.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
PYTHON_COMPAT=( python3_{8..10} )
@@ -13,27 +13,26 @@ SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/t
S="${WORKDIR}/OpenColorIO-${PV}"
LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+# TODO: drop .1 on next SONAME bump (2.1 -> 2.2?) as we needed to nudge it
+# 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 ~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?
+# Works with older OIIO but need to force a version w/ OpenEXR 3
RDEPEND="
dev-cpp/pystring
dev-python/pybind11
>=dev-cpp/yaml-cpp-0.7.0:=
+ >=dev-libs/imath-3.1.4-r2:=
dev-libs/tinyxml
- media-libs/ilmbase:=
opengl? (
media-libs/lcms:2
- media-libs/openimageio:=
+ >=media-libs/openimageio-2.3.12.0-r3:=
media-libs/glew:=
media-libs/freeglut
virtual/opengl
@@ -42,7 +41,6 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="
- >=dev-util/cmake-3.16.2-r1
virtual/pkgconfig
doc? (
$(python_gen_cond_dep '
@@ -55,7 +53,9 @@ BDEPEND="
# Restricting tests, bugs #439790 and #447908
RESTRICT="test"
-CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.1.1-gcc12.patch
+)
pkg_setup() {
use python && python-single-r1_pkg_setup
@@ -66,6 +66,10 @@ 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
+
+ # 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() {
@@ -76,8 +80,8 @@ src_configure() {
# - 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
+ -DOCIO_USE_OPENEXR_HALF=OFF
+
-DBUILD_SHARED_LIBS=ON
-DOCIO_BUILD_STATIC=$(usex static-libs)
-DOCIO_BUILD_DOCS=$(usex doc)
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 10:02:01 +0000