gentoo resync : 21.05.2019

4 files changed, 112 insertions, 1 deletions

diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 62b939f7845f..606abc47e7d2 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,7 +1,9 @@
 AUX opencolorio-1.1.0-fix-compile-error-with-Lut1DOp.cpp.patch 2786 BLAKE2B 91747af3ceac6477d6847c1f87fa69cd77e2cdaaced18cc038ca231af006d453ce4382229b642e8c38ae1642c1f4788c7e9062951e867881bd20012c26a6dcd4 SHA512 2338e1b0994486a7be896d4edddcef67b3b84df9d609e7aebe7a87172163b5f6e7636341e0bfeb0e45d7fdb663932c273ca0568a49ac9d4aa2b827d3808493bc
+AUX opencolorio-1.1.0-remove-Werror.patch 473 BLAKE2B add95a92f243df8abe26f51dbde7992ad398748ace899ead9346e6d640e2142ec895f9abe4601d5c5310f58b411d6fe0902720ba0f1319c027efd53361b39b33 SHA512 6eb2ee8567ba0c0cbe3be5468136834e8b8a62d6f2358f792d05fbf35aaebc17fb62b4bcbfc2f131ea6166236b6ea7b9951faeb916d61e09e5ce8636a18bdc35
 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.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
-EBUILD opencolorio-1.1.0-r1.ebuild 2343 BLAKE2B 9558c27dd6e0beef505cd938406836a6af0be776dccc4d7a4789426a7c2116446fdab88e8777078276213395d549e8f7ffb359186f8d1f495d63cec7ef7b6c9e SHA512 a7147bedc2c41a526799f55f7b3ffd70195e1b95f29ef15ba713608cba75c47d44bce70afe04a6848cd8081c34ae6b7f1811ae11d46193961fef2ce951ebcd8a
+EBUILD opencolorio-1.1.0-r1.ebuild 2383 BLAKE2B 5c0a4c1ac134f2ab61970aca9398ae71a699ca383e199e2293a47a92d6fd5846f5ba1953060711f637adbe4b7200dd7aa47c975c5e0e78b98287622a9d59f198 SHA512 115b9f8bbae000d7107f11c1301868cfdccb2546be430fdf1c889068641eedee67ebda7fcd4b878c9fa96bb579a6c02a985671cc1bd95bcc0cc3e4615a9137ed
+EBUILD opencolorio-1.1.0-r2.ebuild 2339 BLAKE2B e5cf51d096154dd71e62c3ca117e5352a78c40e8c22ab29442f96ac82412ddeddf7d54c484cac29df91ad9751225effd393fc79a9f40a9dd5d0c759168abaa0b SHA512 e40cb52a227faf01396fb60c26b52276e333f24e255d3c396d8e2e342905a8b1b49688924a0b81717bd177ce1a9cd93bc95f26915488b3053336ce160e9d4285
 MISC metadata.xml 551 BLAKE2B b7a648f31772a6a72121dda8736a96e5c54189b20f1eea1600222b27385b695644887a9f084ba7a01c7a530593aa28a2319353c0fdb6e549a03a85fc8a7a1cf4 SHA512 ddd9c8afeb0540e663b3e963f926247da21c72574459cb2f82dc956476fce18f5eb0e2b140ccdbadc98f71b5b855f674d227271f9ff781f689126afbc555f846
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 000000000000..2814f703f81d
--- /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 2ee8b87912af..86efd8a9f584 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() {
diff --git a/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild b/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild
new file mode 100644
index 000000000000..df5ac185621f
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-1.1.0-r2.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit cmake-utils flag-o-matic python-single-r1
+
+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"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
+REQUIRED_USE="
+	doc? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	opengl? (
+		media-libs/lcms:2
+		media-libs/openimageio
+		media-libs/glew:=
+		media-libs/freeglut
+		virtual/opengl
+	)
+	python? ( ${PYTHON_DEPS} )
+	>=dev-cpp/yaml-cpp-0.5
+	dev-libs/tinyxml
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+	virtual/pkgconfig
+	doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+"
+
+# Restricting tests, bugs #439790 and #447908
+RESTRICT="test"
+
+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"
+	"${FILESDIR}/${P}-remove-Werror.patch"
+)
+
+S="${WORKDIR}/OpenColorIO-${PV}"
+
+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=$(usex static-libs)
+		-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_PYGLUE=$(usex python)
+		-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
+		-DOCIO_BUILD_TESTS=$(usex test)
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+		-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON # They don't build
+	)
+	cmake-utils_src_configure
+}