[gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/files/, media-libs/openimageio/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/files/, media-libs/openimageio/
Date: Tue, 15 Feb 2022 19:51:20 +0000 (UTC)	[thread overview]
Message-ID: <1644954580.9988b26e89cfe41f05da7aa37685aa51e110808f.sam@gentoo> (raw)

commit:     9988b26e89cfe41f05da7aa37685aa51e110808f
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 17:57:25 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Feb 15 19:49:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9988b26e

media-libs/openimageio: adjust to unslotted OpenEXR

Bug: https://bugs.gentoo.org/833158
Closes: https://bugs.gentoo.org/833194
Closes: https://bugs.gentoo.org/831357
Closes: https://bugs.gentoo.org/832862
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../openimageio-2.3.11.0-imath-openexr-3.patch     | 302 ---------------------
 ....0-r1.ebuild => openimageio-2.3.12.0-r2.ebuild} |  21 +-
 2 files changed, 3 insertions(+), 320 deletions(-)

diff --git a/media-libs/openimageio/files/openimageio-2.3.11.0-imath-openexr-3.patch b/media-libs/openimageio/files/openimageio-2.3.11.0-imath-openexr-3.patch
deleted file mode 100644
index ad6ee04c16e6..000000000000
--- a/media-libs/openimageio/files/openimageio-2.3.11.0-imath-openexr-3.patch
+++ /dev/null
@@ -1,302 +0,0 @@
-diff --git a/src/dpx.imageio/dpxinput.cpp b/src/dpx.imageio/dpxinput.cpp
-index edfeb02..7890b46 100644
---- a/src/dpx.imageio/dpxinput.cpp
-+++ b/src/dpx.imageio/dpxinput.cpp
-@@ -6,7 +6,7 @@
- #include <iomanip>
- #include <memory>
- 
--#include <OpenEXR/ImfTimeCode.h>  //For TimeCode support
-+#include <OpenEXR-3/ImfTimeCode.h>  //For TimeCode support
- 
- // Note: libdpx originally from: https://github.com/PatrickPalmer/dpx
- // But that seems not to be actively maintained.
-diff --git a/src/field3d.imageio/field3d_pvt.h b/src/field3d.imageio/field3d_pvt.h
-index 066574f..19b4ac9 100644
---- a/src/field3d.imageio/field3d_pvt.h
-+++ b/src/field3d.imageio/field3d_pvt.h
-@@ -8,7 +8,7 @@
- #include <OpenImageIO/Imath.h>
- 
- #if OIIO_USING_IMATH >= 3
--#    include <Imath/ImathBox.h>
-+#    include <Imath-3/ImathBox.h>
- #else
- #    include <OpenEXR/ImathBox.h>
- #endif
-diff --git a/src/include/OpenImageIO/Imath.h.in b/src/include/OpenImageIO/Imath.h.in
-index 7f13fae..23afffc 100644
---- a/src/include/OpenImageIO/Imath.h.in
-+++ b/src/include/OpenImageIO/Imath.h.in
-@@ -13,10 +13,10 @@
- #define OIIO_USING_IMATH @OIIO_USING_IMATH@
- 
- #if OIIO_USING_IMATH >= 3
--#   include <Imath/ImathColor.h>
--#   include <Imath/ImathMatrix.h>
--#   include <Imath/ImathVec.h>
--#   include <Imath/half.h>
-+#   include <Imath-3/ImathColor.h>
-+#   include <Imath-3/ImathMatrix.h>
-+#   include <Imath-3/ImathVec.h>
-+#   include <Imath-3/half.h>
- #else
- #   include <OpenEXR/ImathColor.h>
- #   include <OpenEXR/ImathMatrix.h>
-diff --git a/src/libOpenImageIO/imagebufalgo_xform.cpp b/src/libOpenImageIO/imagebufalgo_xform.cpp
-index 496a055..6484ccc 100644
---- a/src/libOpenImageIO/imagebufalgo_xform.cpp
-+++ b/src/libOpenImageIO/imagebufalgo_xform.cpp
-@@ -18,7 +18,7 @@
- #include <OpenImageIO/thread.h>
- 
- #if OIIO_USING_IMATH >= 3
--#    include <Imath/ImathBox.h>
-+#    include <Imath-3/ImathBox.h>
- #else
- #    include <OpenEXR/ImathBox.h>
- #endif
-diff --git a/src/libutil/fmath_test.cpp b/src/libutil/fmath_test.cpp
-index ea4e708..ed7e1ff 100644
---- a/src/libutil/fmath_test.cpp
-+++ b/src/libutil/fmath_test.cpp
-@@ -18,7 +18,7 @@
- #include <OpenImageIO/unittest.h>
- 
- #if OIIO_USING_IMATH >= 3
--#    include <Imath/ImathFun.h>
-+#    include <Imath-3/ImathFun.h>
- #else
- #    include <OpenEXR/ImathFun.h>
- #endif
-diff --git a/src/libutil/typedesc_test.cpp b/src/libutil/typedesc_test.cpp
-index 6840738..58f6a64 100644
---- a/src/libutil/typedesc_test.cpp
-+++ b/src/libutil/typedesc_test.cpp
-@@ -9,12 +9,14 @@
- #include <OpenImageIO/Imath.h>
- 
- #if OIIO_USING_IMATH >= 3
--#    include <Imath/ImathBox.h>
-+#    include <Imath-3/ImathBox.h>
-+#    include <OpenEXR-3/ImfKeyCode.h>
-+#    include <OpenEXR-3/ImfTimeCode.h>
- #else
- #    include <OpenEXR/ImathBox.h>
-+#    include <OpenEXR/ImfKeyCode.h>
-+#    include <OpenEXR/ImfTimeCode.h>
- #endif
--#include <OpenEXR/ImfKeyCode.h>
--#include <OpenEXR/ImfTimeCode.h>
- 
- #include <OpenImageIO/typedesc.h>
- #include <OpenImageIO/unittest.h>
-diff --git a/src/oiiotool/oiiotool.cpp b/src/oiiotool/oiiotool.cpp
-index 0f5e739..4292b50 100644
---- a/src/oiiotool/oiiotool.cpp
-+++ b/src/oiiotool/oiiotool.cpp
-@@ -17,7 +17,7 @@
- #include <utility>
- #include <vector>
- 
--#include <OpenEXR/ImfTimeCode.h>
-+#include <OpenEXR-3/ImfTimeCode.h>
- 
- #include <OpenImageIO/argparse.h>
- #include <OpenImageIO/color.h>
-diff --git a/src/openexr.imageio/exrinput.cpp b/src/openexr.imageio/exrinput.cpp
-index d9c51ab..8b86ad8 100644
---- a/src/openexr.imageio/exrinput.cpp
-+++ b/src/openexr.imageio/exrinput.cpp
-@@ -25,11 +25,11 @@ using boost::integer::gcd;
- using boost::math::gcd;
- #endif
- 
--#include <OpenEXR/ImfChannelList.h>
--#include <OpenEXR/ImfEnvmap.h>
--#include <OpenEXR/ImfInputFile.h>
--#include <OpenEXR/ImfTestFile.h>
--#include <OpenEXR/ImfTiledInputFile.h>
-+#include <OpenEXR-3/ImfChannelList.h>
-+#include <OpenEXR-3/ImfEnvmap.h>
-+#include <OpenEXR-3/ImfInputFile.h>
-+#include <OpenEXR-3/ImfTestFile.h>
-+#include <OpenEXR-3/ImfTiledInputFile.h>
- 
- #ifdef OPENEXR_VERSION_MAJOR
- #    define OPENEXR_CODED_VERSION                                    \
-@@ -40,7 +40,7 @@ using boost::math::gcd;
- #endif
- 
- #if OPENEXR_CODED_VERSION >= 20400 \
--    || __has_include(<OpenEXR/ImfFloatVectorAttribute.h>)
-+    || __has_include(<OpenEXR-3/ImfFloatVectorAttribute.h>)
- #    define OPENEXR_HAS_FLOATVECTOR 1
- #else
- #    define OPENEXR_HAS_FLOATVECTOR 0
-@@ -51,37 +51,37 @@ using boost::math::gcd;
- OIIO_PRAGMA_VISIBILITY_PUSH
- OIIO_PRAGMA_WARNING_PUSH
- OIIO_GCC_PRAGMA(GCC diagnostic ignored "-Wunused-parameter")
--#include <OpenEXR/IexBaseExc.h>
--#include <OpenEXR/IexThrowErrnoExc.h>
--#include <OpenEXR/ImfBoxAttribute.h>
--#include <OpenEXR/ImfChromaticitiesAttribute.h>
--#include <OpenEXR/ImfCompressionAttribute.h>
--#include <OpenEXR/ImfDeepFrameBuffer.h>
--#include <OpenEXR/ImfDeepScanLineInputPart.h>
--#include <OpenEXR/ImfDeepTiledInputPart.h>
--#include <OpenEXR/ImfDoubleAttribute.h>
--#include <OpenEXR/ImfEnvmapAttribute.h>
--#include <OpenEXR/ImfFloatAttribute.h>
--#include <OpenEXR/ImfHeader.h>
-+#include <OpenEXR-3/IexBaseExc.h>
-+#include <OpenEXR-3/IexThrowErrnoExc.h>
-+#include <OpenEXR-3/ImfBoxAttribute.h>
-+#include <OpenEXR-3/ImfChromaticitiesAttribute.h>
-+#include <OpenEXR-3/ImfCompressionAttribute.h>
-+#include <OpenEXR-3/ImfDeepFrameBuffer.h>
-+#include <OpenEXR-3/ImfDeepScanLineInputPart.h>
-+#include <OpenEXR-3/ImfDeepTiledInputPart.h>
-+#include <OpenEXR-3/ImfDoubleAttribute.h>
-+#include <OpenEXR-3/ImfEnvmapAttribute.h>
-+#include <OpenEXR-3/ImfFloatAttribute.h>
-+#include <OpenEXR-3/ImfHeader.h>
- #if OPENEXR_HAS_FLOATVECTOR
--#    include <OpenEXR/ImfFloatVectorAttribute.h>
-+#    include <OpenEXR-3/ImfFloatVectorAttribute.h>
- #endif
--#include <OpenEXR/ImfInputPart.h>
--#include <OpenEXR/ImfIntAttribute.h>
--#include <OpenEXR/ImfKeyCodeAttribute.h>
--#include <OpenEXR/ImfMatrixAttribute.h>
--#include <OpenEXR/ImfMultiPartInputFile.h>
--#include <OpenEXR/ImfPartType.h>
--#include <OpenEXR/ImfRationalAttribute.h>
--#include <OpenEXR/ImfStringAttribute.h>
--#include <OpenEXR/ImfStringVectorAttribute.h>
--#include <OpenEXR/ImfTiledInputPart.h>
--#include <OpenEXR/ImfTimeCodeAttribute.h>
--#include <OpenEXR/ImfVecAttribute.h>
-+#include <OpenEXR-3/ImfInputPart.h>
-+#include <OpenEXR-3/ImfIntAttribute.h>
-+#include <OpenEXR-3/ImfKeyCodeAttribute.h>
-+#include <OpenEXR-3/ImfMatrixAttribute.h>
-+#include <OpenEXR-3/ImfMultiPartInputFile.h>
-+#include <OpenEXR-3/ImfPartType.h>
-+#include <OpenEXR-3/ImfRationalAttribute.h>
-+#include <OpenEXR-3/ImfStringAttribute.h>
-+#include <OpenEXR-3/ImfStringVectorAttribute.h>
-+#include <OpenEXR-3/ImfTiledInputPart.h>
-+#include <OpenEXR-3/ImfTimeCodeAttribute.h>
-+#include <OpenEXR-3/ImfVecAttribute.h>
- OIIO_PRAGMA_WARNING_POP
- OIIO_PRAGMA_VISIBILITY_POP
- 
--#include <OpenEXR/ImfCRgbaFile.h>
-+#include <OpenEXR-3/ImfCRgbaFile.h>
- 
- #if OPENEXR_CODED_VERSION >= 30100 && defined(OIIO_USE_EXR_C_API)
- #    define USE_OPENEXR_CORE
-diff --git a/src/openexr.imageio/exrinput_c.cpp b/src/openexr.imageio/exrinput_c.cpp
-index 4376333..1c566da 100644
---- a/src/openexr.imageio/exrinput_c.cpp
-+++ b/src/openexr.imageio/exrinput_c.cpp
-@@ -25,7 +25,7 @@ using boost::integer::gcd;
- using boost::math::gcd;
- #endif
- 
--#include <OpenEXR/openexr.h>
-+#include <OpenEXR-3/openexr.h>
- 
- #ifdef OPENEXR_VERSION_MAJOR
- #    define OPENEXR_CODED_VERSION                                    \
-diff --git a/src/openexr.imageio/exroutput.cpp b/src/openexr.imageio/exroutput.cpp
-index e11cf0c..0fd2295 100644
---- a/src/openexr.imageio/exroutput.cpp
-+++ b/src/openexr.imageio/exroutput.cpp
-@@ -13,10 +13,10 @@
- 
- #include <OpenImageIO/platform.h>
- 
--#include <OpenEXR/ImfChannelList.h>
--#include <OpenEXR/ImfEnvmap.h>
--#include <OpenEXR/ImfOutputFile.h>
--#include <OpenEXR/ImfTiledOutputFile.h>
-+#include <OpenEXR-3/ImfChannelList.h>
-+#include <OpenEXR-3/ImfEnvmap.h>
-+#include <OpenEXR-3/ImfOutputFile.h>
-+#include <OpenEXR-3/ImfTiledOutputFile.h>
- 
- #ifdef OPENEXR_VERSION_MAJOR
- #    define OPENEXR_CODED_VERSION                                    \
-@@ -27,7 +27,7 @@
- #endif
- 
- #if OPENEXR_CODED_VERSION >= 20400 \
--    || __has_include(<OpenEXR/ImfFloatVectorAttribute.h>)
-+    || __has_include(<OpenEXR-3/ImfFloatVectorAttribute.h>)
- #    define OPENEXR_HAS_FLOATVECTOR 1
- #else
- #    define OPENEXR_HAS_FLOATVECTOR 0
-@@ -38,34 +38,34 @@
- OIIO_PRAGMA_VISIBILITY_PUSH
- OIIO_PRAGMA_WARNING_PUSH
- OIIO_GCC_PRAGMA(GCC diagnostic ignored "-Wunused-parameter")
--#include <OpenEXR/IexBaseExc.h>
--#include <OpenEXR/ImfBoxAttribute.h>
--#include <OpenEXR/ImfCRgbaFile.h>  // JUST to get symbols to figure out version!
--#include <OpenEXR/ImfChromaticitiesAttribute.h>
--#include <OpenEXR/ImfCompressionAttribute.h>
--#include <OpenEXR/ImfEnvmapAttribute.h>
--#include <OpenEXR/ImfFloatAttribute.h>
-+#include <OpenEXR-3/IexBaseExc.h>
-+#include <OpenEXR-3/ImfBoxAttribute.h>
-+#include <OpenEXR-3/ImfCRgbaFile.h>  // JUST to get symbols to figure out version!
-+#include <OpenEXR-3/ImfChromaticitiesAttribute.h>
-+#include <OpenEXR-3/ImfCompressionAttribute.h>
-+#include <OpenEXR-3/ImfEnvmapAttribute.h>
-+#include <OpenEXR-3/ImfFloatAttribute.h>
- #if OPENEXR_HAS_FLOATVECTOR
--#    include <OpenEXR/ImfFloatVectorAttribute.h>
-+#    include <OpenEXR-3/ImfFloatVectorAttribute.h>
- #endif
--#include <OpenEXR/ImfHeader.h>
--#include <OpenEXR/ImfIntAttribute.h>
--#include <OpenEXR/ImfKeyCodeAttribute.h>
--#include <OpenEXR/ImfMatrixAttribute.h>
--#include <OpenEXR/ImfRationalAttribute.h>
--#include <OpenEXR/ImfStringAttribute.h>
--#include <OpenEXR/ImfTimeCodeAttribute.h>
--#include <OpenEXR/ImfVecAttribute.h>
--
--#include <OpenEXR/ImfDeepFrameBuffer.h>
--#include <OpenEXR/ImfDeepScanLineOutputPart.h>
--#include <OpenEXR/ImfDeepTiledOutputPart.h>
--#include <OpenEXR/ImfDoubleAttribute.h>
--#include <OpenEXR/ImfMultiPartOutputFile.h>
--#include <OpenEXR/ImfOutputPart.h>
--#include <OpenEXR/ImfPartType.h>
--#include <OpenEXR/ImfStringVectorAttribute.h>
--#include <OpenEXR/ImfTiledOutputPart.h>
-+#include <OpenEXR-3/ImfHeader.h>
-+#include <OpenEXR-3/ImfIntAttribute.h>
-+#include <OpenEXR-3/ImfKeyCodeAttribute.h>
-+#include <OpenEXR-3/ImfMatrixAttribute.h>
-+#include <OpenEXR-3/ImfRationalAttribute.h>
-+#include <OpenEXR-3/ImfStringAttribute.h>
-+#include <OpenEXR-3/ImfTimeCodeAttribute.h>
-+#include <OpenEXR-3/ImfVecAttribute.h>
-+
-+#include <OpenEXR-3/ImfDeepFrameBuffer.h>
-+#include <OpenEXR-3/ImfDeepScanLineOutputPart.h>
-+#include <OpenEXR-3/ImfDeepTiledOutputPart.h>
-+#include <OpenEXR-3/ImfDoubleAttribute.h>
-+#include <OpenEXR-3/ImfMultiPartOutputFile.h>
-+#include <OpenEXR-3/ImfOutputPart.h>
-+#include <OpenEXR-3/ImfPartType.h>
-+#include <OpenEXR-3/ImfStringVectorAttribute.h>
-+#include <OpenEXR-3/ImfTiledOutputPart.h>
- OIIO_PRAGMA_WARNING_POP
- OIIO_PRAGMA_VISIBILITY_POP
- 

diff --git a/media-libs/openimageio/openimageio-2.3.12.0-r1.ebuild b/media-libs/openimageio/openimageio-2.3.12.0-r2.ebuild
similarity index 88%
rename from media-libs/openimageio/openimageio-2.3.12.0-r1.ebuild
rename to media-libs/openimageio/openimageio-2.3.12.0-r2.ebuild
index 79438a824283..bd66deec7c82 100644
--- a/media-libs/openimageio/openimageio-2.3.12.0-r1.ebuild
+++ b/media-libs/openimageio/openimageio-2.3.12.0-r2.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python3_{8..10} )
 
 TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
 TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
-inherit cmake font python-single-r1 flag-o-matic
+inherit cmake font python-single-r1
 
 DESCRIPTION="A library for reading and writing images"
 HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
@@ -56,8 +56,8 @@ RDEPEND="
 	media-libs/libpng:0=
 	>=media-libs/libwebp-0.2.1:=
 	dev-libs/imath:=
-	>=media-libs/opencolorio-2.1.1-r3:=
-	media-libs/openexr:3=
+	>=media-libs/opencolorio-2.1.1-r4:=
+	media-libs/openexr:=
 	media-libs/tiff:0=
 	sys-libs/zlib:=
 	virtual/jpeg:0
@@ -97,24 +97,11 @@ DEPEND="${RDEPEND}"
 
 DOCS=( CHANGES.md CREDITS.md README.md )
 
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.3.11.0-imath-openexr-3.patch
-)
-
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }
 
 src_prepare() {
-	# Note: on bumps, please try again with OpenEXR 3 + ilmmath!
-	# Sabotage finding OpenEXR 3 for now to force usage of OpenEXR 2
-	# (because it mix and matches which version it uses; sed this to
-	# make sure it'll use OpenEXR 3 if it can, but it won't.)
-	# bug #821193
-	#sed -i \
-	#	-e 's/find_package(OpenEXR CONFIG)/find_package(OpenEXR-3 CONFIG)/' \
-	#	src/cmake/modules/FindOpenEXR.cmake || die
-
 	cmake_src_prepare
 	cmake_comment_add_subdirectory src/fonts
 
@@ -136,8 +123,6 @@ src_configure() {
 	# If no CPU SIMDs were used, completely disable them
 	[[ -z ${mysimd} ]] && mysimd=("0")
 
-	append-cppflags -DOIIO_USING_OPENEXR_3
-
 	local mycmakeargs=(
 		-DVERBOSE=ON
 		-DBUILD_TESTING=$(usex test)

next             reply	other threads:[~2022-02-15 19:51 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-02-15 19:51 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-01-05 20:35 [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/files/, media-libs/openimageio/ Sam James
2024-10-04 21:40 Andreas Sturmlechner
2024-06-05 12:57 Andrew Ammerlaan
2024-03-18 16:35 Sam James
2020-10-08 21:23 Sam James
2019-07-16 15:14 Andreas Sturmlechner

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:ad6ee04c16e dfblob:79438a82428 dfblob:bd66deec7c8 )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/files/, media-libs/openimageio/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1644954580.9988b26e89cfe41f05da7aa37685aa51e110808f.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox