summaryrefslogtreecommitdiff
path: root/media-libs/opencolorio
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2018-01-16 17:34:21 +0000
committerV3n3RiX <venerix@redcorelinux.org>2018-01-16 17:34:21 +0000
commit02e2208f46f4e2c00fb9743cbc47350bdd233bfa (patch)
tree132dd60828854db4f65f30f9230f43d9602507ff /media-libs/opencolorio
parent8be70107efbb417f839292165ee39d07a062046f (diff)
gentoo resync : 16.01.2018
Diffstat (limited to 'media-libs/opencolorio')
-rw-r--r--media-libs/opencolorio/Manifest6
-rw-r--r--media-libs/opencolorio/files/opencolorio-1.1.0-cmake-fixes.patch (renamed from media-libs/opencolorio/files/opencolorio-1.0.9-cmake-fixes-v1.patch)69
-rw-r--r--media-libs/opencolorio/opencolorio-1.1.0.ebuild (renamed from media-libs/opencolorio/opencolorio-1.0.9_p20170719.ebuild)7
3 files changed, 52 insertions, 30 deletions
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 20218981eaeb..e92eeec2e3a9 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,9 +1,9 @@
AUX opencolorio-1.0.8-documentation-gen.patch 1973 BLAKE2B dd84c68f70af7cd6ebef7b2651f1edc8352e97fa08290e6854175f30ddfda4fa3c2451d8313cdf3791777ced76974d0944b855eca8a52c76d034dcb94ae6c61c SHA512 779fa5311a889afb30a31b278e60aaa5253311d071ded8764d2f33e6f69432a41bffd9745059e0b20e28db8445494bdee4aa69908e709e1248a08ea5c2f9c93c
-AUX opencolorio-1.0.9-cmake-fixes-v1.patch 5887 BLAKE2B 6b3c6160ee55dece3156439a355433139c3ed081a5547c83c6c74b8476e5718234c7044a5a2d46eeaadbabde828e2f367d65444898d9c2eb93ac217984a0392d SHA512 d3f4624f673528f7f5e7663dc4fef2cfe3eb1d23eae5a66655b677710a9500504b025631f215da611da7aa619cdfb1052b3a19fd8d6266c4c099ef68bebe4ce4
AUX opencolorio-1.0.9-remove-external-doc-utilities.patch 2674 BLAKE2B b5fc774305224345c642c2d1f8813e1229519768679e9ea9a21b6922d90831fcdefcd77b5462a581cd00349476a18c76eb02ba14ad806c23e355597a9b5f06c8 SHA512 f04dc9255dc9c84fd842eab14bb46d3084f1accfc9746a559a0b428a580669e8486d03229f9d00204c761c11c3962f15754d9667daf6b968a95ae2fc2b0f3ac5
+AUX opencolorio-1.1.0-cmake-fixes.patch 6937 BLAKE2B 509b1a11309a9854c15581ad0bdae40277473f5dcaf2c02377346ad5075ddd4c65bf2811c6975d53c0495384a123bc128d4b2c4ff0a52fdfae4f1a7d8bc2c7bd SHA512 aa50831b22740ccbfd6d990ac334f77f82725c6ce6701205857099ec662329309fb8cca6a472ec9650573a9b6c82f26f6076f570ca2066cde445139feea7691c
DIST opencolorio-1.0.9-yaml-0.5-compat-v2.patch.bz2 15418 BLAKE2B 6eaabec7780cb4be9ec4b0b16f79b7114b187b13e3027b6cae3662c6a2b6dacb6566e36fbdf7b2edc77855be505e4cd2c84e16b58d49ccdc59341359419b7cc4 SHA512 8383bc84e209b67aa34c6420348634d0d2a34f1dafda6a10b0c4a15776c2094057a38b00d078b59b648131178f2d65f695890204dbee411602689a0bb7419ecc
DIST opencolorio-1.0.9.tar.gz 12473406 BLAKE2B 54c867521b66d7479c175f65046ffd50ce41fb665c640cf5097b7178cc11dbf17cd324e7d861e4a56c990a109d7f80041d5e83a2438bbfb550e2d8affab7c2da SHA512 f5310cd6d3048d5f307adb41ac1ac807f087a6344c96324cb0f13d0eae1fa3fe5f8005f17adf77664044daf762902223b650b5d8c1636c7801183cd3b4e03ac8
-DIST opencolorio-1.0.9_p20170719.tar.gz 13752783 BLAKE2B 2f6a0e095bb3fd56a49b6d43f5c4f3690a2c735c1cc84c337bcb19abf391bedd600bcb6fc512fd8e1c56fe1e337ee57358329490f2dc2c92362b8c939a579917 SHA512 1ee86cae951afed963bc62e251975a6c721553fc1bb7650faccb6160fcd6b3e030c509667cb7b2543a3ca32ed6777259d98bf25e2bb8150fee8054310b9d2590
+DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
EBUILD opencolorio-1.0.9-r2.ebuild 2375 BLAKE2B 6e50184ecd9df51cec933a55fbdb9365c82661b7e9d66d804bebdc329433c996d616898334bd3f1856b381371083584488faa46476962fe3c306db324d891575 SHA512 0e3d7dc603f5811e547ba6de400ae05c519e87ba6135bcda8d7fdbc1d5d87526c0fd8a2f8dd26062b39826bacdc6590fda538036d3cd7d09a0b86e70ccb202c1
-EBUILD opencolorio-1.0.9_p20170719.ebuild 2263 BLAKE2B 863c66788e80a083a93ed18afa648c4ff63b69c0899998a3fd8b6bc35107a1ed1f02fec74e5356409abf72a2af61bdf451bcca7b9f6733fdf179f5be249c8189 SHA512 1723b1b792f94a5d39d2568354d766ad6367de56824ce279bf888478ba700c7a420594e64750420e965051b69629833d8e45714b5cc75510204711f0ecfabb27
+EBUILD opencolorio-1.1.0.ebuild 2186 BLAKE2B 0dfafb7a611aaa519e4a20ba464c778976f0feaa9ad6bbbbda397c3aeb044074363f584f7b1db244bdb2f91b67edc6424ffca257506032efe89a9d52718b8f88 SHA512 3512e32d06ad7d43e51266f480fbc366e0ef0cafbd7bf5e6cfd40023f0a3020cdf08915eae291509b238d9c0b4bfe8fa64ce7ecd3cf3944aeb17e790e5491cbf
MISC metadata.xml 634 BLAKE2B b707f9f7705642ba845a2d2c624432198dc2006bfeffce5d62407e3a078e04a963b297ecf0d615d73cc0cc2ab352bc191ea5f11347b84b137d2aa8acceb25b45 SHA512 4557bc67a3d3e02c66335890947b85a2d8f46c7c73eceae8b29a3e732ea6c0bb767ee87a932a7148f4cfc0f125c184657fc8d7e23c8ba5ba1523f7e35ce4e047
diff --git a/media-libs/opencolorio/files/opencolorio-1.0.9-cmake-fixes-v1.patch b/media-libs/opencolorio/files/opencolorio-1.1.0-cmake-fixes.patch
index 23f67cae55c5..9cb3500d9dab 100644
--- a/media-libs/opencolorio/files/opencolorio-1.0.9-cmake-fixes-v1.patch
+++ b/media-libs/opencolorio/files/opencolorio-1.1.0-cmake-fixes.patch
@@ -1,6 +1,6 @@
diff -purN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2017-07-19 21:38:48.000000000 +0100
-+++ b/CMakeLists.txt 2017-08-15 14:14:02.223744929 +0100
+--- a/CMakeLists.txt 2017-11-29 22:51:15.000000000 +0000
++++ b/CMakeLists.txt 2017-12-27 16:49:51.461300828 +0000
@@ -59,6 +59,7 @@ endif()
include(ParseArguments)
include(OCIOMacros)
@@ -9,7 +9,7 @@ diff -purN a/CMakeLists.txt b/CMakeLists.txt
enable_language(CXX)
-@@ -519,7 +520,7 @@ endif()
+@@ -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)
@@ -18,29 +18,48 @@ diff -purN a/CMakeLists.txt b/CMakeLists.txt
###############################################################################
### CPACK ###
-@@ -634,4 +635,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
+@@ -646,4 +647,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
"
)
-install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/CMake)
diff -purN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
---- a/docs/CMakeLists.txt 2017-07-19 21:38:48.000000000 +0100
-+++ b/docs/CMakeLists.txt 2017-08-15 14:10:29.645282585 +0100
-@@ -1,68 +1,5 @@
+--- a/docs/CMakeLists.txt 2017-11-29 22:51:15.000000000 +0000
++++ b/docs/CMakeLists.txt 2017-12-27 16:53:28.976491353 +0000
+@@ -1,91 +1,5 @@
###############################################################################
-### External Doc Apps ###
-
+-if (WIN32)
+- # Workaround to mimic *nix '> PYTHONPATH=XXX CMD'
+- # on windows, it becomes '> set PYTHONPATH=XXX \n call CMD'
+- # '\n' is here because '\\&' does not work.
+- set(PYT_PRE_CMD set PYTHONPATH=${PYTHONPATH} "\n" call )
+- # Unfortunately some windows tools require to have
+- # the paths with the '\' (not working with '//').
+- set(PYT_LIB_OUTPUT ${EXTDIST_ROOT})
+- string(REGEX REPLACE "/" "\\\\" PYT_LIB_OUTPUT ${PYT_LIB_OUTPUT})
+- set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH})
+- string(REGEX REPLACE "/" "\\\\" PYT_EXTDIST_BINPATH ${PYT_EXTDIST_BINPATH})
+-else()
+- set(PYT_PRE_CMD PYTHONPATH=${PYTHONPATH})
+- set(PYT_LIB_OUTPUT ${EXTDIST_ROOT})
+- set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH})
+-endif()
+-
-# setuptools
-# https://pypi.python.org/pypi/setuptools
-set(SETUPTOOLS_VERSION 1.1.6)
+-
-ExternalProject_Add(setuptools
- URL ${CMAKE_SOURCE_DIR}/ext/setuptools-${SETUPTOOLS_VERSION}.tar.gz
- BUILD_IN_SOURCE 1
- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
+- 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
@@ -51,8 +70,9 @@ diff -purN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
- 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}
+- 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
@@ -63,8 +83,9 @@ diff -purN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
- 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}
+- 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
@@ -75,8 +96,9 @@ diff -purN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
- 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}
+- 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
@@ -88,24 +110,25 @@ diff -purN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
- 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
+- BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+- INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-scripts=${PYT_EXTDIST_BINPATH}
+- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Sphinx-prefix/src/Sphinx
-)
-
-###############################################################################
### Create Doc Targets ###
message(STATUS "Create sphinx conf.py from conf.py.in")
-@@ -99,7 +36,7 @@ else()
+@@ -122,7 +36,7 @@ else()
endif()
add_custom_target(doc ALL
-- COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
+- COMMAND ${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
-@@ -110,20 +47,18 @@ add_custom_target(doc ALL
+@@ -133,20 +47,18 @@ add_custom_target(doc ALL
COMMENT "Building html docs"
SOURCES ${DOCFILES})
@@ -125,12 +148,12 @@ diff -purN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
if(PDFLATEX_COMPILER)
add_custom_target(latex
-- COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
+- COMMAND ${PYT_PRE_CMD} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
+ COMMAND sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
DEPENDS
OpenColorIO
${CMAKE_BINARY_DIR}/docs/conf.py
-@@ -133,7 +68,6 @@ if(PDFLATEX_COMPILER)
+@@ -156,7 +68,6 @@ if(PDFLATEX_COMPILER)
${RSTDOC_OUTPUT}
COMMENT "Building latex doc"
SOURCES ${DOCFILES})
@@ -138,7 +161,7 @@ diff -purN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
add_custom_target(pdf ALL
COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex
-@@ -143,6 +77,8 @@ if(PDFLATEX_COMPILER)
+@@ -166,6 +77,8 @@ if(PDFLATEX_COMPILER)
add_dependencies(pdf latex)
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
diff --git a/media-libs/opencolorio/opencolorio-1.0.9_p20170719.ebuild b/media-libs/opencolorio/opencolorio-1.1.0.ebuild
index cfcbd93bf47f..c1504ae4a464 100644
--- a/media-libs/opencolorio/opencolorio-1.0.9_p20170719.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -11,8 +11,7 @@ inherit cmake-utils python-single-r1 vcs-snapshot
DESCRIPTION="A color management framework for visual effects and animation"
HOMEPAGE="http://opencolorio.org/"
-MY_GIT_COMMIT="7e7f10afce97254cdc1295a3594ddd5e6fb555d6"
-SRC_URI="https://github.com/imageworks/OpenColorIO/archive/${MY_GIT_COMMIT}.tar.gz \
+SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz \
-> ${P}.tar.gz"
LICENSE="BSD"
@@ -45,7 +44,7 @@ DEPEND="${RDEPEND}
# Restricting tests, bugs #439790 and #447908
RESTRICT="test"
-PATCHES=( "${FILESDIR}/${PN}-1.0.9-cmake-fixes-v1.patch" )
+PATCHES=( "${FILESDIR}/${P}-cmake-fixes.patch" )
pkg_setup() {
use python && python-single-r1_pkg_setup
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 18:26:57 +0000