Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/
Date: Mon, 06 Jun 2022 01:25:05
Message-Id: 1654478683.98e9e578139ff41ae4f18ce00fe81d19c22142dc.sam@gentoo
1 commit: 98e9e578139ff41ae4f18ce00fe81d19c22142dc
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jun 6 01:22:46 2022 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Mon Jun 6 01:24:43 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=98e9e578
7
8 media-libs/opencolorio: drop 1.1.1-r3, 2.0.1-r2, 2.0.3, 2.1.1-r2
9
10 Signed-off-by: Sam James <sam <AT> gentoo.org>
11
12 media-libs/opencolorio/Manifest | 3 -
13 .../files/opencolorio-1.1.0-remove-Werror.patch | 17 ---
14 ...1.1.0-remove-building-of-bundled-programs.patch | 154 ---------------------
15 ...nstallDirs-and-fix-cmake-install-location.patch | 102 --------------
16 .../files/opencolorio-1.1.0-yaml-cpp-0.6.patch | 54 --------
17 ...ecific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch | 38 -----
18 .../opencolorio-1.1.1-fix-self-assign-clang.patch | 14 --
19 .../files/opencolorio-1.1.1-no-werror.patch | 12 --
20 .../opencolorio-1.1.1-yaml-cpp-boost-check.patch | 35 -----
21 media-libs/opencolorio/opencolorio-1.1.1-r3.ebuild | 106 --------------
22 media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild | 96 -------------
23 media-libs/opencolorio/opencolorio-2.0.3.ebuild | 97 -------------
24 media-libs/opencolorio/opencolorio-2.1.1-r2.ebuild | 100 -------------
25 13 files changed, 828 deletions(-)
26
27 diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
28 index 1cfa23094bad..fbccb7669120 100644
29 --- a/media-libs/opencolorio/Manifest
30 +++ b/media-libs/opencolorio/Manifest
31 @@ -1,5 +1,2 @@
32 -DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B f5642f08db84f2b8da44d0dbf58313c78263496fc6f1f209b93fd303bbf9477033317b44eb8bb2b13a70afa19422f4fa312d52a3fa6598031a2aa50b33bbfccf SHA512 bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
33 -DIST opencolorio-2.0.1.tar.gz 9945107 BLAKE2B cb4b152205642abd847b7263db838dbb922004017b9f19f7b2bd81d97f64e6f7d008c5a3f734475f510180ae9cc3a84688631e69c0587e0c77599b75b07d9159 SHA512 5787cc4cadb0a1832c925712ca0dfef6e843082b9461460e1798326c6fceaa97bee78e5298651e6a8a3662b348eab5ab9791e94c3efcac337da07229fb559338
34 -DIST opencolorio-2.0.3.tar.gz 10813503 BLAKE2B a853f2a39b4c3c0005056f0278355f01a8d62ec90054d3f1ce29501ce8fc96628d68eb3d942bb0cc33c71dcaa1a7421684bdd79b190a5eda5c5b5c6b9190017c SHA512 cb8d6d4e2481bfe9449f665ff888ad6ffb2d2e82f1a132b7cd3a74c88b2084f469c362511e57b964d3aee7c1badd41422640ab3a857402fa6a90c8bdf4cc60bb
35 DIST opencolorio-2.1.1.tar.gz 11013141 BLAKE2B ffece30b9f37acd10665a716d519c9807f6398e5e59baedd194376a1424a6d875781c027d998567b2a241da6388a780c94d95237b0b4d64b836cc5ccccd4383c SHA512 86585ec860d460b158f24efb82f202deced7ce96a6bfefd42f39cad9c112add68cca6935f383f5d718c07fe1c121d8ed8b0d2069321f1dafb8ce68b49bc75194
36 DIST opencolorio-2.1.2.tar.gz 11021014 BLAKE2B 2612c31c88a86255b3b0389241649aaaf3754f065eec57e8438d3b594d9f8fcac81c71fe06cf0acf0680e40d0fbe019ad16a34a1371a7a3a57a21017f5efb463 SHA512 594e808fb1c175d5b14eb540be0dfb6f41cd37b5bf7df8c2d24d44dfe4986643ea68e52d0282eb3b25283489789001a57a201de1eecc1560fc9461780c7da353
37
38 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
39 deleted file mode 100644
40 index 2814f703f81d..000000000000
41 --- a/media-libs/opencolorio/files/opencolorio-1.1.0-remove-Werror.patch
42 +++ /dev/null
43 @@ -1,17 +0,0 @@
44 -diff --git a/src/pyglue/CMakeLists.txt b/src/pyglue/CMakeLists.txt
45 -index a90ca1c..35de89a 100644
46 ---- a/src/pyglue/CMakeLists.txt
47 -+++ b/src/pyglue/CMakeLists.txt
48 -@@ -22,9 +22,9 @@ endif()
49 -
50 - # Process all warnings as errors
51 - # Unfortunately Windows still has a warning
52 --if(UNIX)
53 -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
54 --endif()
55 -+#if(UNIX)
56 -+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
57 -+#endif()
58 -
59 - find_package(PythonLibs)
60 - if(NOT PYTHONLIBS_FOUND)
61
62 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
63 deleted file mode 100644
64 index 9041677c9ce4..000000000000
65 --- a/media-libs/opencolorio/files/opencolorio-1.1.0-remove-building-of-bundled-programs.patch
66 +++ /dev/null
67 @@ -1,154 +0,0 @@
68 -From 967369b36c9684d7ffb73a926c442d8991a3afef Mon Sep 17 00:00:00 2001
69 -From: Jonathan Scruggs <j.scruggs@×××××.com>
70 -Date: Mon, 15 Jan 2018 13:09:31 +0000
71 -Subject: [PATCH 3/3] Remove building of bundled programs
72 -
73 ----
74 - docs/CMakeLists.txt | 98 ++---------------------------------------------------
75 - 1 file changed, 3 insertions(+), 95 deletions(-)
76 -
77 -diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
78 -index a822a19..d588139 100644
79 ---- a/docs/CMakeLists.txt
80 -+++ b/docs/CMakeLists.txt
81 -@@ -1,90 +1,4 @@
82 -
83 --###############################################################################
84 --### External Doc Apps ###
85 --
86 --if (WIN32)
87 -- # Workaround to mimic *nix '> PYTHONPATH=XXX CMD'
88 -- # on windows, it becomes '> set PYTHONPATH=XXX \n call CMD'
89 -- # '\n' is here because '\\&' does not work.
90 -- set(PYT_PRE_CMD set PYTHONPATH=${PYTHONPATH} "\n" call )
91 -- # Unfortunately some windows tools require to have
92 -- # the paths with the '\' (not working with '//').
93 -- set(PYT_LIB_OUTPUT ${EXTDIST_ROOT})
94 -- string(REGEX REPLACE "/" "\\\\" PYT_LIB_OUTPUT ${PYT_LIB_OUTPUT})
95 -- set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH})
96 -- string(REGEX REPLACE "/" "\\\\" PYT_EXTDIST_BINPATH ${PYT_EXTDIST_BINPATH})
97 --else()
98 -- set(PYT_PRE_CMD PYTHONPATH=${PYTHONPATH})
99 -- set(PYT_LIB_OUTPUT ${EXTDIST_ROOT})
100 -- set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH})
101 --endif()
102 --
103 --# setuptools
104 --# https://pypi.python.org/pypi/setuptools
105 --set(SETUPTOOLS_VERSION 1.1.6)
106 --
107 --ExternalProject_Add(setuptools
108 -- URL ${CMAKE_SOURCE_DIR}/ext/setuptools-${SETUPTOOLS_VERSION}.tar.gz
109 -- BUILD_IN_SOURCE 1
110 -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
111 -- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
112 -- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
113 -- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/setuptools-prefix/src/setuptools
114 --)
115 --
116 --# docutils
117 --# https://pypi.python.org/pypi/docutils
118 --set(DOCUTILS_VERSION 0.11)
119 --ExternalProject_Add(docutils
120 -- DEPENDS setuptools
121 -- URL ${CMAKE_SOURCE_DIR}/ext/docutils-${DOCUTILS_VERSION}.tar.gz
122 -- BUILD_IN_SOURCE 1
123 -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
124 -- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
125 -- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
126 -- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docutils-prefix/src/docutils
127 --)
128 --
129 --# jinja2
130 --# https://pypi.python.org/pypi/Jinja2
131 --set(JINJA2_VERSION 2.7.1)
132 --ExternalProject_Add(Jinja2
133 -- DEPENDS setuptools
134 -- URL ${CMAKE_SOURCE_DIR}/ext/Jinja2-${JINJA2_VERSION}.tar.gz
135 -- BUILD_IN_SOURCE 1
136 -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
137 -- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
138 -- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
139 -- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Jinja2-prefix/src/Jinja2
140 --)
141 --
142 --# Pygments
143 --# https://pypi.python.org/pypi/Pygments
144 --set(PYGMENTS_VERSION 1.6)
145 --ExternalProject_Add(Pygments
146 -- DEPENDS setuptools
147 -- URL ${CMAKE_SOURCE_DIR}/ext/Pygments-${PYGMENTS_VERSION}.tar.gz
148 -- BUILD_IN_SOURCE 1
149 -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
150 -- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
151 -- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
152 -- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Pygments-prefix/src/Pygments
153 --)
154 --
155 --# sphinx
156 --# https://pypi.python.org/pypi/Sphinx
157 --set(SPHINX_VERSION 1.2b3)
158 --ExternalProject_Add(Sphinx
159 -- DEPENDS setuptools docutils Jinja2 Pygments
160 -- URL ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.tar.gz
161 -- PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch
162 -- BUILD_IN_SOURCE 1
163 -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
164 -- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
165 -- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-scripts=${PYT_EXTDIST_BINPATH}
166 -- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Sphinx-prefix/src/Sphinx
167 --)
168 --
169 - ###############################################################################
170 - ### Create Doc Targets ###
171 -
172 -@@ -122,7 +36,7 @@ else()
173 - endif()
174 -
175 - add_custom_target(doc ALL
176 -- COMMAND ${PYT_PRE_CMD} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
177 -+ COMMAND sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
178 - DEPENDS
179 - ${DEPLIBS}
180 - ${CMAKE_BINARY_DIR}/docs/conf.py
181 -@@ -131,11 +45,7 @@ add_custom_target(doc ALL
182 - developers/api/OpenColorTypes.rst
183 - ${RSTDOC_OUTPUT}
184 - COMMENT "Building html docs"
185 - SOURCES ${DOCFILES})
186 --
187 --# note: ExternalProject will not build when added to a add_custom_target this
188 --# works around this problem. This seems to be fixed in the cmake ^HEAD
189 --add_dependencies(doc Sphinx)
190 -
191 - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
192 - DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
193 -@@ -146,8 +56,8 @@ find_package(LATEX)
194 - find_package(LATEX)
195 - if(PDFLATEX_COMPILER)
196 -
197 -- add_custom_target(latex
198 -- COMMAND ${PYT_PRE_CMD} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
199 -+ add_custom_target(latex ALL
200 -+ COMMAND sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
201 - DEPENDS
202 - OpenColorIO
203 - ${CMAKE_BINARY_DIR}/docs/conf.py
204 -@@ -156,14 +66,12 @@ if(PDFLATEX_COMPILER)
205 - ${RSTDOC_OUTPUT}
206 - COMMENT "Building latex doc"
207 - SOURCES ${DOCFILES})
208 -- add_dependencies(latex Sphinx)
209 -
210 - add_custom_target(pdf ALL
211 - COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex
212 - WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-latex
213 - COMMENT "Building pdf doc"
214 - SOURCES ${DOCFILES})
215 -- add_dependencies(pdf latex)
216 -
217 - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
218 - DESTINATION ${CMAKE_INSTALL_DOCDIR})
219 ---
220 -2.15.1
221 -
222
223 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
224 deleted file mode 100644
225 index e4c6296f1d7f..000000000000
226 --- a/media-libs/opencolorio/files/opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch
227 +++ /dev/null
228 @@ -1,102 +0,0 @@
229 -From c43cc918c3e79e324f11ca47e95bfe36e9e0dd15 Mon Sep 17 00:00:00 2001
230 -From: Jonathan Scruggs <j.scruggs@×××××.com>
231 -Date: Sun, 14 Jan 2018 19:59:31 +0000
232 -Subject: [PATCH] Add GNUInstallDirs variables and fix install location for
233 - cmake files
234 -
235 -GNUInstallDirs is supported on all platforms and variables are set
236 -to the standard GNU locations.
237 -
238 -This patch corrects the location where the CMake files are
239 -installed.
240 -
241 -Signed-off by: Jonathan Scruggs <j.scruggs@×××××.com>
242 ----
243 - CMakeLists.txt | 9 +++++----
244 - docs/CMakeLists.txt | 4 ++--
245 - export/pkgconfig/OpenColorIO.pc.in | 6 ++----
246 - 3 files changed, 9 insertions(+), 10 deletions(-)
247 -
248 -diff --git a/CMakeLists.txt b/CMakeLists.txt
249 -index b05c7e4..452fa1e 100644
250 ---- a/CMakeLists.txt
251 -+++ b/CMakeLists.txt
252 -@@ -59,6 +59,7 @@ endif()
253 - include(ParseArguments)
254 - include(OCIOMacros)
255 - include(ExternalProject)
256 -+include(GNUInstallDirs)
257 -
258 - enable_language(CXX)
259 -
260 -@@ -531,7 +532,7 @@ endif()
261 - configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
262 - ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
263 -
264 --INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
265 -+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATADIR}/ocio/)
266 -
267 - ###############################################################################
268 - ### CPACK ###
269 -@@ -596,7 +597,7 @@ if(TARGET OpenColorIO_STATIC)
270 - set(OCIO_STATIC_COMPILE_DEFINITIONS )
271 - endif()
272 - endif()
273 --install(EXPORT OpenColorIO DESTINATION cmake)
274 -+install(EXPORT OpenColorIO DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
275 - file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
276 - "
277 - get_filename_component(OpenColorIO_DIR \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)
278 -@@ -608,7 +609,7 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
279 -
280 - ## targets libraries + associated definitions
281 - if(NOT TARGET OpenColorIO)
282 -- include(\"\${OpenColorIO_DIR}/cmake/OpenColorIO.cmake\") ## thanks to imported target
283 -+ include(\"\${OpenColorIO_DIR}/${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO/OpenColorIO.cmake\") ## thanks to imported target
284 - if(TARGET OpenColorIO AND NOT OpenColorIO_USE_STATIC)
285 - message(STATUS \"shared target OpenColorIO : see OpenColorIO_LIBRARY\")
286 - set(OpenColorIO_LIBRARY OpenColorIO)
287 -@@ -646,4 +647,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake"
288 - message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
289 - "
290 - )
291 --install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
292 -+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/OpenColorIO)
293 -diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt
294 -index 3fd0299..a822a19 100644
295 ---- a/docs/CMakeLists.txt
296 -+++ b/docs/CMakeLists.txt
297 -@@ -138,7 +138,7 @@ add_custom_target(doc ALL
298 - add_dependencies(doc Sphinx)
299 -
300 - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
301 -- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
302 -+ DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
303 - PATTERN .* EXCLUDE
304 - )
305 -
306 -@@ -166,6 +166,6 @@ if(PDFLATEX_COMPILER)
307 - add_dependencies(pdf latex)
308 -
309 - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
310 -- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
311 -+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
312 -
313 - endif()
314 -diff --git a/export/pkgconfig/OpenColorIO.pc.in b/export/pkgconfig/OpenColorIO.pc.in
315 -index 81ab4ce3..c4553a4f 100644
316 ---- a/export/pkgconfig/OpenColorIO.pc.in
317 -+++ b/export/pkgconfig/OpenColorIO.pc.in
318 -@@ -1,7 +1,5 @@
319 --prefix=@CMAKE_INSTALL_PREFIX@
320 --exec_prefix=@CMAKE_INSTALL_EXEC_PREFIX@
321 --includedir=${prefix}/include
322 --libdir=${exec_prefix}/lib@LIB_SUFFIX@
323 -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
324 -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
325 -
326 - Name: OpenColorIO
327 - Description: A color management framework for visual effects and animation
328 ---
329 -2.15.1
330 -
331
332 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
333 deleted file mode 100644
334 index 2094e1ed58b8..000000000000
335 --- a/media-libs/opencolorio/files/opencolorio-1.1.0-yaml-cpp-0.6.patch
336 +++ /dev/null
337 @@ -1,54 +0,0 @@
338 -commit 8ce96cc5d590a1c094fb316968f2db8464f3be82
339 -Author: Joakim Nohlgård <joakim.nohlgard@××××××.se>
340 -Date: Fri Mar 30 13:47:28 2018 +0200
341 -
342 - OCIOYaml: Remove forward declarations to use system yaml-cpp headers
343 -
344 -diff --git a/src/core/OCIOYaml.cpp b/src/core/OCIOYaml.cpp
345 -index 68fcef6..8047d7e 100644
346 ---- a/src/core/OCIOYaml.cpp
347 -+++ b/src/core/OCIOYaml.cpp
348 -@@ -30,43 +30,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
349 -
350 - #include <OpenColorIO/OpenColorIO.h>
351 -
352 --#ifndef WIN32
353 --
354 --// fwd declare yaml-cpp visibility
355 --#pragma GCC visibility push(hidden)
356 --namespace YAML {
357 -- class Exception;
358 -- class BadDereference;
359 -- class RepresentationException;
360 -- class EmitterException;
361 -- class ParserException;
362 -- class InvalidScalar;
363 -- class KeyNotFound;
364 -- template <typename T> class TypedKeyNotFound;
365 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpace>;
366 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Config>;
367 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Exception>;
368 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::GpuShaderDesc>;
369 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ImageDesc>;
370 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Look>;
371 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Processor>;
372 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::Transform>;
373 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::AllocationTransform>;
374 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::CDLTransform>;
375 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ColorSpaceTransform>;
376 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::DisplayTransform>;
377 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::ExponentTransform>;
378 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::FileTransform>;
379 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::GroupTransform>;
380 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::LogTransform>;
381 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::LookTransform>;
382 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::MatrixTransform>;
383 -- template <> class TypedKeyNotFound<OCIO_NAMESPACE::TruelightTransform>;
384 --}
385 --#pragma GCC visibility pop
386 --
387 --#endif
388 --
389 - #ifdef WIN32
390 - #pragma warning( push )
391 - #pragma warning( disable: 4146 )
392
393 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
394 deleted file mode 100644
395 index 0f0fb4e649d6..000000000000
396 --- a/media-libs/opencolorio/files/opencolorio-1.1.1-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch
397 +++ /dev/null
398 @@ -1,38 +0,0 @@
399 -From 80c08e5bee5bd9fc37a6aeff4b7b7bb8edb3c831 Mon Sep 17 00:00:00 2001
400 -From: Bernd Waibel <waebbl-gentoo@××××××.net>
401 -Date: Sun, 6 Jun 2021 20:42:48 +0200
402 -Subject: [PATCH] [Gentoo specific]OCIOMacros.cmake: remove LIB_SUFFIX
403 -
404 -We don't use LIB_SUFFIX for python's site-packages dir, so remove it
405 -from the PYTHON_VARIANT_PATH to ensure, python modules are installed
406 -to the correct location.
407 -
408 -Signed-off-by: Bernd Waibel <waebbl-gentoo@××××××.net>
409 ----
410 - share/cmake/OCIOMacros.cmake | 4 ++--
411 - 1 file changed, 2 insertions(+), 2 deletions(-)
412 -
413 -diff --git a/share/cmake/OCIOMacros.cmake b/share/cmake/OCIOMacros.cmake
414 -index b9fb239..0ce9e62 100644
415 ---- a/share/cmake/OCIOMacros.cmake
416 -+++ b/share/cmake/OCIOMacros.cmake
417 -@@ -241,14 +241,14 @@ MACRO(OCIOFindPython)
418 - if(WIN32)
419 - set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/${PYTHON_UCS}/site-packages")
420 - else()
421 -- set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/python${PYTHON_VERSION}/${PYTHON_UCS}/site-packages")
422 -+ set(PYTHON_VARIANT_PATH "lib/python${PYTHON_VERSION}/${PYTHON_UCS}/site-packages")
423 - endif()
424 - else()
425 - # Ignore UCS value and install into lib/python2.6/site-packages dir
426 - if(WIN32)
427 - set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/site-packages")
428 - else()
429 -- set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/python${PYTHON_VERSION}/site-packages")
430 -+ set(PYTHON_VARIANT_PATH "lib/python${PYTHON_VERSION}/site-packages")
431 - endif()
432 - endif()
433 -
434 ---
435 -2.31.1
436 -
437
438 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
439 deleted file mode 100644
440 index c6193277458f..000000000000
441 --- a/media-libs/opencolorio/files/opencolorio-1.1.1-fix-self-assign-clang.patch
442 +++ /dev/null
443 @@ -1,14 +0,0 @@
444 -https://bugs.gentoo.org/754966
445 -https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/563
446 -Fixed upstream in a larger set of changes.
447 ---- a/src/core/Config.cpp
448 -+++ b/src/core/Config.cpp
449 -@@ -330,7 +330,7 @@
450 - sanitytext_ = rhs.sanitytext_;
451 -
452 - cacheids_ = rhs.cacheids_;
453 -- cacheidnocontext_ = cacheidnocontext_;
454 -+ cacheidnocontext_ = rhs.cacheidnocontext_;
455 - }
456 - return *this;
457 - }
458
459 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
460 deleted file mode 100644
461 index df8fa2102534..000000000000
462 --- a/media-libs/opencolorio/files/opencolorio-1.1.1-no-werror.patch
463 +++ /dev/null
464 @@ -1,12 +0,0 @@
465 -https://bugs.gentoo.org/786198
466 ---- a/src/core/CMakeLists.txt
467 -+++ b/src/core/CMakeLists.txt
468 -@@ -23,8 +23,6 @@ if(WIN32)
469 - if("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
470 - set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} /WX")
471 - endif()
472 --else()
473 -- set(EXTERNAL_COMPILE_FLAGS "${EXTERNAL_COMPILE_FLAGS} -Werror")
474 - endif()
475 -
476 - # SHARED
477
478 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
479 deleted file mode 100644
480 index 0f3c3e3ba19b..000000000000
481 --- a/media-libs/opencolorio/files/opencolorio-1.1.1-yaml-cpp-boost-check.patch
482 +++ /dev/null
483 @@ -1,35 +0,0 @@
484 -This check is redundant. The appropriate versions of yaml-cpp
485 -already had a dependency on Boost, but that's not even the case anymore.
486 -
487 -Check has been dropped upstream since.
488 -https://bugs.gentoo.org/747553
489 -----
490 -diff --git a/CMakeLists.txt b/CMakeLists.txt
491 -index eb20913..434e38b 100644
492 ---- a/CMakeLists.txt
493 -+++ b/CMakeLists.txt
494 -@@ -272,24 +272,6 @@ if(USE_EXTERNAL_YAML)
495 - mark_as_advanced(YAML_CPP_INCLUDE_DIR YAML_CPP_LIBRARY YAML-CPP_FOUND)
496 -
497 - if(YAML_CPP_FOUND)
498 -- if(YAML_CPP_VERSION VERSION_GREATER "0.5.0")
499 -- # Need to also get the boost headers here, as yaml-cpp 0.5.0+ requires them.
500 -- # Don't bother doing this step if we are already including the boost headers for shared_ptr
501 -- if(NOT OCIO_USE_BOOST_PTR)
502 -- set(Boost_ADDITIONAL_VERSIONS "1.49" "1.45" "1.44" "1.43" "1.43.0" "1.42"
503 -- "1.42.0" "1.41" "1.41.0" "1.40"
504 -- "1.40.0" "1.39" "1.39.0" "1.38"
505 -- "1.38.0" "1.37" "1.37.0" "1.34.1"
506 -- "1_34_1")
507 -- set(Boost_USE_MULTITHREADED ON)
508 -- find_package(Boost 1.34)
509 -- if(NOT Boost_FOUND)
510 -- 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.")
511 -- endif()
512 --
513 -- set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${Boost_INCLUDE_DIR})
514 -- endif()
515 -- endif()
516 - set(EXTERNAL_INCLUDE_DIRS ${EXTERNAL_INCLUDE_DIRS} ${YAML_CPP_INCLUDE_DIRS})
517 - else(YAML_CPP_FOUND)
518 - message(FATAL_ERROR "ERROR: System yaml-cpp library was not found. Make sure the library is installed and the pkg-config file exists.")
519
520 diff --git a/media-libs/opencolorio/opencolorio-1.1.1-r3.ebuild b/media-libs/opencolorio/opencolorio-1.1.1-r3.ebuild
521 deleted file mode 100644
522 index 4a6a5c7dd95f..000000000000
523 --- a/media-libs/opencolorio/opencolorio-1.1.1-r3.ebuild
524 +++ /dev/null
525 @@ -1,106 +0,0 @@
526 -# Copyright 1999-2021 Gentoo Authors
527 -# Distributed under the terms of the GNU General Public License v2
528 -
529 -EAPI=7
530 -
531 -PYTHON_COMPAT=( python3_{7,8,9} )
532 -
533 -inherit cmake python-single-r1
534 -
535 -DESCRIPTION="color management framework for visual effects and animation"
536 -HOMEPAGE="https://opencolorio.org/"
537 -SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz -> ${P}.tar.gz"
538 -S="${WORKDIR}/OpenColorIO-${PV}"
539 -
540 -LICENSE="BSD"
541 -SLOT="0"
542 -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
543 -IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
544 -REQUIRED_USE="
545 - doc? ( python )
546 - python? ( ${PYTHON_REQUIRED_USE} )"
547 -
548 -# Not compatible with oiio 2.3
549 -# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
550 -# bug #821073
551 -RDEPEND="
552 - <dev-cpp/yaml-cpp-0.7.0:=
553 - dev-libs/tinyxml
554 - opengl? (
555 - media-libs/lcms:2
556 - <media-libs/openimageio-2.3:=
557 - media-libs/glew:=
558 - media-libs/freeglut
559 - virtual/opengl
560 - )
561 - python? ( ${PYTHON_DEPS} )
562 -"
563 -
564 -DEPEND="${RDEPEND}"
565 -BDEPEND="
566 - virtual/pkgconfig
567 - doc? (
568 - $(python_gen_cond_dep '
569 - dev-python/sphinx[${PYTHON_USEDEP}]
570 - ')
571 - )
572 -"
573 -
574 -# Restricting tests, bugs #439790 and #447908
575 -RESTRICT="test"
576 -
577 -PATCHES=(
578 - "${FILESDIR}/${PN}-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch"
579 - "${FILESDIR}/${PN}-1.1.0-remove-building-of-bundled-programs.patch"
580 - "${FILESDIR}/${PN}-1.1.0-yaml-cpp-0.6.patch"
581 - "${FILESDIR}/${PN}-1.1.0-remove-Werror.patch"
582 - "${FILESDIR}/${PN}-1.1.1-yaml-cpp-boost-check.patch"
583 - "${FILESDIR}/${P}-fix-self-assign-clang.patch"
584 - "${FILESDIR}/${P}-no-werror.patch"
585 - "${FILESDIR}/${P}-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch"
586 -)
587 -
588 -pkg_setup() {
589 - use python && python-single-r1_pkg_setup
590 -}
591 -
592 -src_prepare() {
593 - cmake_src_prepare
594 -
595 - use python && python_fix_shebang .
596 -}
597 -
598 -src_configure() {
599 - # Missing features:
600 - # - Truelight and Nuke are not in portage for now, so their support are disabled
601 - # - Java bindings was not tested, so disabled
602 - # Notes:
603 - # - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
604 - # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
605 - local mycmakeargs=(
606 - -DOCIO_BUILD_JNIGLUE=OFF
607 - -DOCIO_BUILD_NUKE=OFF
608 - -DOCIO_BUILD_SHARED=ON
609 - -DOCIO_BUILD_STATIC=$(usex static-libs)
610 - -DOCIO_STATIC_JNIGLUE=OFF
611 - -DOCIO_BUILD_TRUELIGHT=OFF
612 - -DUSE_EXTERNAL_LCMS=ON
613 - -DUSE_EXTERNAL_TINYXML=ON
614 - -DUSE_EXTERNAL_YAML=ON
615 - -DOCIO_BUILD_DOCS=$(usex doc)
616 - -DOCIO_BUILD_APPS=$(usex opengl)
617 - -DOCIO_BUILD_PYGLUE=$(usex python)
618 - -DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
619 - -DOCIO_BUILD_TESTS=$(usex test)
620 - )
621 -
622 - if use python; then
623 - mycmakeargs+=(
624 - -DPYTHON=${PYTHON}
625 - -DPYTHON_LIBRARY=$(python_get_library_path)
626 - )
627 - fi
628 -
629 - use doc && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON ) # broken
630 - cmake_src_configure
631 -}
632
633 diff --git a/media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild b/media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild
634 deleted file mode 100644
635 index 8b6fd27357c6..000000000000
636 --- a/media-libs/opencolorio/opencolorio-2.0.1-r2.ebuild
637 +++ /dev/null
638 @@ -1,96 +0,0 @@
639 -# Copyright 1999-2021 Gentoo Authors
640 -# Distributed under the terms of the GNU General Public License v2
641 -
642 -EAPI=7
643 -
644 -PYTHON_COMPAT=( python3_{8..10} )
645 -
646 -inherit cmake flag-o-matic python-single-r1
647 -
648 -DESCRIPTION="A color management framework for visual effects and animation"
649 -HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO"
650 -SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
651 -S="${WORKDIR}/OpenColorIO-${PV}"
652 -
653 -KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
654 -LICENSE="BSD"
655 -SLOT="0"
656 -IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
657 -REQUIRED_USE="
658 - doc? ( python )
659 - python? ( ${PYTHON_REQUIRED_USE} )
660 -"
661 -
662 -# Not compatible with oiio 2.3
663 -# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
664 -# bug #821073
665 -RDEPEND="
666 - dev-cpp/pystring
667 - dev-python/pybind11
668 - media-libs/ilmbase
669 - dev-cpp/yaml-cpp:=
670 - dev-libs/tinyxml
671 - opengl? (
672 - media-libs/lcms:2
673 - <media-libs/openimageio-2.3:=
674 - media-libs/glew:=
675 - media-libs/freeglut
676 - virtual/opengl
677 - )
678 - python? ( ${PYTHON_DEPS} )
679 -"
680 -DEPEND="${RDEPEND}"
681 -BDEPEND="
682 - >=dev-util/cmake-3.16.2-r1
683 - virtual/pkgconfig
684 - doc? (
685 - $(python_gen_cond_dep '
686 - dev-python/sphinx[${PYTHON_USEDEP}]
687 - dev-python/testresources[${PYTHON_USEDEP}]
688 - ')
689 - )
690 -"
691 -
692 -# Restricting tests, bugs #439790 and #447908
693 -RESTRICT="test"
694 -
695 -CMAKE_BUILD_TYPE=RelWithDebInfo
696 -
697 -pkg_setup() {
698 - use python && python-single-r1_pkg_setup
699 -}
700 -
701 -src_prepare() {
702 - cmake_src_prepare
703 -
704 - 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
705 - 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
706 -}
707 -
708 -src_configure() {
709 - # Missing features:
710 - # - Truelight and Nuke are not in portage for now, so their support are disabled
711 - # - Java bindings was not tested, so disabled
712 - # Notes:
713 - # - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
714 - # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
715 - local mycmakeargs=(
716 - -DBUILD_SHARED_LIBS=ON
717 - -DOCIO_BUILD_STATIC=$(usex static-libs)
718 - -DOCIO_BUILD_DOCS=$(usex doc)
719 - -DOCIO_BUILD_APPS=$(usex opengl)
720 - -DOCIO_BUILD_PYTHON=$(usex python)
721 - -DOCIO_BUILD_JAVA=OFF
722 - -DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
723 - -DOCIO_BUILD_TESTS=$(usex test)
724 - -DOCIO_BUILD_GPU_TESTS=$(usex test)
725 - -DOCIO_BUILD_FROZEN_DOCS=$(usex doc)
726 - -DOCIO_INSTALL_EXT_PACKAGES=NONE
727 - )
728 -
729 - # We need this to work around asserts that can trigger even in proper use cases.
730 - # See https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1235
731 - append-flags -DNDEBUG
732 -
733 - cmake_src_configure
734 -}
735
736 diff --git a/media-libs/opencolorio/opencolorio-2.0.3.ebuild b/media-libs/opencolorio/opencolorio-2.0.3.ebuild
737 deleted file mode 100644
738 index 9897f5ded789..000000000000
739 --- a/media-libs/opencolorio/opencolorio-2.0.3.ebuild
740 +++ /dev/null
741 @@ -1,97 +0,0 @@
742 -# Copyright 1999-2021 Gentoo Authors
743 -# Distributed under the terms of the GNU General Public License v2
744 -
745 -EAPI=7
746 -
747 -PYTHON_COMPAT=( python3_{8..10} )
748 -
749 -inherit cmake flag-o-matic python-single-r1
750 -
751 -DESCRIPTION="A color management framework for visual effects and animation"
752 -HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO"
753 -SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
754 -S="${WORKDIR}/OpenColorIO-${PV}"
755 -
756 -LICENSE="BSD"
757 -SLOT="0"
758 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
759 -IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
760 -REQUIRED_USE="
761 - doc? ( python )
762 - python? ( ${PYTHON_REQUIRED_USE} )
763 -"
764 -
765 -# Not compatible with oiio 2.3
766 -# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
767 -# bug #821073
768 -RDEPEND="
769 - dev-cpp/pystring
770 - dev-python/pybind11
771 - media-libs/ilmbase
772 - dev-cpp/yaml-cpp:=
773 - dev-libs/tinyxml
774 - opengl? (
775 - media-libs/lcms:2
776 - <media-libs/openimageio-2.3:=
777 - media-libs/glew:=
778 - media-libs/freeglut
779 - virtual/opengl
780 - )
781 - python? ( ${PYTHON_DEPS} )
782 -"
783 -DEPEND="${RDEPEND}"
784 -BDEPEND="
785 - >=dev-util/cmake-3.16.2-r1
786 - virtual/pkgconfig
787 - doc? (
788 - $(python_gen_cond_dep '
789 - dev-python/sphinx[${PYTHON_USEDEP}]
790 - dev-python/testresources[${PYTHON_USEDEP}]
791 - ')
792 - )
793 -"
794 -
795 -# Restricting tests, bugs #439790 and #447908
796 -RESTRICT="test"
797 -
798 -CMAKE_BUILD_TYPE=RelWithDebInfo
799 -
800 -pkg_setup() {
801 - use python && python-single-r1_pkg_setup
802 -}
803 -
804 -src_prepare() {
805 - cmake_src_prepare
806 -
807 - 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
808 - 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
809 -}
810 -
811 -src_configure() {
812 - # Missing features:
813 - # - Truelight and Nuke are not in portage for now, so their support are disabled
814 - # - Java bindings was not tested, so disabled
815 - # Notes:
816 - # - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
817 - # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
818 - local mycmakeargs=(
819 - -DBUILD_SHARED_LIBS=ON
820 - -DOCIO_BUILD_STATIC=$(usex static-libs)
821 - -DOCIO_BUILD_DOCS=$(usex doc)
822 - -DOCIO_BUILD_APPS=$(usex opengl)
823 - -DOCIO_BUILD_PYTHON=$(usex python)
824 - -DOCIO_PYTHON_VERSION="${EPYTHON/python/}"
825 - -DOCIO_BUILD_JAVA=OFF
826 - -DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
827 - -DOCIO_BUILD_TESTS=$(usex test)
828 - -DOCIO_BUILD_GPU_TESTS=$(usex test)
829 - -DOCIO_BUILD_FROZEN_DOCS=$(usex doc)
830 - -DOCIO_INSTALL_EXT_PACKAGES=NONE
831 - )
832 -
833 - # We need this to work around asserts that can trigger even in proper use cases.
834 - # See https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1235
835 - append-flags -DNDEBUG
836 -
837 - cmake_src_configure
838 -}
839
840 diff --git a/media-libs/opencolorio/opencolorio-2.1.1-r2.ebuild b/media-libs/opencolorio/opencolorio-2.1.1-r2.ebuild
841 deleted file mode 100644
842 index 579e0b7623fa..000000000000
843 --- a/media-libs/opencolorio/opencolorio-2.1.1-r2.ebuild
844 +++ /dev/null
845 @@ -1,100 +0,0 @@
846 -# Copyright 1999-2022 Gentoo Authors
847 -# Distributed under the terms of the GNU General Public License v2
848 -
849 -EAPI=7
850 -
851 -PYTHON_COMPAT=( python3_{8..10} )
852 -
853 -inherit cmake flag-o-matic python-single-r1
854 -
855 -DESCRIPTION="A color management framework for visual effects and animation"
856 -HOMEPAGE="https://opencolorio.org https://github.com/AcademySoftwareFoundation/OpenColorIO"
857 -SRC_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
858 -S="${WORKDIR}/OpenColorIO-${PV}"
859 -
860 -LICENSE="BSD"
861 -SLOT="0"
862 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
863 -IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
864 -REQUIRED_USE="
865 - doc? ( python )
866 - python? ( ${PYTHON_REQUIRED_USE} )
867 -"
868 -
869 -# Not compatible with oiio 2.3
870 -# https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1509
871 -# bug #821073
872 -# 2.1.1 should be?
873 -RDEPEND="
874 - dev-cpp/pystring
875 - dev-python/pybind11
876 - >=dev-cpp/yaml-cpp-0.7.0:=
877 - dev-libs/tinyxml
878 - media-libs/ilmbase:=
879 - opengl? (
880 - media-libs/lcms:2
881 - media-libs/openimageio:=
882 - media-libs/glew:=
883 - media-libs/freeglut
884 - virtual/opengl
885 - )
886 - python? ( ${PYTHON_DEPS} )
887 -"
888 -DEPEND="${RDEPEND}"
889 -BDEPEND="
890 - >=dev-util/cmake-3.16.2-r1
891 - virtual/pkgconfig
892 - doc? (
893 - $(python_gen_cond_dep '
894 - dev-python/sphinx[${PYTHON_USEDEP}]
895 - dev-python/testresources[${PYTHON_USEDEP}]
896 - ')
897 - )
898 -"
899 -
900 -# Restricting tests, bugs #439790 and #447908
901 -RESTRICT="test"
902 -
903 -CMAKE_BUILD_TYPE=RelWithDebInfo
904 -
905 -pkg_setup() {
906 - use python && python-single-r1_pkg_setup
907 -}
908 -
909 -src_prepare() {
910 - cmake_src_prepare
911 -
912 - 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
913 - 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
914 -}
915 -
916 -src_configure() {
917 - # Missing features:
918 - # - Truelight and Nuke are not in portage for now, so their support are disabled
919 - # - Java bindings was not tested, so disabled
920 - # Notes:
921 - # - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
922 - # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
923 - local mycmakeargs=(
924 - # Don't use imath yet, needs some poking to find the right headers
925 - -DOCIO_USE_OPENEXR_HALF=ON
926 - -DBUILD_SHARED_LIBS=ON
927 - -DOCIO_BUILD_STATIC=$(usex static-libs)
928 - -DOCIO_BUILD_DOCS=$(usex doc)
929 - -DOCIO_BUILD_APPS=$(usex opengl)
930 - -DOCIO_BUILD_PYTHON=$(usex python)
931 - -DOCIO_PYTHON_VERSION="${EPYTHON/python/}"
932 - -DOCIO_BUILD_JAVA=OFF
933 - -DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
934 - -DOCIO_BUILD_TESTS=$(usex test)
935 - -DOCIO_BUILD_GPU_TESTS=$(usex test)
936 - -DOCIO_BUILD_FROZEN_DOCS=$(usex doc)
937 - -DOCIO_INSTALL_EXT_PACKAGES=NONE
938 - )
939 -
940 - # We need this to work around asserts that can trigger even in proper use cases.
941 - # See https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1235
942 - append-flags -DNDEBUG
943 -
944 - cmake_src_configure
945 -}