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 D613215808C 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 11F12E0830; Tue, 15 Feb 2022 19:51:28 +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 C8952E0825 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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 18AF6343119 for ; Tue, 15 Feb 2022 19:51:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 88B032E0 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: <1644954597.967d8224791b0c4f99b837c84f17a4bb8b34f6c8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/, media-libs/osl/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/osl/files/osl-1.11.16.0-openexr-3-imath.patch media-libs/osl/files/osl-1.12.4.1-openexr-3-imath.patch media-libs/osl/osl-1.11.17.0-r1.ebuild media-libs/osl/osl-1.11.17.0-r2.ebuild X-VCS-Directories: media-libs/osl/ media-libs/osl/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 967d8224791b0c4f99b837c84f17a4bb8b34f6c8 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: 74643583-fed9-4483-ad17-585af9e67015 X-Archives-Hash: 4758356ffffbe6ab26faacde42ab9a1b commit: 967d8224791b0c4f99b837c84f17a4bb8b34f6c8 Author: Sam James gentoo org> AuthorDate: Sat Feb 12 18:15:05 2022 +0000 Commit: Sam James gentoo org> CommitDate: Tue Feb 15 19:49:57 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=967d8224 media-libs/osl: adjust to unslotted OpenEXR Bug: https://bugs.gentoo.org/833158 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> .../osl/files/osl-1.11.16.0-openexr-3-imath.patch | 126 --------------------- .../osl/files/osl-1.12.4.1-openexr-3-imath.patch | 126 --------------------- ...1.11.17.0-r1.ebuild => osl-1.11.17.0-r2.ebuild} | 6 +- 3 files changed, 1 insertion(+), 257 deletions(-) diff --git a/media-libs/osl/files/osl-1.11.16.0-openexr-3-imath.patch b/media-libs/osl/files/osl-1.11.16.0-openexr-3-imath.patch deleted file mode 100644 index 10bb23fffa0e..000000000000 --- a/media-libs/osl/files/osl-1.11.16.0-openexr-3-imath.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff --git a/src/include/OSL/oslconfig.h.in b/src/include/OSL/oslconfig.h.in -index f735b0f..8063f68 100644 ---- a/src/include/OSL/oslconfig.h.in -+++ b/src/include/OSL/oslconfig.h.in -@@ -13,9 +13,9 @@ - // All the things we need from Imath. - #define OSL_USING_IMATH @OSL_USING_IMATH@ - #if OSL_USING_IMATH >= 3 --# include --# include --# include -+# include -+# include -+# include - #else - // OpenEXR 2.x lacks the Cuda decorators we need, so we replicated some - // Imath files in OSL/Imathx, adding the decorations needed for them to -diff --git a/src/liboslquery/py_osl.h b/src/liboslquery/py_osl.h -index ee8284f..4988b44 100644 ---- a/src/liboslquery/py_osl.h -+++ b/src/liboslquery/py_osl.h -@@ -26,7 +26,7 @@ - #include - - #if OSL_USING_IMATH >= 3 --# include -+# include - #else - # include - #endif -diff --git a/src/include/OSL/Imathx/ImathColor.h b/src/include/OSL/Imathx/ImathColor.h -index d0b035f..1cbb28f 100644 ---- a/src/include/OSL/Imathx/ImathColor.h -+++ b/src/include/OSL/Imathx/ImathColor.h -@@ -44,7 +44,7 @@ - //---------------------------------------------------- - - #include "ImathVec.h" --#include -+#include - // #include "half.h" - - #ifndef IMATH_HOSTDEVICE -diff --git a/src/include/OSL/Imathx/ImathFun.h b/src/include/OSL/Imathx/ImathFun.h -index 1413c48..576b588 100644 ---- a/src/include/OSL/Imathx/ImathFun.h -+++ b/src/include/OSL/Imathx/ImathFun.h -@@ -43,10 +43,10 @@ - // - //----------------------------------------------------------------------------- - --#include -+#include - #include "ImathLimits.h" --#include --#include -+#include -+#include - - IMATH_INTERNAL_NAMESPACE_HEADER_ENTER - -diff --git a/src/include/OSL/Imathx/ImathLimits.h b/src/include/OSL/Imathx/ImathLimits.h -index 09fa419..ed19eaa 100644 ---- a/src/include/OSL/Imathx/ImathLimits.h -+++ b/src/include/OSL/Imathx/ImathLimits.h -@@ -43,7 +43,7 @@ - // - //---------------------------------------------------------------- - --#include -+#include - #include - #include - -diff --git a/src/include/OSL/Imathx/ImathMatrix.h b/src/include/OSL/Imathx/ImathMatrix.h -index 65f386b..f2b10cc 100644 ---- a/src/include/OSL/Imathx/ImathMatrix.h -+++ b/src/include/OSL/Imathx/ImathMatrix.h -@@ -43,12 +43,12 @@ - // - //---------------------------------------------------------------- - --#include -+#include - #include "ImathFun.h" --#include -+#include - #include "ImathVec.h" --#include --#include -+#include -+#include - - #include - #include -diff --git a/src/include/OSL/Imathx/ImathVec.h b/src/include/OSL/Imathx/ImathVec.h -index e52af61..4cd696b 100644 ---- a/src/include/OSL/Imathx/ImathVec.h -+++ b/src/include/OSL/Imathx/ImathVec.h -@@ -43,10 +43,10 @@ - // - //---------------------------------------------------- - --#include -+#include - #include "ImathLimits.h" --#include --#include -+#include -+#include - - #include - #include -diff --git a/src/liboslexec/shadingsys.cpp b/src/liboslexec/shadingsys.cpp -index 1d36ff1..6fc9d38 100644 ---- a/src/liboslexec/shadingsys.cpp -+++ b/src/liboslexec/shadingsys.cpp -@@ -27,7 +27,7 @@ - using namespace OSL; - using namespace OSL::pvt; - --#include // Just for OPENEXR_VERSION_STRING -+#include // Just for OPENEXR_VERSION_STRING - - // avoid naming conflicts with MSVC macros - #ifdef _MSC_VER diff --git a/media-libs/osl/files/osl-1.12.4.1-openexr-3-imath.patch b/media-libs/osl/files/osl-1.12.4.1-openexr-3-imath.patch deleted file mode 100644 index ffee5d8a543d..000000000000 --- a/media-libs/osl/files/osl-1.12.4.1-openexr-3-imath.patch +++ /dev/null @@ -1,126 +0,0 @@ -diff --git a/src/include/OSL/oslconfig.h.in b/src/include/OSL/oslconfig.h.in -index 29abe88..b9de57c 100644 ---- a/src/include/OSL/oslconfig.h.in -+++ b/src/include/OSL/oslconfig.h.in -@@ -12,9 +12,9 @@ - // All the things we need from Imath. - #define OSL_USING_IMATH @OSL_USING_IMATH@ - #if OSL_USING_IMATH >= 3 --# include --# include --# include -+# include -+# include -+# include - #else - // OpenEXR 2.x lacks the Cuda decorators we need, so we replicated some - // Imath files in OSL/Imathx, adding the decorations needed for them to -diff --git a/src/include/OSL/Imathx/ImathColor.h b/src/include/OSL/Imathx/ImathColor.h -index d0b035f..1cbb28f 100644 ---- a/src/include/OSL/Imathx/ImathColor.h -+++ b/src/include/OSL/Imathx/ImathColor.h -@@ -44,7 +44,7 @@ - //---------------------------------------------------- - - #include "ImathVec.h" --#include -+#include - // #include "half.h" - - #ifndef IMATH_HOSTDEVICE -diff --git a/src/include/OSL/Imathx/ImathFun.h b/src/include/OSL/Imathx/ImathFun.h -index 1413c48..576b588 100644 ---- a/src/include/OSL/Imathx/ImathFun.h -+++ b/src/include/OSL/Imathx/ImathFun.h -@@ -43,10 +43,10 @@ - // - //----------------------------------------------------------------------------- - --#include -+#include - #include "ImathLimits.h" --#include --#include -+#include -+#include - - IMATH_INTERNAL_NAMESPACE_HEADER_ENTER - -diff --git a/src/include/OSL/Imathx/ImathLimits.h b/src/include/OSL/Imathx/ImathLimits.h -index 09fa419..ed19eaa 100644 ---- a/src/include/OSL/Imathx/ImathLimits.h -+++ b/src/include/OSL/Imathx/ImathLimits.h -@@ -43,7 +43,7 @@ - // - //---------------------------------------------------------------- - --#include -+#include - #include - #include - -diff --git a/src/include/OSL/Imathx/ImathMatrix.h b/src/include/OSL/Imathx/ImathMatrix.h -index a4063dd..678f970 100644 ---- a/src/include/OSL/Imathx/ImathMatrix.h -+++ b/src/include/OSL/Imathx/ImathMatrix.h -@@ -43,12 +43,12 @@ - // - //---------------------------------------------------------------- - --#include -+#include - #include "ImathFun.h" --#include -+#include - #include "ImathVec.h" --#include --#include -+#include -+#include - - #include - #include -diff --git a/src/include/OSL/Imathx/ImathVec.h b/src/include/OSL/Imathx/ImathVec.h -index e52af61..4cd696b 100644 ---- a/src/include/OSL/Imathx/ImathVec.h -+++ b/src/include/OSL/Imathx/ImathVec.h -@@ -43,10 +43,10 @@ - // - //---------------------------------------------------- - --#include -+#include - #include "ImathLimits.h" --#include --#include -+#include -+#include - - #include - #include -diff --git a/src/liboslexec/shadingsys.cpp b/src/liboslexec/shadingsys.cpp -index 74dc557..74762ab 100644 ---- a/src/liboslexec/shadingsys.cpp -+++ b/src/liboslexec/shadingsys.cpp -@@ -30,7 +30,7 @@ - using namespace OSL; - using namespace OSL::pvt; - --#include // Just for OPENEXR_VERSION_STRING -+#include // Just for OPENEXR_VERSION_STRING - - // avoid naming conflicts with MSVC macros - #ifdef _MSC_VER -diff --git a/src/liboslquery/py_osl.h b/src/liboslquery/py_osl.h -index ee8284f..4988b44 100644 ---- a/src/liboslquery/py_osl.h -+++ b/src/liboslquery/py_osl.h -@@ -26,7 +26,7 @@ - #include - - #if OSL_USING_IMATH >= 3 --# include -+# include - #else - # include - #endif diff --git a/media-libs/osl/osl-1.11.17.0-r1.ebuild b/media-libs/osl/osl-1.11.17.0-r2.ebuild similarity index 96% rename from media-libs/osl/osl-1.11.17.0-r1.ebuild rename to media-libs/osl/osl-1.11.17.0-r2.ebuild index 31e118f6baa9..8b62492f3cd0 100644 --- a/media-libs/osl/osl-1.11.17.0-r1.ebuild +++ b/media-libs/osl/osl-1.11.17.0-r2.ebuild @@ -34,7 +34,7 @@ IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python" RDEPEND=" dev-libs/boost:= dev-libs/pugixml - media-libs/openexr:3= + media-libs/openexr:= dev-libs/imath:= >=media-libs/openimageio-2.3.12.0:=