From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E2A32158089 for ; Tue, 26 Sep 2023 20:48:03 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B17B2BC01B; Tue, 26 Sep 2023 20:48:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 005662BC016 for ; Tue, 26 Sep 2023 20:48:02 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3FD37335D0A for ; Tue, 26 Sep 2023 20:48:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D0471126A for ; Tue, 26 Sep 2023 20:48:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1695761140.f6301c1fc5eac9e41164de7fd5c4db0c581979ad.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/, media-libs/opencolorio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/opencolorio/Manifest media-libs/opencolorio/files/opencolorio-2.3.0-support-yaml-cpp-0.8.0.patch media-libs/opencolorio/opencolorio-2.3.0.ebuild X-VCS-Directories: media-libs/opencolorio/files/ media-libs/opencolorio/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: f6301c1fc5eac9e41164de7fd5c4db0c581979ad X-VCS-Branch: master Date: Tue, 26 Sep 2023 20:48:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 0011f688-8928-4b90-9e38-dd44ddfb8c7f X-Archives-Hash: 7fce88f11f80c60e3f1717ec85146312 commit: f6301c1fc5eac9e41164de7fd5c4db0c581979ad Author: Paul Zander gmail com> AuthorDate: Tue Sep 26 17:24:38 2023 +0000 Commit: Sam James gentoo org> CommitDate: Tue Sep 26 20:45:40 2023 +0000 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 000000000000..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 000000000000..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? ( + app-doc/doxygen + $(python_gen_cond_dep ' + dev-python/breathe[${PYTHON_USEDEP}] + dev-python/recommonmark[${PYTHON_USEDEP}] + dev-python/six[${PYTHON_USEDEP}] + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/sphinx-press-theme[${PYTHON_USEDEP}] + dev-python/sphinx-tabs[${PYTHON_USEDEP}] + dev-python/testresources[${PYTHON_USEDEP}] + ') + ) + opengl? ( + media-libs/freeglut + media-libs/glew:= + media-libs/libglvnd + ) +" +# test? ( +# >=media-libs/openimageio-2.2.14 +# >=media-libs/osl-1.11 +# ) +# " + +# Restricting tests, bugs #439790 and #447908 +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" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + # Avoid automagic test dependency on OSL, bug #833933 + # Can cause problems during e.g. OpenEXR unsplitting migration + cmake_run_in tests cmake_comment_add_subdirectory osl +} + +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 or OpenEXR (default) is required for building ociodisplay and + # ocioconvert (USE opengl) + # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl) + local mycmakeargs=( + "-DBUILD_SHARED_LIBS=$(usex !static-libs)" + "-DOCIO_BUILD_APPS=$(usex apps)" + "-DOCIO_BUILD_DOCS=$(usex doc)" + "-DOCIO_BUILD_FROZEN_DOCS=$(usex doc)" + "-DOCIO_BUILD_GPU_TESTS=$(usex test)" + "-DOCIO_BUILD_JAVA=OFF" + "-DOCIO_BUILD_PYTHON=$(usex python)" + "-DOCIO_BUILD_TESTS=$(usex test)" + "-DOCIO_INSTALL_EXT_PACKAGES=NONE" + "-DOCIO_USE_OIIO_CMAKE_CONFIG=ON" + "-DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)" + ) + use python && mycmakeargs+=( + "-DOCIO_PYTHON_VERSION=${EPYTHON/python/}" + "-DPython_EXECUTABLE=${PYTHON}" + "-DPYTHON_VARIANT_PATH=$(python_get_sitedir)" + ) + + cmake_src_configure +} + +src_test() { + virtx cmake_src_test +}