[gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
commit: fec97980e4511ce4bf1d6b4da548d5cf346830aa Author: Jonathan Scruggs gmail com> AuthorDate: Fri Jan 19 10:35:51 2018 + Commit: Patrice Clement gentoo org> CommitDate: Mon Jan 22 21:50:42 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fec97980 media-libs/openimageio: clean up old. Closes: https://github.com/gentoo/gentoo/pull/6905 media-libs/openimageio/Manifest| 1 - .../files/openimageio-1.3.5-openexr-2.x.patch | 36 --- media-libs/openimageio/openimageio-1.3.5.ebuild| 112 - 3 files changed, 149 deletions(-) diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest index e1d646be24c..62c46fdb1ed 100644 --- a/media-libs/openimageio/Manifest +++ b/media-libs/openimageio/Manifest @@ -1,4 +1,3 @@ -DIST openimageio-1.3.5.tar.gz 13472488 BLAKE2B 2bd6985b338cc6ec4951d372c613aa79b10571b4a0f901f16ce34ecc9c03394aaa25de42b9e1a2e29f4c6f3a68694ee54788e766a2aaa6b5b782a6fd94cf5d22 SHA512 15c4a53ab4d139839da9e9b4bbbf8ad6e00da98e73e0373cec136ce8f54b0ceae0daa2b1680c8ddab49e1680825a08be7778a9f1b7a13dd30e020b8a8c517b95 DIST openimageio-1.6.13.tar.gz 24846132 BLAKE2B a72b7756257d4ffd1567efd73c24bf65fc2b82c96c18a77211e918323e65e1c99076e272b3b77115ca30910ea4cfced222892b062e339d8e4e85bd2221f7 SHA512 8cd490b6d6a3c0b542c4bcab709897c5f35ce6844ce7465e0158ac52a1b108603ccc76439f7f2e46af2ec08be4293bda6a76ec68a959026af70a444cbbdc21d6 DIST openimageio-1.6.18.tar.gz 24881550 BLAKE2B debd5624cf91a087cb73b88047767fe1915a5c52bf27bf3fb60b14abb572e980ea039d2626818c6b99cc5d596892aec0693226cabdc74cc2620f8221d7358f89 SHA512 b94429b77263e00c33fa79fcae1b444eab01937f6dc77168b31249204de9a31c17765a8b41bec2f7d53c3d03512ba151001607bd719cb1861a3f0231a1865d51 DIST openimageio-1.7.17.tar.gz 27164765 BLAKE2B 8245c2573577ad681753db0cad16dfd806e869ff1f443997bcf39d9a6474c585c749e9ff26bce5f23b9d42ef035bf8ce519374261a21ca0e3c4e7e13809f1a6b SHA512 c5ee9173d3acc24a5045e6ac97657d4bf0c5ac1d3250497db51b8bd9e27e2fc48979eba3598635eb6053b87748f8827be2d2831d425459a41c893e6cb43bce94 diff --git a/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch b/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch deleted file mode 100644 index 0668f0466a9..000 --- a/media-libs/openimageio/files/openimageio-1.3.5-openexr-2.x.patch +++ /dev/null @@ -1,36 +0,0 @@ -There is no IlmBaseConfig.h in OpenEXR 2.x - -../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_init' -../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_settype' -../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_mutexattr_destroy' -../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_lock' -../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_unlock' -../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_destroy' -../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_spin_init' -../libOpenImageIO/libOpenImageIO.so.1.3.5: error: undefined reference to 'pthread_detach' - src/cmake/modules/FindIlmBase.cmake -+++ src/cmake/modules/FindIlmBase.cmake -@@ -176,17 +176,11 @@ - set (ILMBASE_CACHED_STATE ${ILMBASE_CURRENT_STATE} - CACHE INTERNAL "State last seen by FindIlmBase.cmake" FORCE) - --# Link with pthreads if required --if (NOT WIN32 AND EXISTS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h) -- file (STRINGS ${ILMBASE_INCLUDE_DIR}/OpenEXR/IlmBaseConfig.h --ILMBASE_HAVE_PTHREAD --REGEX "^[ \\t]*#define[ \\t]+HAVE_PTHREAD[ \\t]1[ \\t]*\$" -- ) -- if (ILMBASE_HAVE_PTHREAD) --find_package (Threads) --if (CMAKE_USE_PTHREADS_INIT) -- set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT}) --endif () -+# Always link to pthreads for OpenEXR 2.x -+if (NOT WIN32) -+ find_package (Threads) -+ if (CMAKE_USE_PTHREADS_INIT) -+set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT}) - endif () - endif () - diff --git a/media-libs/openimageio/openimageio-1.3.5.ebuild b/media-libs/openimageio/openimageio-1.3.5.ebuild deleted file mode 100644 index db5c150d475..000 --- a/media-libs/openimageio/openimageio-1.3.5.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) - -inherit cmake-utils eutils multilib python-single-r1 vcs-snapshot - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"; -SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" -IUSE="gif jpeg2k colorio opencv opengl python qt4 ssl tbb +truetype" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
[gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
commit: 3075eade9d4edba26a19f36577bd5f094b3da890 Author: Jonathan Scruggs gmail com> AuthorDate: Thu Sep 28 17:42:09 2017 + Commit: Patrice Clement gentoo org> CommitDate: Thu Dec 21 20:16:34 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3075eade media-libs/openimageio: version bumps to 1.6.18 and 1.7.17. * Version 1.6.18 is the last of the RB-1.6 series, but add for compatibility with all existing programs. * v1.6.18 only: Add patch to support Boost 1.65 changes * The follow applies to both versions: * Patch to use GNUInstallDirs * Patch to fix boost and python detection on Gentoo * Added PTex and Field3D support * Added python module building support in ebuild * Added SIMD optimization (cpu flags) selection in ebuild Closes: https://bugs.gentoo.org/596268 ...e-python-and-boost-detection-more-generic.patch | 343 + ...ir-breaks-after-boost-python-1.65-changes.patch | 251 +++ .../openimageio-1.6.18-use-gnuinstalldirs.patch| 247 +++ ...e-python-and-boost-detection-more-generic.patch | 336 .../openimageio-1.7.17-use-gnuinstalldirs.patch| 247 +++ media-libs/openimageio/metadata.xml| 12 + media-libs/openimageio/openimageio-1.6.18.ebuild | 109 +++ media-libs/openimageio/openimageio-1.7.17.ebuild | 113 +++ 8 files changed, 1658 insertions(+) diff --git a/media-libs/openimageio/files/openimageio-1.6.18-make-python-and-boost-detection-more-generic.patch b/media-libs/openimageio/files/openimageio-1.6.18-make-python-and-boost-detection-more-generic.patch new file mode 100644 index 000..ad1a8aeb316 --- /dev/null +++ b/media-libs/openimageio/files/openimageio-1.6.18-make-python-and-boost-detection-more-generic.patch @@ -0,0 +1,343 @@ +From 2d62c7f5068f678317c506d108698a78a90e5ba0 Mon Sep 17 00:00:00 2001 +From: Jonathan Scruggs +Date: Thu, 28 Sep 2017 15:20:24 +0100 +Subject: [PATCH 2/2] oiio/RB-1.6: Make python and boost detection more generic + +* Fix boost and python detection for certain systems. +* Clean up boost and python detection. +* Remove redundant code. + +Backported from: +https://github.com/OpenImageIO/oiio/commit/fca7ed62bd679a8221147dcddb23a516796dab90 +--- + CMakeLists.txt | 38 + + src/cmake/externalpackages.cmake | 61 +--- + src/python/CMakeLists.txt| 119 --- + 3 files changed, 53 insertions(+), 165 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b29efac6..dd314d07 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -180,7 +180,6 @@ set (USE_OPENGL ON CACHE BOOL "Include OpenGL support") + set (USE_QT ON CACHE BOOL "Include Qt support") + set (FORCE_OPENGL_1 OFF CACHE BOOL "Force iv to use OpenGL's fixed pipeline") + set (USE_PYTHON ON CACHE BOOL "Build the Python bindings") +-set (USE_PYTHON3 OFF CACHE BOOL "Build the Python3 bindings") + set (USE_FIELD3D ON CACHE BOOL "Use Field3D if found") + set (USE_FFMPEG ON CACHE BOOL "Use FFmpeg if found") + set (JPEG_PATH "" CACHE STRING "Custom JPEG path") +@@ -197,8 +196,7 @@ set (USE_LIBRAW ON CACHE BOOL "Use LibRaw if found") + set (LIBRAW_PATH "" CACHE STRING "Custom LibRaw path") + set (NOTHREADS OFF CACHE BOOL "Compile with no threads or locking") + set (OIIO_THREAD_ALLOW_DCLP ON CACHE BOOL "OIIO threads may use DCLP for speed") +-set (PYTHON_VERSION 2.6) +-set (PYTHON3_VERSION 3.2) ++set (PYTHON_VERSION "2.7" CACHE STRING "Target version of python to find") + set (USE_NUKE ON CACHE BOOL "Build Nuke plugins, if Nuke is found") + set (Nuke_ROOT "" CACHE STRING "Where to find Nuke installation") + set (NUKE_VERSION 7.0) +@@ -321,32 +319,7 @@ include_directories ( + + + ### +-# Set install paths for the python modules +-# TODO: Figure out how to get the correct python directory +- +-if (UNIX AND NOT SELF_CONTAINED_INSTALL_TREE) +-# TODO: Figure out how to get the correct python directory +-set (DEFAULT_PYLIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/python/site-packages") +-set (DEFAULT_PYLIB3_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/python3/site-packages") +-else () +-# Here is the "self-contained install tree" case: the expectation here +-# is that everything related to this project will go into its own +-# directory, not into some standard system heirarchy. +-set (DEFAULT_PYLIB_INSTALL_DIR "python") +-set (DEFAULT_PYLIB3_INSTALL_DIR "python3") +-endif () +-if (EXEC_INSTALL_PREFIX) +-# Tack on an extra prefix to support multi-arch builds. +-set (DEFAULT_PYLIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB_INSTALL_DIR}") +-set (DEFAULT_PYLIB3_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB3_INSTALL_DIR}") +-endif () +-# Set up cmake cache variables corresponding to the defaults deduced above, so +-# that the user can over
[gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
commit: 5d45436825d316d669267866653d93f3d605d9fa Author: Michael Palimaka gentoo org> AuthorDate: Thu May 5 20:06:34 2016 + Commit: Michael Palimaka gentoo org> CommitDate: Thu May 5 20:09:37 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5d454368 media-libs/openimageio: remove old Package-Manager: portage-2.2.28 media-libs/openimageio/Manifest| 2 - .../files/openimageio-1.1.1-x86-build.patch| 15 --- media-libs/openimageio/openimageio-1.1.1.ebuild| 101 - media-libs/openimageio/openimageio-1.1.7.ebuild| 99 4 files changed, 217 deletions(-) diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest index cf8aaad..069cf78 100644 --- a/media-libs/openimageio/Manifest +++ b/media-libs/openimageio/Manifest @@ -1,4 +1,2 @@ -DIST openimageio-1.1.1.tar.gz 8217144 SHA256 a1cf6251edb597d31ccec3a74f516c3c9ce6e116dfb5edb3e4bd87d528d4700d SHA512 cf3e1371c6f0333f40506b08dc3fa6c0acecfb149e2e99159e893825e0d838db8ac1150e316e3568024568ed19bbcb473b4f38a61779a03fe9706ee476ec5943 WHIRLPOOL 78420497e1b65140f439e67c295102de5def4ed92eac1bf7b3b417d79d4634a0b149d08eafb8127aa1c5f1eb770334a14b244bee1f7af61ef31dc2abb2309aae -DIST openimageio-1.1.7.tar.gz 8300700 SHA256 81ad2ab957b93155d092700d2356b2f3bb6ae010dff3077bf1403905790cc13d SHA512 5596bbd57e569e5e9437e65e7d8e45e634c20eee62cc3115f72ec57664e5cc222137c248c3302d89df58ac1efabd198adfdc867a59945cc2324bff5be18ee2c8 WHIRLPOOL cab7c2d604d890b314cdfbd912754790e5d54c9ae2094ab3caff09313bc89e09b6b9795d6ea12903fed2550c5a00dca2cf5579ec6f80a8271775b84db3bd0cfa DIST openimageio-1.3.5.tar.gz 13472488 SHA256 18c9297e0d8b582191619a66ae6b7d9db2780f4874464ea462b22321c568a1af SHA512 15c4a53ab4d139839da9e9b4bbbf8ad6e00da98e73e0373cec136ce8f54b0ceae0daa2b1680c8ddab49e1680825a08be7778a9f1b7a13dd30e020b8a8c517b95 WHIRLPOOL d994fa07626667fa1c00ec221f7cdc5bb482fb321deb84e23fd87bc323d09372db955a338b0a6e030b7af4fcc22ecdb22b270dc2bbce532be39ed9ca2cbb3df6 DIST openimageio-1.6.13.tar.gz 24846132 SHA256 b2989df4133d84c9b24e2b67ae8780528a49b6c088ce945e15ecefc31235a39b SHA512 8cd490b6d6a3c0b542c4bcab709897c5f35ce6844ce7465e0158ac52a1b108603ccc76439f7f2e46af2ec08be4293bda6a76ec68a959026af70a444cbbdc21d6 WHIRLPOOL 021a49be5878000c92f44132d586ee6a355c6465f2f55ee54f34dccd8459cfd945ac8bf369a1ec6f75e459a88b0035daca90dd2b7d328298ae62865f36875ddd diff --git a/media-libs/openimageio/files/openimageio-1.1.1-x86-build.patch b/media-libs/openimageio/files/openimageio-1.1.1-x86-build.patch deleted file mode 100644 index 5982166..000 --- a/media-libs/openimageio/files/openimageio-1.1.1-x86-build.patch +++ /dev/null @@ -1,15 +0,0 @@ -http://bugs.gentoo.org/444784 - src/libutil/SHA1.cpp -+++ src/libutil/SHA1.cpp -@@ -8,9 +8,9 @@ - - // If compiling with MFC, you might want to add #include "StdAfx.h" - -+#include "SHA1.h" - #include "hash.h" - #include "dassert.h" --#include "SHA1.h" - - #ifdef SHA1_UTILITY_FUNCTIONS - #define SHA1_MAX_FILE_BUFFER 8000 diff --git a/media-libs/openimageio/openimageio-1.1.1.ebuild b/media-libs/openimageio/openimageio-1.1.1.ebuild deleted file mode 100644 index 8ac8016..000 --- a/media-libs/openimageio/openimageio-1.1.1.ebuild +++ /dev/null @@ -1,101 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_DEPEND="python? 2:2.7" - -inherit cmake-utils eutils multilib python vcs-snapshot - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"; -SRC_URI="https://github.com/OpenImageIO/oiio/tarball/Release-${PV} -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 ~ppc64 x86" -IUSE="jpeg2k colorio opencv opengl python qt4 tbb +truetype" - -RESTRICT="test" #431412 - -RDEPEND="dev-libs/boost[python?] - dev-libs/pugixml - media-libs/glew - media-libs/ilmbase - media-libs/libpng:0 - >=media-libs/libwebp-0.2.1 - media-libs/openexr - media-libs/tiff:0 - sci-libs/hdf5 - sys-libs/zlib - virtual/jpeg - jpeg2k? ( >=media-libs/openjpeg-1.5:0 ) - colorio? ( >=media-libs/opencolorio-1.0.7 ) - opencv? ( - >=media-libs/opencv-2.3 - || ( media-libs/opencv-2.4.8[python?] ) - ) - opengl? ( - virtual/glu - virtual/opengl - ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - dev-qt/qtopengl:4 - ) - tbb? ( dev-cpp/tbb ) - truetype? ( >=media-libs/freetype-2 )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${P}/src - -pkg_setup() { - if use python; then - python_set_active_version 2 - python_pkg_setup - fi -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-x86-build.patch #444784 - -
[gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
commit: aca6a611eb0cda805b60113ccd0a6f56369ef41a Author: Alexis Ballier gentoo org> AuthorDate: Fri Apr 27 12:12:58 2018 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Apr 27 12:13:23 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aca6a611 media-libs/openimageio: backport upstream fix for ffmpeg4 Closes: https://bugs.gentoo.org/654160 Package-Manager: Portage-2.3.31, Repoman-2.3.9 .../files/openimageio-1.8.7-ffmpeg4.patch | 26 ++ media-libs/openimageio/openimageio-1.8.7.ebuild| 4 2 files changed, 30 insertions(+) diff --git a/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch b/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch new file mode 100644 index 000..92cad26c933 --- /dev/null +++ b/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch @@ -0,0 +1,26 @@ +commit 810a0235837d6f31d8b3c05544f99461df71403e +Author: Larry Gritz +Date: Mon Apr 23 15:50:14 2018 -0700 + +Changes to allow building against the new ffmpeg 4.0 (#1926) + +diff --git a/src/ffmpeg.imageio/ffmpeginput.cpp b/src/ffmpeg.imageio/ffmpeginput.cpp +index 4e0cb3b9..548ddba4 100644 +--- a/src/ffmpeg.imageio/ffmpeginput.cpp b/src/ffmpeg.imageio/ffmpeginput.cpp +@@ -124,6 +124,15 @@ inline int receive_frame(AVCodecContext *avctx, AVFrame *picture, + } + #endif + ++ ++// Changes for ffmpeg 4.0 ++#define USE_FFMPEG_4_0 (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 18, 100)) ++ ++#if USE_FFMPEG_4_0 ++# define CODEC_CAP_DELAY AV_CODEC_CAP_DELAY ++#endif ++ ++ + #include + + #include diff --git a/media-libs/openimageio/openimageio-1.8.7.ebuild b/media-libs/openimageio/openimageio-1.8.7.ebuild index 1c69cf3c6d6..22956201293 100644 --- a/media-libs/openimageio/openimageio-1.8.7.ebuild +++ b/media-libs/openimageio/openimageio-1.8.7.ebuild @@ -65,6 +65,10 @@ RDEPEND=">=dev-libs/boost-1.62:= DEPEND="${RDEPEND} doc? ( app-doc/doxygen[latex] )" +PATCHES=( + "${FILESDIR}/${P}-ffmpeg4.patch" +) + DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf ) pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
commit: 6d4e4cb67556e26e103c9c4afa34f000a0fb12c9 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jun 10 18:02:23 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jun 10 19:50:52 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d4e4cb6 media-libs/openimageio: Drop obsolete versions, truckload of patches Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/openimageio/Manifest| 2 - ...e-python-and-boost-detection-more-generic.patch | 343 - ...ir-breaks-after-boost-python-1.65-changes.patch | 251 --- .../openimageio-1.6.18-use-gnuinstalldirs.patch| 247 --- ...e-python-and-boost-detection-more-generic.patch | 336 .../files/openimageio-1.7.17-openexr-2.3.0.patch | 51 --- .../openimageio-1.7.17-use-gnuinstalldirs.patch| 247 --- media-libs/openimageio/openimageio-1.6.18.ebuild | 103 --- media-libs/openimageio/openimageio-1.7.17.ebuild | 111 --- 9 files changed, 1691 deletions(-) diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest index e1d63745cb3..d820d5faf3f 100644 --- a/media-libs/openimageio/Manifest +++ b/media-libs/openimageio/Manifest @@ -1,4 +1,2 @@ DIST openimageio-1.6.13.tar.gz 24846132 BLAKE2B a72b7756257d4ffd1567efd73c24bf65fc2b82c96c18a77211e918323e65e1c99076e272b3b77115ca30910ea4cfced222892b062e339d8e4e85bd2221f7 SHA512 8cd490b6d6a3c0b542c4bcab709897c5f35ce6844ce7465e0158ac52a1b108603ccc76439f7f2e46af2ec08be4293bda6a76ec68a959026af70a444cbbdc21d6 -DIST openimageio-1.6.18.tar.gz 24881550 BLAKE2B debd5624cf91a087cb73b88047767fe1915a5c52bf27bf3fb60b14abb572e980ea039d2626818c6b99cc5d596892aec0693226cabdc74cc2620f8221d7358f89 SHA512 b94429b77263e00c33fa79fcae1b444eab01937f6dc77168b31249204de9a31c17765a8b41bec2f7d53c3d03512ba151001607bd719cb1861a3f0231a1865d51 -DIST openimageio-1.7.17.tar.gz 27164765 BLAKE2B 8245c2573577ad681753db0cad16dfd806e869ff1f443997bcf39d9a6474c585c749e9ff26bce5f23b9d42ef035bf8ce519374261a21ca0e3c4e7e13809f1a6b SHA512 c5ee9173d3acc24a5045e6ac97657d4bf0c5ac1d3250497db51b8bd9e27e2fc48979eba3598635eb6053b87748f8827be2d2831d425459a41c893e6cb43bce94 DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7 diff --git a/media-libs/openimageio/files/openimageio-1.6.18-make-python-and-boost-detection-more-generic.patch b/media-libs/openimageio/files/openimageio-1.6.18-make-python-and-boost-detection-more-generic.patch deleted file mode 100644 index ad1a8aeb316..000 --- a/media-libs/openimageio/files/openimageio-1.6.18-make-python-and-boost-detection-more-generic.patch +++ /dev/null @@ -1,343 +0,0 @@ -From 2d62c7f5068f678317c506d108698a78a90e5ba0 Mon Sep 17 00:00:00 2001 -From: Jonathan Scruggs -Date: Thu, 28 Sep 2017 15:20:24 +0100 -Subject: [PATCH 2/2] oiio/RB-1.6: Make python and boost detection more generic - -* Fix boost and python detection for certain systems. -* Clean up boost and python detection. -* Remove redundant code. - -Backported from: -https://github.com/OpenImageIO/oiio/commit/fca7ed62bd679a8221147dcddb23a516796dab90 - CMakeLists.txt | 38 + - src/cmake/externalpackages.cmake | 61 +--- - src/python/CMakeLists.txt| 119 --- - 3 files changed, 53 insertions(+), 165 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b29efac6..dd314d07 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -180,7 +180,6 @@ set (USE_OPENGL ON CACHE BOOL "Include OpenGL support") - set (USE_QT ON CACHE BOOL "Include Qt support") - set (FORCE_OPENGL_1 OFF CACHE BOOL "Force iv to use OpenGL's fixed pipeline") - set (USE_PYTHON ON CACHE BOOL "Build the Python bindings") --set (USE_PYTHON3 OFF CACHE BOOL "Build the Python3 bindings") - set (USE_FIELD3D ON CACHE BOOL "Use Field3D if found") - set (USE_FFMPEG ON CACHE BOOL "Use FFmpeg if found") - set (JPEG_PATH "" CACHE STRING "Custom JPEG path") -@@ -197,8 +196,7 @@ set (USE_LIBRAW ON CACHE BOOL "Use LibRaw if found") - set (LIBRAW_PATH "" CACHE STRING "Custom LibRaw path") - set (NOTHREADS OFF CACHE BOOL "Compile with no threads or locking") - set (OIIO_THREAD_ALLOW_DCLP ON CACHE BOOL "OIIO threads may use DCLP for speed") --set (PYTHON_VERSION 2.6) --set (PYTHON3_VERSION 3.2) -+set (PYTHON_VERSION "2.7" CACHE STRING "Target version of python to find") - set (USE_NUKE ON CACHE BOOL "Build Nuke plugins, if Nuke is found") - set (Nuke_ROOT "" CACHE STRING "Where to find Nuke installation") - set (NUKE_VERSION 7.0) -@@ -321,32 +319,7 @@ include_directories ( - - -
[gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
commit: 32852865d59bc3ab579d4664d5c9b5790edfca46 Author: Lars Wendler gentoo org> AuthorDate: Mon Jan 7 12:35:48 2019 + Commit: Lars Wendler gentoo org> CommitDate: Mon Jan 7 12:38:15 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32852865 media-libs/openimageio: Removed old. Closes: https://bugs.gentoo.org/668412 Package-Manager: Portage-2.3.54, Repoman-2.3.12 Signed-off-by: Lars Wendler gentoo.org> media-libs/openimageio/Manifest| 2 - .../files/openimageio-1.8.7-ffmpeg4.patch | 26 - media-libs/openimageio/openimageio-1.8.13.ebuild | 114 media-libs/openimageio/openimageio-1.8.7.ebuild| 116 - 4 files changed, 258 deletions(-) diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest index 43aff67028b..e1d63745cb3 100644 --- a/media-libs/openimageio/Manifest +++ b/media-libs/openimageio/Manifest @@ -1,6 +1,4 @@ DIST openimageio-1.6.13.tar.gz 24846132 BLAKE2B a72b7756257d4ffd1567efd73c24bf65fc2b82c96c18a77211e918323e65e1c99076e272b3b77115ca30910ea4cfced222892b062e339d8e4e85bd2221f7 SHA512 8cd490b6d6a3c0b542c4bcab709897c5f35ce6844ce7465e0158ac52a1b108603ccc76439f7f2e46af2ec08be4293bda6a76ec68a959026af70a444cbbdc21d6 DIST openimageio-1.6.18.tar.gz 24881550 BLAKE2B debd5624cf91a087cb73b88047767fe1915a5c52bf27bf3fb60b14abb572e980ea039d2626818c6b99cc5d596892aec0693226cabdc74cc2620f8221d7358f89 SHA512 b94429b77263e00c33fa79fcae1b444eab01937f6dc77168b31249204de9a31c17765a8b41bec2f7d53c3d03512ba151001607bd719cb1861a3f0231a1865d51 DIST openimageio-1.7.17.tar.gz 27164765 BLAKE2B 8245c2573577ad681753db0cad16dfd806e869ff1f443997bcf39d9a6474c585c749e9ff26bce5f23b9d42ef035bf8ce519374261a21ca0e3c4e7e13809f1a6b SHA512 c5ee9173d3acc24a5045e6ac97657d4bf0c5ac1d3250497db51b8bd9e27e2fc48979eba3598635eb6053b87748f8827be2d2831d425459a41c893e6cb43bce94 -DIST openimageio-1.8.13.tar.gz 27829708 BLAKE2B 8c3a6721f7039e22fcea538694c32651e042d926f40494e5b3623c11158da2f49a8e49698920269d0f3076d060c5849c62f2a6bb256d77dcd5565f86e6de04d2 SHA512 578d039399846f994dd8e4b94a7b56f2bcec45571c2144705fc4e2fe6a3e1d878d79a96c0484350d54b46eef7796d46becda9f5d50f266cd730f63d97af0650e DIST openimageio-1.8.17.tar.gz 27835527 BLAKE2B e524d171bb918a46aed3c5f329bc8d10853d8b170c1e9b4a6edad72db66b3a03ea32eba4338577a667254e884daebf6b5b33a70090b953a5b5e269d874c91852 SHA512 e58cad9458d71a845c3214675a41e0cffe0509fd52a95ef5a44af0015ef25a1145f9ebb50ff1f5e7200ae0a46efb40e851855f53c55d058c0bc5654a072bdbf7 -DIST openimageio-1.8.7.tar.gz 27658771 BLAKE2B 4fe680eacbcca8b6ac6f9f94ef68e4d8a118b5ad58bb7f7091f2800c6b8fa1ad0c2c125c76ca025e956e92c04dbf5e6e0cecb48e1f29feffd804b97abcd61678 SHA512 d31e2790798959572f02de26111805b4bb5a26f73252d2f222f749e867354ca93e292738c04a36769f08c35d9b26605d1fdf66d96b2de5928d8e726bb819e963 diff --git a/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch b/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch deleted file mode 100644 index 92cad26c933..000 --- a/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch +++ /dev/null @@ -1,26 +0,0 @@ -commit 810a0235837d6f31d8b3c05544f99461df71403e -Author: Larry Gritz -Date: Mon Apr 23 15:50:14 2018 -0700 - -Changes to allow building against the new ffmpeg 4.0 (#1926) - -diff --git a/src/ffmpeg.imageio/ffmpeginput.cpp b/src/ffmpeg.imageio/ffmpeginput.cpp -index 4e0cb3b9..548ddba4 100644 a/src/ffmpeg.imageio/ffmpeginput.cpp -+++ b/src/ffmpeg.imageio/ffmpeginput.cpp -@@ -124,6 +124,15 @@ inline int receive_frame(AVCodecContext *avctx, AVFrame *picture, - } - #endif - -+ -+// Changes for ffmpeg 4.0 -+#define USE_FFMPEG_4_0 (LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 18, 100)) -+ -+#if USE_FFMPEG_4_0 -+# define CODEC_CAP_DELAY AV_CODEC_CAP_DELAY -+#endif -+ -+ - #include - - #include diff --git a/media-libs/openimageio/openimageio-1.8.13.ebuild b/media-libs/openimageio/openimageio-1.8.13.ebuild deleted file mode 100644 index 7e8ccfa6103..000 --- a/media-libs/openimageio/openimageio-1.8.13.ebuild +++ /dev/null @@ -1,114 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit cmake-utils python-single-r1 - -DESCRIPTION="A library for reading and writing images" -HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"; -SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64 ~ppc64 ~x86" - -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="colorio doc ffmpeg field3d gif jpeg2k libressl opencv opengl ptex python qt5 raw ssl +truetype ${CPU_FEATURES[@]%:*}" -REQUIRED_USE="p
[gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
commit: 3aaca40c1636ae63b4fbe4fa04108f22607ae261 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 21 17:18:12 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 21 18:21:40 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3aaca40c media-libs/openimageio: Fix configure with openexr-2.3.0 Thanks-to: Alexander Miller gmx.de> Closes: https://bugs.gentoo.org/683126 Package-Manager: Portage-2.3.64, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> .../files/openimageio-1.7.17-openexr-2.3.0.patch | 51 ++ media-libs/openimageio/openimageio-1.7.17.ebuild | 1 + 2 files changed, 52 insertions(+) diff --git a/media-libs/openimageio/files/openimageio-1.7.17-openexr-2.3.0.patch b/media-libs/openimageio/files/openimageio-1.7.17-openexr-2.3.0.patch new file mode 100644 index 000..e4bd3562adc --- /dev/null +++ b/media-libs/openimageio/files/openimageio-1.7.17-openexr-2.3.0.patch @@ -0,0 +1,51 @@ +Use PkgConfig to find OpenEXR. Otherwise, the code fails +when OpenEXR/OpenEXRConfig.h is a multilib wrapper. +Changes taken from openimageio-1.8.17. + +--- openimageio-1.7.17/src/cmake/modules/FindOpenEXR.cmake openimageio-1.7.17/src/cmake/modules/FindOpenEXR.cmake +@@ -27,6 +27,13 @@ + set (ILMBASE_PTHREADS ${CMAKE_THREAD_LIBS_INIT}) + endif () + ++# Attempt to find OpenEXR with pkgconfig ++find_package(PkgConfig) ++if (PKG_CONFIG_FOUND) ++pkg_check_modules(_ILMBASE QUIET IlmBase) ++pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0) ++endif (PKG_CONFIG_FOUND) ++ + # List of likely places to find the headers -- note priority override of + # OPENEXR_CUSTOM_INCLUDE_DIR and ${OPENEXR_HOME}/include. + # ILMBASE is needed in case ilmbase an openexr are installed in separate +@@ -35,6 +42,8 @@ + ${OPENEXR_CUSTOM_INCLUDE_DIR} + ${OPENEXR_HOME}/include + ${ILMBASE_HOME}/include ++${_ILMBASE_INCLUDEDIR} ++${_OPENEXR_INCLUDEDIR} + /usr/local/include + /usr/include + /usr/include/${CMAKE_LIBRARY_ARCHITECTURE} +@@ -53,7 +62,11 @@ + find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h) + + # Try to figure out version number +-if (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h") ++if (DEFINED _OPENEXR_VERSION AND NOT "${_OPENEXR_VERSION}" STREQUAL "") ++set (OPENEXR_VERSION "${_OPENEXR_VERSION}") ++string (REGEX REPLACE "([0-9]+)\\.[0-9]+" "\\1" OPENEXR_VERSION_MAJOR "${_OPENEXR_VERSION}") ++string (REGEX REPLACE "[0-9]+\\.([0-9]+)" "\\1" OPENEXR_VERSION_MINOR "${_OPENEXR_VERSION}") ++elseif (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h") + # Must be at least 2.0 + file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_STRING .*$") + string (REGEX MATCHALL "[0-9]+[.0-9]+" OPENEXR_VERSION ${TMP}) +@@ -90,6 +103,8 @@ + ${GENERIC_LIBRARY_PATHS} + ${OPENEXR_INCLUDE_PATH}/../lib + ${ILMBASE_INCLUDE_PATH}/../lib ++${_ILMBASE_LIBDIR} ++${_OPENEXR_LIBDIR} + /usr/local/lib + /usr/local/lib/${CMAKE_LIBRARY_ARCHITECTURE} + /usr/lib diff --git a/media-libs/openimageio/openimageio-1.7.17.ebuild b/media-libs/openimageio/openimageio-1.7.17.ebuild index 0b3a2d7fe5f..2e5bb080fb5 100644 --- a/media-libs/openimageio/openimageio-1.7.17.ebuild +++ b/media-libs/openimageio/openimageio-1.7.17.ebuild @@ -61,6 +61,7 @@ DEPEND="${RDEPEND} PATCHES=( "${FILESDIR}/${P}-use-gnuinstalldirs.patch" "${FILESDIR}/${P}-make-python-and-boost-detection-more-generic.patch" + "${FILESDIR}/${P}-openexr-2.3.0.patch" # bug 683126 ) DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
[gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
commit: 42905a79164d67fea0dcc8f5138a78b8553d5996 Author: Sam James gentoo org> AuthorDate: Sat Feb 12 02:01:26 2022 + Commit: Sam James gentoo org> CommitDate: Sat Feb 12 03:55:31 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42905a79 media-libs/openimageio: 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/821193 Signed-off-by: Sam James gentoo.org> .../openimageio-2.3.11.0-imath-openexr-3.patch | 302 + .../openimageio/openimageio-2.3.11.0-r1.ebuild | 190 + 2 files changed, 492 insertions(+) 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 new file mode 100644 index ..ad6ee04c16e6 --- /dev/null +++ b/media-libs/openimageio/files/openimageio-2.3.11.0-imath-openexr-3.patch @@ -0,0 +1,302 @@ +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 + #include + +-#include //For TimeCode support ++#include //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 + + #if OIIO_USING_IMATH >= 3 +-#include ++#include + #else + #include + #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 +-# include +-# include +-# include ++# include ++# include ++# include ++# include + #else + # include + # include +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 + + #if OIIO_USING_IMATH >= 3 +-#include ++#include + #else + #include + #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 + + #if OIIO_USING_IMATH >= 3 +-#include ++#include + #else + #include + #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 + + #if OIIO_USING_IMATH >= 3 +-#include ++#include ++#include ++#include + #else + #include ++#include ++#include + #endif +-#include +-#include + + #include + #include +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 + #include + +-#include ++#include + + #include + #include +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 +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + + #ifdef OPENEXR_VERSION_MAJOR + #define OPENEXR_CODED_VERSION\ +@@ -40,7 +40,7 @@ using boost::math::gcd; + #endif + + #if OPENEXR_CODED_VERSION >= 20400 \ +-|| __has_include() ++|| __has_include() + #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 +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include + #if OPENEXR_HAS_FLOATVECTOR +-#include ++#include + #endif +-#include +-#include +-#include +-#include +-#include +-#i
[gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
commit: 666a5bcdd83606553c0f35894fdbb90fd0653137 Author: Sam James gentoo org> AuthorDate: Sat Feb 12 16:24:50 2022 + Commit: Sam James gentoo org> CommitDate: Sat Feb 12 16:25:03 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=666a5bcd media-libs/openimageio: try harder to avoid OpenEXR 2 Closes: https://bugs.gentoo.org/833194 Signed-off-by: Sam James gentoo.org> .../openimageio-2.3.11.0-imath-openexr-3.patch | 325 ++--- 0-r2.ebuild => openimageio-2.3.11.0-r3.ebuild} | 0 0-r1.ebuild => openimageio-2.3.12.0-r2.ebuild} | 0 3 files changed, 23 insertions(+), 302 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 index ad6ee04c16e6..eab08909e831 100644 --- 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 @@ -1,302 +1,23 @@ -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 - #include - --#include //For TimeCode support -+#include //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 - - #if OIIO_USING_IMATH >= 3 --#include -+#include - #else - #include - #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 --# include --# include --# include -+# include -+# include -+# include -+# include - #else - # include - # include -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 - - #if OIIO_USING_IMATH >= 3 --#include -+#include - #else - #include - #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 - - #if OIIO_USING_IMATH >= 3 --#include -+#include - #else - #include - #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 - - #if OIIO_USING_IMATH >= 3 --#include -+#include -+#include -+#include - #else - #include -+#include -+#include - #endif --#include --#include - - #include - #include -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 - #include - --#include -+#include - - #include - #include -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 --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include - - #ifdef OPENEXR_VERSION_MAJOR - #define OPENEXR_CODED_VERSION\ -@@ -40,7 +40,7 @@ using boost::math::gcd; - #endif - - #if OPENEXR_CODED_VERSION >= 20400 \ --|| __has_include() -+|| __has_include() - #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 --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include -+#include - #if OPENEXR_HAS_FLOATVECTOR --#include -+#include - #endif --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include --#include -+#includ
[gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
commit: b42a99ee007f0b2ae28d8d9b7da23f66a2888b80 Author: Sam James gentoo org> AuthorDate: Sat Feb 12 16:42:40 2022 + Commit: Sam James gentoo org> CommitDate: Sat Feb 12 16:42:40 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b42a99ee media-libs/openimageio: Revert "try harder to avoid OpenEXR 2" This reverts commit 666a5bcdd83606553c0f35894fdbb90fd0653137. Not there yet. Bug: https://bugs.gentoo.org/833194 Signed-off-by: Sam James gentoo.org> .../openimageio-2.3.11.0-imath-openexr-3.patch | 325 +++-- 0-r3.ebuild => openimageio-2.3.11.0-r2.ebuild} | 0 0-r2.ebuild => openimageio-2.3.12.0-r1.ebuild} | 0 3 files changed, 302 insertions(+), 23 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 index eab08909e831..ad6ee04c16e6 100644 --- 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 @@ -1,23 +1,302 @@ -diff --git a/src/cmake/modules/FindOpenEXR.cmake b/src/cmake/modules/FindOpenEXR.cmake -index 5e356dd..595445c 100644 a/src/cmake/modules/FindOpenEXR.cmake -+++ b/src/cmake/modules/FindOpenEXR.cmake -@@ -35,14 +35,14 @@ - # - - # First, try to fine just the right config files --find_package(Imath CONFIG) --if (NOT TARGET Imath::Imath) -+find_package(Imath-3 CONFIG) -+if (NOT TARGET Imath-3::Imath) - # Couldn't find Imath::Imath, maybe it's older and has IlmBase? - find_package(IlmBase CONFIG) - endif () --find_package(OpenEXR CONFIG) -+find_package(OpenEXR-3 CONFIG) - --if (TARGET OpenEXR::OpenEXR AND TARGET Imath::Imath) -+if (TARGET OpenEXR-3::OpenEXR AND TARGET Imath-3::Imath) - # OpenEXR 3.x if both of these targets are found - set (FOUND_OPENEXR_WITH_CONFIG 1) - if (NOT OpenEXR_FIND_QUIETLY) +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 + #include + +-#include //For TimeCode support ++#include //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 + + #if OIIO_USING_IMATH >= 3 +-#include ++#include + #else + #include + #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 +-# include +-# include +-# include ++# include ++# include ++# include ++# include + #else + # include + # include +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 + + #if OIIO_USING_IMATH >= 3 +-#include ++#include + #else + #include + #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 + + #if OIIO_USING_IMATH >= 3 +-#include ++#include + #else + #include + #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 + + #if OIIO_USING_IMATH >= 3 +-#include ++#include ++#include ++#include + #else + #include ++#include ++#include + #endif +-#include +-#include + + #include + #include +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 + #include + +-#include ++#include + + #include + #include +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 +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + + #ifdef OPENEXR_VERSION_MAJOR + #define OPENEXR_CODED_VERSION
[gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
commit: 922111577300d9190370618c83baa2fa9766d878 Author: Huang Rui gmail com> AuthorDate: Mon Jul 22 09:49:22 2024 + Commit: Andrew Ammerlaan gentoo org> CommitDate: Sat Aug 3 07:39:01 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92211157 media-libs/openimageio: add 2.5.13.1 Signed-off-by: Huang Rui gmail.com> Signed-off-by: Andrew Ammerlaan gentoo.org> media-libs/openimageio/Manifest| 1 + .../files/openimageio-2.5.12.0-heif-find-fix.patch | 19 ++ media-libs/openimageio/openimageio-2.5.13.1.ebuild | 303 + 3 files changed, 323 insertions(+) diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest index b7e63eddb105..f1e806c27c42 100644 --- a/media-libs/openimageio/Manifest +++ b/media-libs/openimageio/Manifest @@ -5,6 +5,7 @@ DIST file003.fits 581760 BLAKE2B 35d77c64ff9e25f34593ea41839a4f7712dc344d12ab2c0 DIST file009.fits 25920 BLAKE2B 594061eba4d48da8cbfee58ab592a0adb5a22d681228330e84f60304e5146a8856e9c65b763d6d8e2136217ebe85d92128318cccfcf6358c7bc767232c6382c9 SHA512 57d53622854399aed96efbeff78e700990b2fc63c4dbd1bc9ac58c7670af98d528db2f1a3e9de4e74b977f8318109b465b46423bbac36bf2bf34a1e33e7dcdb8 DIST file012.fits 1019520 BLAKE2B e86d9e0004ca159d9a5ae0585776db65c7dd49162cb5dbd8b511686244950e33746d8a41f60b5ba8fcea220194fa87e16235adb7ccc0b4fb4b0a61e6c5c376a8 SHA512 45439544da478b24ccbcf14dc9a651aa8ecbce29b9992204d85c1eee42bc88b68802ec57bc148510da1e062de95ee53dd5c64c9bfa2e0b6cdfd945a78d1fc76a DIST openimageio-2.5.12.0.tar.gz 52535046 BLAKE2B d60e823b8834c68098e771929475b7321363aad044b244a5c2a284e1c67a1a3145d22ed259eccbc4f6fbfcd6d2768414e4f22bdfa17f6516205d7749dcc6c6c8 SHA512 c6e53b5484702c66f01490d23f272e597e016b984d54f81e400605bf2a2e1dd7843ce25a7ef51ffbc7ee7089b42e8d73a91699b93cb655b5ca9ef869c9a950f4 +DIST openimageio-2.5.13.1.tar.gz 52538869 BLAKE2B ceba0bde73cbf2b5b7b243fa1dc4806aece881c37775418c3305d5e5665e1c249219cad2c7b0d9d4acd5955897dc13dfb94e4627e9ae866e6400559b99e7021a SHA512 3c9eb9a361464e73fae518b704438bbf409c846031f05026d8b9ace91431819ac80674130ccd2300deb9756ae26e150bf5c0a866be3f3fb65bdfba0ba60395ab DIST openimageio-2.5.9.0.tar.gz 52051925 BLAKE2B 7d499d80af6cdecfdea9a422030c095357b67a7d8dd281638e2e687df47b5c7b57c909c8682f1c6185251df13d6f9c7ddf1f9d5fc7fef26351fe0d4b8cc7d8c6 SHA512 554f61e19e3f81c8495f48386494a1aeee3a2a759b3022b4fb5cf1dba1dbc813cd0956b60d08a2c1feca69d97141e5836651fcbbeadab1e050eb2d103eb1c41f DIST openimageio-oexr-test-image-df16e765fee28a947244657cae3251959ae63c00.tar.gz 252131865 BLAKE2B f5f2477897f84148574cdd02b673c7bdff49d8f45026375095bb6f184230466e2e60020be7583e5a5aa0aa9c971e7251979d3eeb2ee620d47342b1e4435427e0 SHA512 e89c2935496c5fec2ebe1175e9b9bd3aecb23374ec3947057195ee6d31a883c1a67c4dc754bf0a5b68859093b5e169b70ffabd4736cf67f9e3dc09f3299fc54f DIST openimageio-oiio-test-image-7d821f02c848022b2ee703d6bee48ca2acbfae70.tar.gz 141224552 BLAKE2B e185f6b2bd345ca0740d1ac7bc48e5a283a80db0d2fa88566367e1179e96d048ac371708db29a6591d0c4eb7f9c171af22bac30fd68bc223e2c373db3b99077d SHA512 a3c9e4151c946b79e2eb37cd53fd2865d6117431ad06e4e35d42c10d9ff8415224e2f20e14af8dd869ec2a6c6faf4f9d8ef28e5b6556c88a54398de4a8843b59 diff --git a/media-libs/openimageio/files/openimageio-2.5.12.0-heif-find-fix.patch b/media-libs/openimageio/files/openimageio-2.5.12.0-heif-find-fix.patch new file mode 100644 index ..6ffcdc3def3a --- /dev/null +++ b/media-libs/openimageio/files/openimageio-2.5.12.0-heif-find-fix.patch @@ -0,0 +1,19 @@ +From: Huang Rui +Date: 2024-07-22 +Subject: [PATCH] fix FindLibheif with heif_version.h multilib warpper + +--- a/src/cmake/modules/FindLibheif.cmake 2024-07-15 21:30:17.0 +0800 b/src/cmake/modules/FindLibheif.cmake 2024-07-22 17:33:21.827445823 +0800 +@@ -30,7 +30,11 @@ + DOC "The directory where libheif libraries reside") + + if (LIBHEIF_INCLUDE_DIR) +-file(STRINGS "${LIBHEIF_INCLUDE_DIR}/libheif/heif_version.h" TMP REGEX "^#define LIBHEIF_VERSION[ \t].*$") ++execute_process( ++COMMAND sh -c "${CMAKE_C_COMPILER} -E -dD -P ${LIBHEIF_INCLUDE_DIR}/libheif/heif_version.h | grep LIBHEIF_VERSION" ++OUTPUT_VARIABLE TMP ++OUTPUT_STRIP_TRAILING_WHITESPACE ++) + string(REGEX MATCHALL "[0-9.]+" LIBHEIF_VERSION ${TMP}) + endif () + diff --git a/media-libs/openimageio/openimageio-2.5.13.1.ebuild b/media-libs/openimageio/openimageio-2.5.13.1.ebuild new file mode 100644 index ..bd837866d719 --- /dev/null +++ b/media-libs/openimageio/openimageio-2.5.13.1.ebuild @@ -0,0 +1,303 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +TEST_OIIO_IMAGE_COMMIT="7d821f02c848022b2ee703d6bee48ca2acbfae70" +TEST_OEXR_IMAGE_COMMIT="df16e765fee28a947244657cae3251959ae63c00" +inherit cmake flag-o-matic python-single-r1 virtualx + +DESCRIPTION