diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-05-29 03:22:09 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-05-29 03:22:09 +0100 |
commit | d4bd6695641f6d2ec7ff8681913d304e995902f5 (patch) | |
tree | 6ec8d4c38152bb4f2bb4b93277236ebd9fbbd21d /media-libs/opencolorio | |
parent | 22910f5d14da606bd7f06e19a2f61c5d1a8fc94b (diff) |
gentoo resync : 29.05.2018
Diffstat (limited to 'media-libs/opencolorio')
6 files changed, 3 insertions, 218 deletions
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest index 5fa3e59a0695..3dfc43bb453b 100644 --- a/media-libs/opencolorio/Manifest +++ b/media-libs/opencolorio/Manifest @@ -1,12 +1,7 @@ -AUX opencolorio-1.0.8-documentation-gen.patch 1973 BLAKE2B dd84c68f70af7cd6ebef7b2651f1edc8352e97fa08290e6854175f30ddfda4fa3c2451d8313cdf3791777ced76974d0944b855eca8a52c76d034dcb94ae6c61c SHA512 779fa5311a889afb30a31b278e60aaa5253311d071ded8764d2f33e6f69432a41bffd9745059e0b20e28db8445494bdee4aa69908e709e1248a08ea5c2f9c93c -AUX opencolorio-1.0.9-remove-external-doc-utilities.patch 2674 BLAKE2B b5fc774305224345c642c2d1f8813e1229519768679e9ea9a21b6922d90831fcdefcd77b5462a581cd00349476a18c76eb02ba14ad806c23e355597a9b5f06c8 SHA512 f04dc9255dc9c84fd842eab14bb46d3084f1accfc9746a559a0b428a580669e8486d03229f9d00204c761c11c3962f15754d9667daf6b968a95ae2fc2b0f3ac5 AUX opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch 2786 BLAKE2B 91747af3ceac6477d6847c1f87fa69cd77e2cdaaced18cc038ca231af006d453ce4382229b642e8c38ae1642c1f4788c7e9062951e867881bd20012c26a6dcd4 SHA512 2338e1b0994486a7be896d4edddcef67b3b84df9d609e7aebe7a87172163b5f6e7636341e0bfeb0e45d7fdb663932c273ca0568a49ac9d4aa2b827d3808493bc 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 -DIST opencolorio-1.0.9-yaml-0.5-compat-v2.patch.bz2 15418 BLAKE2B 6eaabec7780cb4be9ec4b0b16f79b7114b187b13e3027b6cae3662c6a2b6dacb6566e36fbdf7b2edc77855be505e4cd2c84e16b58d49ccdc59341359419b7cc4 SHA512 8383bc84e209b67aa34c6420348634d0d2a34f1dafda6a10b0c4a15776c2094057a38b00d078b59b648131178f2d65f695890204dbee411602689a0bb7419ecc -DIST opencolorio-1.0.9.tar.gz 12473406 BLAKE2B 54c867521b66d7479c175f65046ffd50ce41fb665c640cf5097b7178cc11dbf17cd324e7d861e4a56c990a109d7f80041d5e83a2438bbfb550e2d8affab7c2da SHA512 f5310cd6d3048d5f307adb41ac1ac807f087a6344c96324cb0f13d0eae1fa3fe5f8005f17adf77664044daf762902223b650b5d8c1636c7801183cd3b4e03ac8 DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998 -EBUILD opencolorio-1.0.9-r2.ebuild 2375 BLAKE2B 6e50184ecd9df51cec933a55fbdb9365c82661b7e9d66d804bebdc329433c996d616898334bd3f1856b381371083584488faa46476962fe3c306db324d891575 SHA512 0e3d7dc603f5811e547ba6de400ae05c519e87ba6135bcda8d7fdbc1d5d87526c0fd8a2f8dd26062b39826bacdc6590fda538036d3cd7d09a0b86e70ccb202c1 -EBUILD opencolorio-1.1.0-r1.ebuild 2351 BLAKE2B 9818f4e13c1ff8f1b5df8eea1e1ba290cbb8383a503d8b9d251f869613b856d1c13a504499c25d8d5c831b78fe67ceb5d0c7a0af45eacf682a44f64ab1c8ffda SHA512 ec1b4d164872dab45dbd7b89c6cea5394f943f31a1afc407cd00d88abaa270cc7986c2dc8816ae17ceb592ba56f8bec9e9cfa2e734471f827c340889da3fd049 -MISC metadata.xml 686 BLAKE2B d2e3b9c9bc524854acf2fdd3d67d596606434bee2bbe5ceef3c2f45823e2948be0c0dc3bbcce82f90d2fb77e1fb5ae74b4e82ec737051f31c2726f82aecf05ee SHA512 68ba2a2e1063a0f8c3e345aa908f4327f38b876581f0cf3cce0e2075a06919c60ca77b40545fcbc923a61700d00e46bb0ff2ce5d44ac5cbe40b1523491e34822 +EBUILD opencolorio-1.1.0-r1.ebuild 2350 BLAKE2B ffebd68258e6c0d21ef892801413a4a20e754504ca9487a6f92d7ab8c10a54f31d96a08d5452cc0632303518fb6f137478d9d81d18ab9e269e9416d501c16bf4 SHA512 2aae32b426b4955266ec5838b57838beaf36a49e07105e6afbc5c25e0744685bd73a9bf52ea8bdb3e3f4f99d8e1d68f165ea0b38988588c40427d26c5f6cd8bb +MISC metadata.xml 551 BLAKE2B b7a648f31772a6a72121dda8736a96e5c54189b20f1eea1600222b27385b695644887a9f084ba7a01c7a530593aa28a2319353c0fdb6e549a03a85fc8a7a1cf4 SHA512 ddd9c8afeb0540e663b3e963f926247da21c72574459cb2f82dc956476fce18f5eb0e2b140ccdbadc98f71b5b855f674d227271f9ff781f689126afbc555f846 diff --git a/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch b/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch deleted file mode 100644 index 7a396b3b735c..000000000000 --- a/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/docs/CMakeLists.txt 2013-01-08 03:19:23.649162615 +0400 -+++ b/docs/CMakeLists.txt 2013-01-08 03:22:29.647329174 +0400 -@@ -81,7 +81,7 @@ - ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTypes.h developers/api/OpenColorTypes.rst) - - add_custom_target(doc ALL -- COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html -+ COMMAND sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html - DEPENDS - OpenColorIO - PyOpenColorIO -@@ -93,20 +93,18 @@ - COMMENT "Building html docs" - SOURCES ${DOCFILES}) - --# note: ExternalProject will not build when added to a add_custom_target this --# works around this problem. This seems to be fixed in the cmake ^HEAD --add_dependencies(doc Sphinx) -- - install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/ -- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/$ENV{P}/html - PATTERN .* EXCLUDE - ) - -+if(OCIO_BUILD_PDF_DOCS) -+ - find_package(LATEX) - if(PDFLATEX_COMPILER) - - add_custom_target(latex -- COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex -+ COMMAND sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex - DEPENDS - OpenColorIO - ${CMAKE_BINARY_DIR}/docs/conf.py -@@ -116,7 +114,6 @@ - ${RSTDOC_OUTPUT} - COMMENT "Building latex doc" - SOURCES ${DOCFILES}) -- add_dependencies(latex Sphinx) - - add_custom_target(pdf ALL - COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex -@@ -126,6 +123,8 @@ - add_dependencies(pdf latex) - - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf -- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/) -+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/$ENV{P}/) - - endif() -+ -+endif() diff --git a/media-libs/opencolorio/files/opencolorio-1.0.9-remove-external-doc-utilities.patch b/media-libs/opencolorio/files/opencolorio-1.0.9-remove-external-doc-utilities.patch deleted file mode 100644 index d30b662e6132..000000000000 --- a/media-libs/opencolorio/files/opencolorio-1.0.9-remove-external-doc-utilities.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/docs/CMakeLists.txt 2013-09-24 13:13:47.572222731 +0400 -+++ b/docs/CMakeLists.txt 2013-09-24 13:14:07.931224505 +0400 -@@ -1,62 +1,3 @@ -- --############################################################################### --### External Doc Apps ### -- --# distribute --set(DISTRIBUTE_VERSION 0.6.36) --ExternalProject_Add(distribute -- URL ${CMAKE_SOURCE_DIR}/ext/distribute-${DISTRIBUTE_VERSION}.tar.gz -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} -- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build -- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} --) -- --# docutils --set(DOCUTILS_VERSION 0.10) --ExternalProject_Add(docutils -- DEPENDS distribute -- URL ${CMAKE_SOURCE_DIR}/ext/docutils-${DOCUTILS_VERSION}.tar.gz -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} -- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build -- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} --) -- --# jinja2 --set(JINJA2_VERSION 2.5.5) --ExternalProject_Add(Jinja2 -- DEPENDS distribute -- URL ${CMAKE_SOURCE_DIR}/ext/Jinja2-${JINJA2_VERSION}.tar.gz -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} -- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build -- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} --) -- --# Pygments --set(PYGMENTS_VERSION 1.3.1) --ExternalProject_Add(Pygments -- DEPENDS distribute -- URL ${CMAKE_SOURCE_DIR}/ext/Pygments-${PYGMENTS_VERSION}.tar.gz -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} -- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build -- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} --) -- --# sphinx --set(SPHINX_VERSION 1.2b1) --ExternalProject_Add(Sphinx -- DEPENDS distribute docutils Jinja2 Pygments -- URL ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.tar.gz -- PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch -- BUILD_IN_SOURCE 1 -- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} -- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build -- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} --install-scripts=${EXTDIST_ROOT}/bin --) -- - ############################################################################### - ### Create Doc Targets ### - diff --git a/media-libs/opencolorio/metadata.xml b/media-libs/opencolorio/metadata.xml index 8622e02f2f8b..ea85c9e1ea2c 100644 --- a/media-libs/opencolorio/metadata.xml +++ b/media-libs/opencolorio/metadata.xml @@ -6,10 +6,6 @@ <name>Gentoo Graphics Project</name> </maintainer> <longdescription lang="en">OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation.</longdescription> - <use> - <flag name="pdf" restrict="<=media-libs/opencolorio-1.1.0-r1"> - Install extra documentation in PDF format</flag> - </use> <upstream> <remote-id type="github">imageworks/OpenColorIO</remote-id> </upstream> diff --git a/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild b/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild deleted file mode 100644 index 1d80450f58a3..000000000000 --- a/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -# Compatibility with Python 3 is declared by upstream, but it is broken in fact, check on bump -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils python-single-r1 vcs-snapshot - -DESCRIPTION="A color management framework for visual effects and animation" -HOMEPAGE="http://opencolorio.org/" -SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz \ - -> ${P}.tar.gz - https://dev.gentoo.org/~pinkbyte/distfiles/patches/${P}-yaml-0.5-compat-v2.patch.bz2" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc opengl pdf python cpu_flags_x86_sse2 test" - -RDEPEND="opengl? ( - media-libs/lcms:2 - >=media-libs/openimageio-1.1.0 - media-libs/glew:0= - media-libs/freeglut - virtual/opengl - ) - python? ( ${PYTHON_DEPS} ) - >=dev-cpp/yaml-cpp-0.5 - dev-libs/tinyxml - " -DEPEND="${RDEPEND} - doc? ( - pdf? ( dev-python/sphinx[latex,${PYTHON_USEDEP}] ) - !pdf? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - ) - " - -# Documentation building requires Python bindings building -REQUIRED_USE="doc? ( python ) python? ( ${PYTHON_REQUIRED_USE} )" - -# Restricting tests, bugs #439790 and #447908 -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/${PN}-1.0.8-documentation-gen.patch" - "${FILESDIR}/${P}-remove-external-doc-utilities.patch" - "${WORKDIR}/${P}-yaml-0.5-compat-v2.patch" -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare - - use python && python_fix_shebang . -} - -src_configure() { - # Missing features: - # - Truelight and Nuke are not in portage for now, so their support are disabled - # - Java bindings was not tested, so disabled - # Notes: - # - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl) - # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl) - local mycmakeargs=( - -DOCIO_BUILD_JNIGLUE=OFF - -DOCIO_BUILD_NUKE=OFF - -DOCIO_BUILD_SHARED=ON - -DOCIO_BUILD_STATIC=OFF - -DOCIO_STATIC_JNIGLUE=OFF - -DOCIO_BUILD_TRUELIGHT=OFF - -DUSE_EXTERNAL_LCMS=ON - -DUSE_EXTERNAL_TINYXML=ON - -DUSE_EXTERNAL_YAML=ON - -DOCIO_BUILD_DOCS="$(usex doc)" - -DOCIO_BUILD_APPS="$(usex opengl)" - -DOCIO_BUILD_PDF_DOCS="$(usex pdf)" - -DOCIO_BUILD_PYGLUE="$(usex python)" - -DOCIO_USE_SSE="$(usex cpu_flags_x86_sse2)" - -DOCIO_BUILD_TESTS="$(usex test)" - ) - cmake-utils_src_configure -} diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild index 8343ce9ccba4..9fba65db5983 100644 --- a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild +++ b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz -> ${P} LICENSE="BSD" SLOT="0" -KEYWORDS="amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test" REQUIRED_USE=" doc? ( python ) |