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 B482015808C for ; Sat, 12 Feb 2022 03:55:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6B936E0848; Sat, 12 Feb 2022 03:55:54 +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 DB49DE0848 for ; Sat, 12 Feb 2022 03:55:53 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 D84DD342F9F for ; Sat, 12 Feb 2022 03:55:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 604EF2D3 for ; Sat, 12 Feb 2022 03:55:51 +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: <1644638133.7883e603e80dde477736b5ccc16db0eea2f9655c.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/osl/files/, media-libs/osl/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/osl/files/osl-1.11.16.0-openexr-3-imath.patch media-libs/osl/osl-1.11.16.0-r3.ebuild X-VCS-Directories: media-libs/osl/files/ media-libs/osl/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 7883e603e80dde477736b5ccc16db0eea2f9655c X-VCS-Branch: master Date: Sat, 12 Feb 2022 03:55:51 +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: 8954af73-6495-4814-8456-265fdbdd70fd X-Archives-Hash: 955e87bc7065a5f65e52ebd0c4654cc8 commit: 7883e603e80dde477736b5ccc16db0eea2f9655c Author: Sam James gentoo org> AuthorDate: Sat Feb 12 02:34:25 2022 +0000 Commit: Sam James gentoo org> CommitDate: Sat Feb 12 03:55:33 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7883e603 media-libs/osl: 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/831425 Signed-off-by: Sam James gentoo.org> .../osl/files/osl-1.11.16.0-openexr-3-imath.patch | 126 +++++++++++++++++++++ media-libs/osl/osl-1.11.16.0-r3.ebuild | 113 ++++++++++++++++++ 2 files changed, 239 insertions(+) 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 new file mode 100644 index 000000000000..10bb23fffa0e --- /dev/null +++ b/media-libs/osl/files/osl-1.11.16.0-openexr-3-imath.patch @@ -0,0 +1,126 @@ +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/osl-1.11.16.0-r3.ebuild b/media-libs/osl/osl-1.11.16.0-r3.ebuild new file mode 100644 index 000000000000..58e331049861 --- /dev/null +++ b/media-libs/osl/osl-1.11.16.0-r3.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{8,9,10} ) + +# check this on updates +LLVM_MAX_SLOT=13 + +CMAKE_REMOVE_MODULES_LIST=() + +inherit cmake llvm toolchain-funcs python-single-r1 + +DESCRIPTION="Advanced shading language for production GI renderers" +HOMEPAGE="http://opensource.imageworks.com/?p=osl https://github.com/imageworks/OpenShadingLanguage" +SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +# TODO: drop .1 on next SONAME change (probably 1.11 -> 1.12), we needed +# a nudge to force rebuilds due to openexr 2 -> openexr 3 change. +SLOT="0/$(ver_cut 2).1" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +X86_CPU_FEATURES=( + sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2 + avx:avx avx2:avx2 avx512f:avx512f f16c:f16c +) +CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} ) + +IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*} python" + +# See bug #821202 for openimageio < dep +RDEPEND=" + dev-libs/boost:= + dev-libs/pugixml + media-libs/openexr:3= + dev-libs/imath:= +