[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/, media-libs/opencolorio/

2023-10-28 Thread Sam James 
commit: 5ec2935c4a72141d81fbf2910128470321fdd92e
Author: Paul Zander  gmail  com>
AuthorDate: Sat Oct 28 10:49:24 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 28 21:43:56 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ec2935c

media-libs/opencolorio: 2.3.0 Correctly recover CXX_FLAGS

>From https://github.com/AcademySoftwareFoundation/OpenColorIO/pull/1861

CXXFLAGS is backed up in the beginning of CheckSupportSSE2, but it is
not correctly recovered.

Signed-off-by: Paul Zander  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../files/opencolorio-2.3.0-fix-cxxflags.patch | 23 ++
 media-libs/opencolorio/opencolorio-2.3.0.ebuild|  1 +
 2 files changed, 24 insertions(+)

diff --git a/media-libs/opencolorio/files/opencolorio-2.3.0-fix-cxxflags.patch 
b/media-libs/opencolorio/files/opencolorio-2.3.0-fix-cxxflags.patch
new file mode 100644
index ..cefae22a00e6
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-2.3.0-fix-cxxflags.patch
@@ -0,0 +1,23 @@
+From d69edd3ef411853cd780b75cf260295a39a8a49f Mon Sep 17 00:00:00 2001
+From: Eric Renaud-Houde 
+Date: Wed, 20 Sep 2023 15:10:46 -0400
+Subject: [PATCH] Correctly reset CMAKE_CXX_FLAGS.
+
+Signed-off-by: Eric Renaud-Houde 
+---
+ share/cmake/utils/CheckSupportSSE2.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/share/cmake/utils/CheckSupportSSE2.cmake 
b/share/cmake/utils/CheckSupportSSE2.cmake
+index 8c929c7e9..6a07155de 100644
+--- a/share/cmake/utils/CheckSupportSSE2.cmake
 b/share/cmake/utils/CheckSupportSSE2.cmake
+@@ -59,7 +59,7 @@ else()
+ message(STATUS "Performing Test COMPILER_SUPPORTS_SSE2 - Failed")
+ endif()
+ 
+-set(CMAKE_REQUIRED_FLAGS "${_cmake_cxx_flags_orig}")
++set(CMAKE_CXX_FLAGS "${_cmake_cxx_flags_orig}")
+ unset(_cmake_cxx_flags_orig)
+ 
+ if(__universal_build)

diff --git a/media-libs/opencolorio/opencolorio-2.3.0.ebuild 
b/media-libs/opencolorio/opencolorio-2.3.0.ebuild
index a89bc43446ab..13f9c323a420 100644
--- a/media-libs/opencolorio/opencolorio-2.3.0.ebuild
+++ b/media-libs/opencolorio/opencolorio-2.3.0.ebuild
@@ -82,6 +82,7 @@ RESTRICT="!test? ( test )"
 PATCHES=(
"${FILESDIR}/${PN}-2.2.1-adjust-python-installation.patch"
"${FILESDIR}/${PN}-2.3.0-support-yaml-cpp-0.8.0.patch"
+   "${FILESDIR}/${PN}-2.3.0-fix-cxxflags.patch"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/, media-libs/opencolorio/

2023-09-26 Thread Sam James 
commit: f6301c1fc5eac9e41164de7fd5c4db0c581979ad
Author: Paul Zander  gmail  com>
AuthorDate: Tue Sep 26 17:24:38 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Sep 26 20:45:40 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6301c1f

media-libs/opencolorio: add 2.3.0

Closes: https://bugs.gentoo.org/914716
Signed-off-by: Paul Zander  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-libs/opencolorio/Manifest|   1 +
 .../opencolorio-2.3.0-support-yaml-cpp-0.8.0.patch |  21 
 media-libs/opencolorio/opencolorio-2.3.0.ebuild| 131 +
 3 files changed, 153 insertions(+)

diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index debed58d79d4..fbe8b3a98232 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,2 +1,3 @@
 DIST opencolorio-2.1.3.tar.gz 11024701 BLAKE2B 
bcd1eb6a74260f451e49ef40e729bfc4c354ab255d96c261fbf865c586f285fe876ed54b05276f3b6b25ece4fd261672fe1dd519041ffad77d7c78efc8cf161d
 SHA512 
b26fcfa3ea12ab6e4b019a13ce79ebcfd215c674acb348f2d9f85f749b2a5beccd395ed1cc9954e4b3cb83a160b24a8d7d81994ac1d9ea8cfe074b81d6b8a061
 DIST opencolorio-2.2.1.tar.gz 11336775 BLAKE2B 
b463d6a0a7e7fec0a890fa8a0cd06ed269f925c5986dfb82eb53728a09d884c89e6c4dfe112706ce27351d4440909ff9680387028d1dc887e7d866b30c39c54f
 SHA512 
d5f3a4b5bd661af7336c015d07e0feccb286464a08239a3c259a97217001161e7571f5137475fc2f4d1b9af6381bbfa03c0b60f41de282f114307961b8d84fc9
+DIST opencolorio-2.3.0.tar.gz 11406998 BLAKE2B 
0e62e43de076a712f68b68b91c9908bc9050316e3500e0924fafb08a3356ce361953f49dfd1eb022eeada11e499653833a48a22a4ba593504617c1c61b16d488
 SHA512 
cdf20ca6c85b1d70244d8532d010344f1cf85be6a116d831e83ea04d7c47a961049691e6a241e9a7f632d864df57a4bccb68084e27187ec8a05f1fdf344824d7

diff --git 
a/media-libs/opencolorio/files/opencolorio-2.3.0-support-yaml-cpp-0.8.0.patch 
b/media-libs/opencolorio/files/opencolorio-2.3.0-support-yaml-cpp-0.8.0.patch
new file mode 100644
index ..924ed2092881
--- /dev/null
+++ 
b/media-libs/opencolorio/files/opencolorio-2.3.0-support-yaml-cpp-0.8.0.patch
@@ -0,0 +1,21 @@
+From: Bernd Feige 
+https://bugs.gentoo.org/914716#c12
+
+Index: OpenColorIO-2.3.0/share/cmake/modules/Findyaml-cpp.cmake
+===
+--- OpenColorIO-2.3.0.orig/share/cmake/modules/Findyaml-cpp.cmake
 OpenColorIO-2.3.0/share/cmake/modules/Findyaml-cpp.cmake
+@@ -50,7 +50,12 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUA
+ endif()
+ 
+ if(yaml-cpp_FOUND)
+-get_target_property(yaml-cpp_LIBRARY yaml-cpp LOCATION)
++if(TARGET yaml-cpp::yaml-cpp)
++   # yaml-cpp >= 0.8
++   get_target_property(yaml-cpp::yaml-cpp_LIBRARY yaml-cpp::yaml-cpp 
LOCATION)
++  else()
++   get_target_property(yaml-cpp_LIBRARY yaml-cpp LOCATION)
++  endif()
+ else()
+ 
+ # As yaml-cpp-config.cmake search fails, search an installed library

diff --git a/media-libs/opencolorio/opencolorio-2.3.0.ebuild 
b/media-libs/opencolorio/opencolorio-2.3.0.ebuild
new file mode 100644
index ..dc1dfe604786
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-2.3.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake python-single-r1 virtualx
+
+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/$(ver_cut 1-2)"
+# minizip-ng: ~arm ~arm64 ~ppc64 ~riscv
+# osl: ~riscv
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apps cpu_flags_x86_sse2 doc opengl python static-libs test"
+# TODO: drop opengl? It does nothing without building either the apps or the 
testsuite
+REQUIRED_USE="
+   apps? ( opengl )
+   doc? ( python )
+   python? ( ${PYTHON_REQUIRED_USE} )
+   test? ( opengl )
+"
+
+RDEPEND="
+   dev-cpp/pystring
+   >=dev-cpp/yaml-cpp-0.7.0:=
+   dev-libs/expat
+   >=dev-libs/imath-3.1.5:=
+   sys-libs/minizip-ng
+   sys-libs/zlib
+   apps? (
+   media-libs/lcms:2
+   >=media-libs/openexr-3.1.5:=
+   )
+   opengl? (
+   media-libs/freeglut
+   media-libs/glew:=
+   media-libs/libglvnd
+   )
+   python? (
+   ${PYTHON_DEPS}
+   $(python_gen_cond_dep 'dev-python/pybind11[${PYTHON_USEDEP}]')
+   )
+"
+DEPEND="${RDEPEND}"
+# TODO: OSL tests would need OIIO, leading to a circular dependency. If OIIO
+# isn't found this test will be skipped (automagic if found?)
+BDEPEND="
+   virtual/pkgconfig
+   doc? (
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/, media-libs/opencolorio/

2022-02-11 Thread Sam James 
commit: f5792b47accb449ecb4a2aafe3b0d8a720b63e94
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 12 02:13:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 12 03:55:32 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5792b47

media-libs/opencolorio: flip over to OpenEXR 3

Things are getting complicated with trying to keep Blender
on OpenEXR 2. Blender needs to switch as a result, but
so do its dependencies.

Bug: https://bugs.gentoo.org/831357
Bug: https://bugs.gentoo.org/832862
Bug: https://bugs.gentoo.org/821247
Signed-off-by: Sam James  gentoo.org>

 .../files/opencolorio-2.1.1-imath-openexr-3.patch  |  75 +++
 media-libs/opencolorio/opencolorio-2.1.1-r3.ebuild | 106 +
 2 files changed, 181 insertions(+)

diff --git 
a/media-libs/opencolorio/files/opencolorio-2.1.1-imath-openexr-3.patch 
b/media-libs/opencolorio/files/opencolorio-2.1.1-imath-openexr-3.patch
new file mode 100644
index ..bf606889865d
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-2.1.1-imath-openexr-3.patch
@@ -0,0 +1,75 @@
+diff --git a/share/cmake/modules/FindImath.cmake 
b/share/cmake/modules/FindImath.cmake
+index 44a55e8..8a2d7ca 100644
+--- a/share/cmake/modules/FindImath.cmake
 b/share/cmake/modules/FindImath.cmake
+@@ -49,6 +49,7 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
+ find_path(Imath_INCLUDE_DIR
+ NAMES
+ Imath/ImathConfig.h
++Imath-3/IMathConfig.h
+ HINTS
+ ${Imath_ROOT}
+ ${PC_Imath_INCLUDE_DIRS}
+@@ -90,8 +91,8 @@ if(NOT OCIO_INSTALL_EXT_PACKAGES STREQUAL ALL)
+ 
+ # Get version from config header file
+ if(Imath_INCLUDE_DIR)
+-if(EXISTS "${Imath_INCLUDE_DIR}/Imath/ImathConfig.h")
+-set(_Imath_CONFIG "${Imath_INCLUDE_DIR}/Imath/ImathConfig.h")
++if(EXISTS "${Imath_INCLUDE_DIR}/Imath-3/ImathConfig.h")
++set(_Imath_CONFIG 
"${Imath_INCLUDE_DIR}/Imath-3/ImathConfig.h")
+ endif()
+ endif()
+ 
+diff --git a/src/utils/Half.h.in b/src/utils/Half.h.in
+index 3784341..237f3ed 100644
+--- a/src/utils/Half.h.in
 b/src/utils/Half.h.in
+@@ -8,7 +8,7 @@
+ #define OCIO_USE_IMATH_HALF @OCIO_USE_IMATH_HALF@
+ 
+ #if OCIO_USE_IMATH_HALF
+-#   include 
++#   include 
+ #else
+ #   include 
+ #endif
+diff --git a/vendor/aftereffects/vc/vc15/utils/Half.h 
b/vendor/aftereffects/vc/vc15/utils/Half.h
+index 5035750..5144e72 100644
+--- a/vendor/aftereffects/vc/vc15/utils/Half.h
 b/vendor/aftereffects/vc/vc15/utils/Half.h
+@@ -8,7 +8,7 @@
+ #define OCIO_USE_IMATH_HALF 0
+ 
+ #if OCIO_USE_IMATH_HALF
+-#   include 
++#   include 
+ #else
+ #   include 
+ #endif
+diff --git a/vendor/aftereffects/xcode/xcode12/utils/Half.h 
b/vendor/aftereffects/xcode/xcode12/utils/Half.h
+index 5035750..5144e72 100644
+--- a/vendor/aftereffects/xcode/xcode12/utils/Half.h
 b/vendor/aftereffects/xcode/xcode12/utils/Half.h
+@@ -8,7 +8,7 @@
+ #define OCIO_USE_IMATH_HALF 0
+ 
+ #if OCIO_USE_IMATH_HALF
+-#   include 
++#   include 
+ #else
+ #   include 
+ #endif
+diff --git a/vendor/aftereffects/xcode/xcode9/utils/Half.h 
b/vendor/aftereffects/xcode/xcode9/utils/Half.h
+index 5035750..5144e72 100644
+--- a/vendor/aftereffects/xcode/xcode9/utils/Half.h
 b/vendor/aftereffects/xcode/xcode9/utils/Half.h
+@@ -8,7 +8,7 @@
+ #define OCIO_USE_IMATH_HALF 0
+ 
+ #if OCIO_USE_IMATH_HALF
+-#   include 
++#   include 
+ #else
+ #   include 
+ #endif

diff --git a/media-libs/opencolorio/opencolorio-2.1.1-r3.ebuild 
b/media-libs/opencolorio/opencolorio-2.1.1-r3.ebuild
new file mode 100644
index ..65a48f36c3c7
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-2.1.1-r3.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2022 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"
+# 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 ~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?
+RDEPEND="
+   dev-cpp/pystring
+   dev-python/pybind11
+   >=dev-cpp/yaml-cpp-0.7.0:=
+

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/, media-libs/opencolorio/

2021-06-07 Thread Sam James 
commit: 3533aee04be15a96cc9c0f783e3e94a9c217b430
Author: Bernd Waibel  posteo  net>
AuthorDate: Sun Jun  6 18:55:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun  7 17:25:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3533aee0

media-libs/opencolorio: respect python sitedir

Pass certain variables to cmake and add a patch to respect the python
site-packages dir.

Closes: https://bugs.gentoo.org/794604
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21143
Signed-off-by: Sam James  gentoo.org>

 ...ecific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch | 38 ++
 media-libs/opencolorio/opencolorio-1.1.1.ebuild|  8 +
 2 files changed, 46 insertions(+)

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
new file mode 100644
index 000..0f0fb4e649d
--- /dev/null
+++ 
b/media-libs/opencolorio/files/opencolorio-1.1.1-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch
@@ -0,0 +1,38 @@
+From 80c08e5bee5bd9fc37a6aeff4b7b7bb8edb3c831 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+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 
+---
+ 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/opencolorio-1.1.1.ebuild 
b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
index 8d00c38a853..8fb845a03b7 100644
--- a/media-libs/opencolorio/opencolorio-1.1.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
@@ -54,6 +54,7 @@ PATCHES=(
"${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() {
@@ -90,6 +91,13 @@ src_configure() {
-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
 }

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/, media-libs/opencolorio/

2020-11-18 Thread Sam James 
commit: 175603a404585a7e5c045c4bab7982b617bec5cd
Author: Sam James  gentoo  org>
AuthorDate: Wed Nov 18 19:20:55 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Nov 18 19:21:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=175603a4

media-libs/opencolorio: fix Clang build

Thanks-to: 0xC0ncord  concord.sh>
Bug: https://bugs.gentoo.org/754966
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 .../files/opencolorio-1.1.1-fix-self-assign-clang.patch| 14 ++
 media-libs/opencolorio/opencolorio-1.1.1.ebuild|  1 +
 2 files changed, 15 insertions(+)

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
new file mode 100644
index 000..c6193277458
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.1.1-fix-self-assign-clang.patch
@@ -0,0 +1,14 @@
+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/opencolorio-1.1.1.ebuild 
b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
index 8286b611ee7..f5179fea400 100644
--- a/media-libs/opencolorio/opencolorio-1.1.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
@@ -52,6 +52,7 @@ PATCHES=(
"${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"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/, media-libs/opencolorio/

2020-10-10 Thread Sam James 
commit: 4751ed3cfef4736ce6684af0b677f744e3fffe0f
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 10 13:35:26 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 10 13:35:39 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4751ed3c

media-libs/opencolorio: drop useless Boost check

We don't actually need Boost; upstream were checking
on behalf of yaml-cpp, which doesn't need Boost anymore
anyway, but it wouldn't have been opencolorio's responsibility
for it even if it did.

This test has since been dropped upstream.

Closes: https://bugs.gentoo.org/747553
Package-Manager: Portage-3.0.4, Repoman-3.0.1
Signed-off-by: Sam James  gentoo.org>

 .../opencolorio-1.1.1-yaml-cpp-boost-check.patch   | 35 ++
 media-libs/opencolorio/opencolorio-1.1.1.ebuild|  1 +
 2 files changed, 36 insertions(+)

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
new file mode 100644
index 000..0f3c3e3ba19
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.1.1-yaml-cpp-boost-check.patch
@@ -0,0 +1,35 @@
+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.ebuild 
b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
index 9b3802a51da..9b6bcb993be 100644
--- a/media-libs/opencolorio/opencolorio-1.1.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
@@ -51,6 +51,7 @@ PATCHES=(
"${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"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/, media-libs/opencolorio/

2019-05-19 Thread Andreas Sturmlechner 
commit: c90bb560b5723836ba466d41886e75fe832c1e9c
Author: Bernd Waibel  gmail  com>
AuthorDate: Sun Mar 31 08:23:27 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun May 19 17:23:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c90bb560

media-libs/opencolorio: disable -Werror flag

The src/pyglue/CMakeLists.txt has a global -Werror flag set
for unix systems, which let the compile fail. This patch removes this
flag.

Closes: https://bugs.gentoo.org/96
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Bernd Waibel  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/12049
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/opencolorio-1.1.0-remove-Werror.patch | 17 +
 media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild  |  1 +
 2 files changed, 18 insertions(+)

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
new file mode 100644
index 000..2814f703f81
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.1.0-remove-Werror.patch
@@ -0,0 +1,17 @@
+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/opencolorio-1.1.0-r1.ebuild 
b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
index 2ee8b87912a..86efd8a9f58 100644
--- a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
@@ -45,6 +45,7 @@ PATCHES=(

"${FILESDIR}/${P}-use-GNUInstallDirs-and-fix-cmake-install-location.patch"
"${FILESDIR}/${P}-remove-building-of-bundled-programs.patch"
"${FILESDIR}/${P}-yaml-cpp-0.6.patch"
+   "${FILESDIR}/${P}-remove-Werror.patch"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/, media-libs/opencolorio/

2018-05-26 Thread Johannes Huber 
commit: 1e76cacb7c6e5105c343e028dcf0722e88e74260
Author: Johannes Huber  gentoo  org>
AuthorDate: Sat May 26 11:01:37 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sat May 26 11:01:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e76cacb

media-libs/opencolorio: Remove 1.0.9-r2

Overshadowed by 1.1.0-r1.

Package-Manager: Portage-2.3.39, Repoman-2.3.9

 media-libs/opencolorio/Manifest|  2 -
 .../opencolorio-1.0.8-documentation-gen.patch  | 54 --
 ...lorio-1.0.9-remove-external-doc-utilities.patch | 65 
 media-libs/opencolorio/metadata.xml|  4 -
 media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild | 87 --
 5 files changed, 212 deletions(-)

diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 61692b3aa83..43489473eb6 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,3 +1 @@
-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

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 7a396b3b735..000
--- 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 d30b662e613..000
--- 
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.57731 +0400
-+++ b/docs/CMakeLists.txt  2013-09-24 13:14:07.931224505 +0400
-@@ -1,62 +1,3 @@
--
--###
--### External Doc Apps ###
--
--# distribute

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/, media-libs/opencolorio/

2018-05-20 Thread Johannes Huber 
commit: 8932d46026a180fc809252ae81cbbd4da70d7af9
Author: Johannes Huber  gentoo  org>
AuthorDate: Sun May 20 22:36:15 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Sun May 20 22:36:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8932d460

media-libs/opencolorio: Fix build w/ yaml-cpp-0.6

Closes: https://bugs.gentoo.org/651970
Reported-by: Bernd Feige  gmx.net>
Thanks-to: Joakim Gebart Nohlgård  eistec.se>
Package-Manager: Portage-2.3.38, Repoman-2.3.9

 .../files/opencolorio-1.1.0-yaml-cpp-0.6.patch | 54 ++
 media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild |  1 +
 2 files changed, 55 insertions(+)

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
new file mode 100644
index 000..2094e1ed58b
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.1.0-yaml-cpp-0.6.patch
@@ -0,0 +1,54 @@
+commit 8ce96cc5d590a1c094fb316968f2db8464f3be82
+Author: Joakim Nohlgård 
+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 
+ 
+-#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  class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-template <> class TypedKeyNotFound;
+-}
+-#pragma GCC visibility pop
+-
+-#endif
+-
+ #ifdef WIN32
+ #pragma warning( push )
+ #pragma warning( disable: 4146 )

diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild 
b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
index 82a5b17acd9..7ed8940ab02 100644
--- a/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild
@@ -44,6 +44,7 @@ PATCHES=(
"${FILESDIR}/${P}-fix-compile-error-with-Lut1DOp.cpp.patch"

"${FILESDIR}/${P}-use-GNUInstallDirs-and-fix-cmake-install-location.patch"
"${FILESDIR}/${P}-remove-building-of-bundled-programs.patch"
+   "${FILESDIR}/${P}-yaml-cpp-0.6.patch"
 )
 
 pkg_setup() {

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/, media-libs/opencolorio/

2018-01-19 Thread David Seifert 
commit: 636ba02a5f87c2693988b93cf995042bed78c4de
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Mon Jan 15 15:05:37 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jan 19 11:57:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=636ba02a

media-libs/opencolorio: Remove ebuild with errors

 .../files/opencolorio-1.1.0-cmake-fixes.patch  | 173 -
 media-libs/opencolorio/opencolorio-1.1.0.ebuild|  85 --
 2 files changed, 258 deletions(-)

diff --git a/media-libs/opencolorio/files/opencolorio-1.1.0-cmake-fixes.patch 
b/media-libs/opencolorio/files/opencolorio-1.1.0-cmake-fixes.patch
deleted file mode 100644
index 9cb3500d9da..000
--- a/media-libs/opencolorio/files/opencolorio-1.1.0-cmake-fixes.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-diff -purN a/CMakeLists.txt b/CMakeLists.txt
 a/CMakeLists.txt   2017-11-29 22:51:15.0 +
-+++ b/CMakeLists.txt   2017-12-27 16:49:51.461300828 +
-@@ -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_DATAROOTDIR}/ocio/)
- 
- 
###
- ### CPACK ###
-@@ -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-11-29 22:51:15.0 +
-+++ b/docs/CMakeLists.txt  2017-12-27 16:53:28.976491353 +
-@@ -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 ${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

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/, media-libs/opencolorio/

2018-01-19 Thread David Seifert 
commit: e1190425c7265517e4e90e67ef82abcca66006db
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Mon Jan 15 15:02:16 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Jan 19 11:57:41 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1190425

media-libs/opencolorio: Revision bump to fix Lut1DOp error

Fix the compile error in the Lut1DOp.cpp file
Fix install location of the CMake files
Split the patches to make it easier to maintain

Closes: https://bugs.gentoo.org/644466
Closes: https://github.com/gentoo/gentoo/pull/6870

 ...-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch |  92 
 ...1.1.0-remove-building-of-bundled-programs.patch | 154 +
 ...nstallDirs-and-fix-cmake-install-location.patch | 102 ++
 media-libs/opencolorio/metadata.xml|   3 +-
 media-libs/opencolorio/opencolorio-1.1.0-r1.ebuild |  85 
 5 files changed, 435 insertions(+), 1 deletion(-)

diff --git 
a/media-libs/opencolorio/files/opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch
 
b/media-libs/opencolorio/files/opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch
new file mode 100644
index 000..b5455d010b4
--- /dev/null
+++ 
b/media-libs/opencolorio/files/opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch
@@ -0,0 +1,92 @@
+From 8d38317f68d0e4663abbccdceca0bcd41f3dcf4a Mon Sep 17 00:00:00 2001
+From: Patrick Hodoul 
+Date: Mon, 27 Nov 2017 17:29:57 -0500
+Subject: [PATCH 1/3] Fix compile error with Lut1DOp.cpp
+
+Fix Linux compilation
+Fix gcc 5.4.0 build breaks
+Fix the temp filename for Linux
+---
+ src/core/Lut1DOp.cpp |  4 +++-
+ src/core/MathUtils.cpp   | 23 ---
+ src/pyglue/PyAllocationTransform.cpp |  1 -
+ 3 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/src/core/Lut1DOp.cpp b/src/core/Lut1DOp.cpp
+index 404ee0b..180e30f 100644
+--- a/src/core/Lut1DOp.cpp
 b/src/core/Lut1DOp.cpp
+@@ -188,7 +188,8 @@ OCIO_NAMESPACE_ENTER
+ {
+ return simple_lut[clamp(index, 0.0f, maxIndex)];
+ }
+-
++
++#if defined(OCIO_UNIT_TEST) || !defined(USE_SSE)
+ void Lut1D_Nearest(float* rgbaBuffer, long numPixels, const Lut1D & 
lut)
+ {
+ float maxIndex[3];
+@@ -218,6 +219,7 @@ OCIO_NAMESPACE_ENTER
+ rgbaBuffer += 4;
+ }
+ }
++#endif
+ #ifdef USE_SSE
+ void Lut1D_Nearest_SSE(float* rgbaBuffer, long numPixels, const Lut1D 
& lut)
+ {
+diff --git a/src/core/MathUtils.cpp b/src/core/MathUtils.cpp
+index e1a26c0..3881eb3 100644
+--- a/src/core/MathUtils.cpp
 b/src/core/MathUtils.cpp
+@@ -327,17 +327,6 @@ OCIO_NAMESPACE_ENTER
+ GetV4Sum(vout, vout, v2);
+ }
+ 
+-namespace
+-{
+-
+-void GetMxbResult(float* vout, float* m, float* x, float* v)
+-{
+-GetM44V4Product(vout, m, x);
+-GetV4Sum(vout, vout, v);
+-}
+-
+-} // anon namespace
+-
+ bool GetMxbInverse(float* mout, float* vout,
+const float* m_, const float* v_)
+ {
+@@ -372,6 +361,18 @@ OCIO_NAMESPACE_USING
+ 
+ #include "UnitTest.h"
+ 
++namespace
++{
++
++void GetMxbResult(float* vout, float* m, float* x, float* v)
++{
++GetM44V4Product(vout, m, x);
++GetV4Sum(vout, vout, v);
++}
++
++}
++
++
+ OIIO_ADD_TEST(MathUtils, M44_is_diagonal)
+ {
+ {
+diff --git a/src/pyglue/PyAllocationTransform.cpp 
b/src/pyglue/PyAllocationTransform.cpp
+index 20bb50e..06b418a 100644
+--- a/src/pyglue/PyAllocationTransform.cpp
 b/src/pyglue/PyAllocationTransform.cpp
+@@ -53,7 +53,6 @@ OCIO_NAMESPACE_ENTER
+ ///
+ 
+ int PyOCIO_AllocationTransform_init(PyOCIO_Transform * self, PyObject 
* args, PyObject * kwds);
+-PyObject * PyOCIO_AllocationTransform_equals(PyObject * self,  
PyObject * args);
+ PyObject * PyOCIO_AllocationTransform_getAllocation(PyObject * self);
+ PyObject * PyOCIO_AllocationTransform_setAllocation(PyObject * self,  
PyObject * args);
+ PyObject * PyOCIO_AllocationTransform_getNumVars(PyObject * self);
+-- 
+2.15.1
+

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
new file mode 100644
index 000..9041677c9ce
--- /dev/null
+++ 
b/media-libs/opencolorio/files/opencolorio-1.1.0-remove-building-of-bundled-programs.patch
@@ -0,0 +1,154 @@
+From 967369b36c9684d7ffb73a926c442d8991a3afef Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs 
+Date: Mon, 15 Jan 2018 13:09:31 +
+Subject: [PATCH 3/3] Remove building of bundled programs
+
+---
+ docs/CMakeLists.txt | 98 ++---
+ 1 file changed, 3 insertions(+), 95 deletions(-)
+
+diff --git

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/, media-libs/opencolorio/

2017-09-23 Thread David Seifert 
commit: 39ce22e9f25c24885397381878d64d03cdf69bfb
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Thu Sep 21 09:06:26 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Sep 23 08:32:51 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39ce22e9

media-libs/opencolorio: Update to v20170719

Upstream doesn't appear to be making new releases, so use stable
snapshots.

There was another round of yaml fixes and other fixes for security.

Build fixes for GCC 7.

General bug fixes.

The current version in portage has lots of bugs that have since
been fixed.

Closes: https://github.com/gentoo/gentoo/pull/5750

 media-libs/opencolorio/Manifest|   1 +
 .../files/opencolorio-1.0.9-cmake-fixes-v1.patch   | 150 +
 .../opencolorio/opencolorio-1.0.9_p20170719.ebuild |  86 
 3 files changed, 237 insertions(+)

diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 33eb023b186..9cd0dcd2309 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,2 +1,3 @@
 DIST opencolorio-1.0.9-yaml-0.5-compat-v2.patch.bz2 15418 SHA256 
13fa49b03a792122aa416e07a69c52d6bde71b91882d77784ade4d14bac952b8 SHA512 
8383bc84e209b67aa34c6420348634d0d2a34f1dafda6a10b0c4a15776c2094057a38b00d078b59b648131178f2d65f695890204dbee411602689a0bb7419ecc
 WHIRLPOOL 
0a0bbc1a787793ee7275a3c6f31ecc9b65581ae6cd07a5a93c12e02fc26e33b98521366e26efa92879474b833cbe2f5c4148d2ec88ad80afb63260b8a67dfed9
 DIST opencolorio-1.0.9.tar.gz 12473406 SHA256 
0f3b458f69715a942047a7b76545c6a098b632e9e5e71d5caaa756d5f7356aa6 SHA512 
f5310cd6d3048d5f307adb41ac1ac807f087a6344c96324cb0f13d0eae1fa3fe5f8005f17adf77664044daf762902223b650b5d8c1636c7801183cd3b4e03ac8
 WHIRLPOOL 
e622d71d40cfdba664178df38d66ecd990515afe4fff0260952bca29e6d46beba47446b6bd36c9965a8169c966a0bddf9bcb5b41f7857ed355ac1a6299c9de6c
+DIST opencolorio-1.0.9_p20170719.tar.gz 13752773 SHA256 
0314b75df6b57bb9de1204bdb9fd5274c84f1415abcf26d80968b4b8d110bf1a SHA512 
fe80f4b1244a64cdf7e8ad53713b634455f038f8e461c351f9e681e2a8cc171e4429e2e469f13bf2c58d3eeb5612d90dd6ff756d2f71fa2f63f79b3943ac4646
 WHIRLPOOL 
c77c39dd494157c6f17faf695fb07d1de3b26dc8fe1c2ae726e0310ae6f6cc9ad535c0bbad44065311cb1b6cf8b27bea9a33676587e973f1c1f7945125f01cb1

diff --git 
a/media-libs/opencolorio/files/opencolorio-1.0.9-cmake-fixes-v1.patch 
b/media-libs/opencolorio/files/opencolorio-1.0.9-cmake-fixes-v1.patch
new file mode 100644
index 000..23f67cae55c
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.0.9-cmake-fixes-v1.patch
@@ -0,0 +1,150 @@
+diff -purN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt   2017-07-19 21:38:48.0 +0100
 b/CMakeLists.txt   2017-08-15 14:14:02.223744929 +0100
+@@ -59,6 +59,7 @@ endif()
+ include(ParseArguments)
+ include(OCIOMacros)
+ include(ExternalProject)
++include(GNUInstallDirs)
+ 
+ enable_language(CXX)
+ 
+@@ -519,7 +520,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_DATAROOTDIR}/ocio/)
+ 
+ 
###
+ ### CPACK ###
+@@ -634,4 +635,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.0 +0100
 b/docs/CMakeLists.txt  2017-08-15 14:10:29.645282585 +0100
+@@ -1,68 +1,5 @@
+ 
+ 
###
+-### External Doc Apps ###
+-
+-# 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}
+-)
+-
+-# 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 PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
+-INSTALL_COMMAND PYTHONPATH=${PYTHONPATH}

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/, media-libs/opencolorio/

2016-11-02 Thread Sergey Popov 
commit: 088897a292990acf1ce20e62f77f6d899b2fefbf
Author: Sergey Popov  gentoo  org>
AuthorDate: Wed Nov  2 14:41:41 2016 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Wed Nov  2 14:44:16 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=088897a2

media-libs/opencolorio: drop old versions

Package-Manager: portage-2.3.2

 media-libs/opencolorio/Manifest|  1 -
 .../opencolorio-1.0.8-documentation-gen.patch  | 54 --
 media-libs/opencolorio/opencolorio-1.0.8.ebuild| 85 -
 media-libs/opencolorio/opencolorio-1.0.9.ebuild| 86 --
 4 files changed, 226 deletions(-)

diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 7f1743a..33eb023 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,3 +1,2 @@
-DIST opencolorio-1.0.8.tar.gz 11912207 SHA256 
9b6d540040e29394045c724c1a46ea00913e660269b03bf24790c74a5542adb4 SHA512 
16c0deab84013d96c9741a58ddc44a90be6a6eac317b8ceb87afad914aa9b0e1d5880dc11ae3c40d22e4a87b553e3b5a1a8a66c064f71c2203b4b605a97851a1
 WHIRLPOOL 
32b92dffa07873f2ea0635afc189937c4d695cb40f5a9d112489a98140d36524db3aadd53db9e9f6e6069f3f29f9d17a10883ae6f26d4144b7873ebfb944cb5a
 DIST opencolorio-1.0.9-yaml-0.5-compat-v2.patch.bz2 15418 SHA256 
13fa49b03a792122aa416e07a69c52d6bde71b91882d77784ade4d14bac952b8 SHA512 
8383bc84e209b67aa34c6420348634d0d2a34f1dafda6a10b0c4a15776c2094057a38b00d078b59b648131178f2d65f695890204dbee411602689a0bb7419ecc
 WHIRLPOOL 
0a0bbc1a787793ee7275a3c6f31ecc9b65581ae6cd07a5a93c12e02fc26e33b98521366e26efa92879474b833cbe2f5c4148d2ec88ad80afb63260b8a67dfed9
 DIST opencolorio-1.0.9.tar.gz 12473406 SHA256 
0f3b458f69715a942047a7b76545c6a098b632e9e5e71d5caaa756d5f7356aa6 SHA512 
f5310cd6d3048d5f307adb41ac1ac807f087a6344c96324cb0f13d0eae1fa3fe5f8005f17adf77664044daf762902223b650b5d8c1636c7801183cd3b4e03ac8
 WHIRLPOOL 
e622d71d40cfdba664178df38d66ecd990515afe4fff0260952bca29e6d46beba47446b6bd36c9965a8169c966a0bddf9bcb5b41f7857ed355ac1a6299c9de6c

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 7a396b3..
--- 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/opencolorio-1.0.8.ebuild 
b/media-libs/opencolorio/opencolorio-1.0.8.ebuild
deleted file mode 100644
index 0785988..
--- a/media-libs/opencolorio/opencolorio-1.0.8.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils python-single-r1 vcs-snapshot
-
-DESCRIPTION="A color management framework for visual effects and animation"

[gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/, media-libs/opencolorio/

2016-05-30 Thread Sergey Popov 
commit: b4cee6abe83cb49841b3e4664d90d7393d146900
Author: Sergey Popov  gentoo  org>
AuthorDate: Mon May 30 20:13:49 2016 +
Commit: Sergey Popov  gentoo  org>
CommitDate: Mon May 30 20:15:52 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4cee6ab

media-libs/opencolorio-1.0.9-r2: revision bump

Bump EAPI to 6. Fix work with yaml-cpp 0.5

Gentoo-Bug: 548392
Reported-by: Alexander Potashev  gmail.com>

Package-Manager: portage-2.3.0_rc1

 media-libs/opencolorio/Manifest|  1 +
 .../opencolorio-1.0.8-documentation-gen.patch  |  4 +-
 ...lorio-1.0.9-remove-external-doc-utilities.patch |  4 +-
 media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild | 88 ++
 4 files changed, 93 insertions(+), 4 deletions(-)

diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 454d805..cd8b0ec 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,3 +1,4 @@
 DIST opencolorio-1.0.8.tar.gz 11912207 SHA256 
9b6d540040e29394045c724c1a46ea00913e660269b03bf24790c74a5542adb4 SHA512 
16c0deab84013d96c9741a58ddc44a90be6a6eac317b8ceb87afad914aa9b0e1d5880dc11ae3c40d22e4a87b553e3b5a1a8a66c064f71c2203b4b605a97851a1
 WHIRLPOOL 
32b92dffa07873f2ea0635afc189937c4d695cb40f5a9d112489a98140d36524db3aadd53db9e9f6e6069f3f29f9d17a10883ae6f26d4144b7873ebfb944cb5a
+DIST opencolorio-1.0.9-yaml-0.5-compat-v2.patch.bz2 15418 SHA256 
13fa49b03a792122aa416e07a69c52d6bde71b91882d77784ade4d14bac952b8 SHA512 
8383bc84e209b67aa34c6420348634d0d2a34f1dafda6a10b0c4a15776c2094057a38b00d078b59b648131178f2d65f695890204dbee411602689a0bb7419ecc
 WHIRLPOOL 
0a0bbc1a787793ee7275a3c6f31ecc9b65581ae6cd07a5a93c12e02fc26e33b98521366e26efa92879474b833cbe2f5c4148d2ec88ad80afb63260b8a67dfed9
 DIST opencolorio-1.0.9-yaml-0.5-compat.patch.bz2 14128 SHA256 
917d64ea318da52286713742a9b54b9663326fabc90d8fb94697f8f1b672f344 SHA512 
163009deb3bd2446fb203022f26c942fc09e39428f2f628dcd553e7b69f2b625c2c6962e8b5d4c0800c7edb7a776fa255a0223005dedf2b2f974752dfa4abfb6
 WHIRLPOOL 
b14d7379261af2b61e674ed99ab8fe6345b67e6412be0fd8a59f5ae32bd29396ef274310cfaec0e74b2f46f7bf3611ad77cfc74af5a08ed27a92eed2936af104
 DIST opencolorio-1.0.9.tar.gz 12473406 SHA256 
0f3b458f69715a942047a7b76545c6a098b632e9e5e71d5caaa756d5f7356aa6 SHA512 
f5310cd6d3048d5f307adb41ac1ac807f087a6344c96324cb0f13d0eae1fa3fe5f8005f17adf77664044daf762902223b650b5d8c1636c7801183cd3b4e03ac8
 WHIRLPOOL 
e622d71d40cfdba664178df38d66ecd990515afe4fff0260952bca29e6d46beba47446b6bd36c9965a8169c966a0bddf9bcb5b41f7857ed355ac1a6299c9de6c

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
index f5b3b7b7..7a396b3 100644
--- a/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch
+++ b/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch
@@ -1,5 +1,5 @@
 docs/CMakeLists.txt.orig   2013-01-08 03:19:23.649162615 +0400
-+++ docs/CMakeLists.txt2013-01-08 03:22:29.647329174 +0400
+--- 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)
  

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
index 921327d..d30b662 100644
--- 
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
@@ -1,5 +1,5 @@
 docs/CMakeLists.txt.orig   2013-09-24 13:13:47.57731 +0400
-+++ docs/CMakeLists.txt2013-09-24 13:14:07.931224505 +0400
+--- a/docs/CMakeLists.txt  2013-09-24 13:13:47.57731 +0400
 b/docs/CMakeLists.txt  2013-09-24 13:14:07.931224505 +0400
 @@ -1,62 +1,3 @@
 -
 
-###

diff --git a/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild 
b/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild
new file mode 100644
index 000..d9c75d8
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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
+