diff options
Diffstat (limited to 'media-libs/opencolorio/files')
8 files changed, 0 insertions, 426 deletions
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.") |