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 B2F9C15808B for ; Tue, 15 Feb 2022 19:51:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0652EE0825; Tue, 15 Feb 2022 19:51:28 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 931EDE0825 for ; Tue, 15 Feb 2022 19:51:27 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B09AD34311C for ; Tue, 15 Feb 2022 19:51:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3D8522D8 for ; Tue, 15 Feb 2022 19:51:20 +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: <1644954583.5cf44c5ab2ca709df6fb7b90434d02487faed323.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/, media-libs/opencolorio/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/opencolorio/files/opencolorio-2.1.1-imath-openexr-3.patch media-libs/opencolorio/opencolorio-2.1.1-r3.ebuild media-libs/opencolorio/opencolorio-2.1.1-r4.ebuild X-VCS-Directories: media-libs/opencolorio/ media-libs/opencolorio/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 5cf44c5ab2ca709df6fb7b90434d02487faed323 X-VCS-Branch: master Date: Tue, 15 Feb 2022 19:51:20 +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: ddbe80a2-5206-4b2d-82cd-947c6da45392 X-Archives-Hash: 27982e16ba9b2ab95168065fc7069f36 commit: 5cf44c5ab2ca709df6fb7b90434d02487faed323 Author: Sam James gentoo org> AuthorDate: Sat Feb 12 17:58:14 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Feb 15 19:49:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cf44c5a media-libs/opencolorio: adjust to unslotted OpenEXR Bug: https://bugs.gentoo.org/833158 Closes: https://bugs.gentoo.org/831357 Closes: https://bugs.gentoo.org/832862 Closes: https://bugs.gentoo.org/821247 Signed-off-by: Sam James gentoo.org> .../files/opencolorio-2.1.1-imath-openexr-3.patch | 75 ---------------------- ...2.1.1-r3.ebuild => opencolorio-2.1.1-r4.ebuild} | 4 -- 2 files changed, 79 deletions(-) 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 deleted file mode 100644 index bf606889865d..000000000000 --- a/media-libs/opencolorio/files/opencolorio-2.1.1-imath-openexr-3.patch +++ /dev/null @@ -1,75 +0,0 @@ -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-r4.ebuild similarity index 98% rename from media-libs/opencolorio/opencolorio-2.1.1-r3.ebuild rename to media-libs/opencolorio/opencolorio-2.1.1-r4.ebuild index 65a48f36c3c7..f90a88c6c238 100644 --- a/media-libs/opencolorio/opencolorio-2.1.1-r3.ebuild +++ b/media-libs/opencolorio/opencolorio-2.1.1-r4.ebuild @@ -59,10 +59,6 @@ RESTRICT="test" CMAKE_BUILD_TYPE=RelWithDebInfo -PATCHES=( - "${FILESDIR}"/${PN}-2.1.1-imath-openexr-3.patch -) - pkg_setup() { use python && python-single-r1_pkg_setup }