* [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
@ 2022-02-12 3:55 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-02-12 3:55 UTC (permalink / raw
To: gentoo-commits
commit: 42905a79164d67fea0dcc8f5138a78b8553d5996
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 02:01:26 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 03:55:31 2022 +0000
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 <sam <AT> 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 000000000000..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 <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.11.0-r1.ebuild b/media-libs/openimageio/openimageio-2.3.11.0-r1.ebuild
new file mode 100644
index 000000000000..445eb5f23ac9
--- /dev/null
+++ b/media-libs/openimageio/openimageio-2.3.11.0-r1.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+FONT_PN=OpenImageIO
+PYTHON_COMPAT=( python3_{8..10} )
+
+TEST_OIIO_IMAGE_COMMIT="b85d7a3a10a3256b50325ad310c33e7f7cf2c6cb"
+TEST_OEXR_IMAGE_COMMIT="f17e353fbfcde3406fe02675f4d92aeae422a560"
+inherit cmake font python-single-r1 flag-o-matic
+
+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/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" test? (
+ https://github.com/OpenImageIO/oiio-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+ https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+ )"
+S="${WORKDIR}/oiio-${PV}"
+
+LICENSE="BSD"
+# TODO: drop .1 on next SONAME change (2.3 -> 2.4?) as we needed to nudge it
+# for changing to openexr 3 which broke ABI.
+SLOT="0/$(ver_cut 1-2).1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+X86_CPU_FEATURES=(
+ aes:aes 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="dicom doc ffmpeg gif jpeg2k opencv opengl openvdb ptex python qt5 raw test +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Not quite working yet
+RESTRICT="!test? ( test ) test"
+
+BDEPEND="
+ doc? (
+ app-doc/doxygen
+ dev-texlive/texlive-bibtexextra
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ )
+"
+RDEPEND="
+ >=dev-libs/boost-1.62:=
+ dev-cpp/robin-map
+ dev-libs/libfmt:=
+ dev-libs/pugixml:=
+ >=media-libs/libheif-1.7.0:=
+ media-libs/libpng:0=
+ >=media-libs/libwebp-0.2.1:=
+ media-libs/imath:=
+ media-libs/opencolorio:=
+ media-libs/openexr:3=
+ media-libs/tiff:0=
+ sys-libs/zlib:=
+ virtual/jpeg:0
+ dicom? ( sci-libs/dcmtk )
+ ffmpeg? ( media-video/ffmpeg:= )
+ gif? ( media-libs/giflib:0= )
+ jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+ opencv? ( media-libs/opencv:= )
+ opengl? (
+ media-libs/glew:=
+ virtual/glu
+ virtual/opengl
+ )
+ openvdb? (
+ dev-cpp/tbb:=
+ media-gfx/openvdb:=
+ )
+ ptex? ( media-libs/ptex:= )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-libs/boost:=[python,${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ ')
+ )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ opengl? ( dev-qt/qtopengl:5 )
+ )
+ raw? ( media-libs/libraw:= )
+ truetype? ( media-libs/freetype:2= )
+"
+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
+
+ if use test ; then
+ mkdir -p "${BUILD_DIR}"/testsuite || die
+ mv "${WORKDIR}"/oiio-images-${TEST_OIIO_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/oiio-images || die
+ mv "${WORKDIR}"/openexr-images-${TEST_OEXR_IMAGE_COMMIT} "${BUILD_DIR}"/testsuite/openexr-images || die
+ fi
+}
+
+src_configure() {
+ # Build with SIMD support
+ local cpufeature
+ local mysimd=()
+ for cpufeature in "${CPU_FEATURES[@]}"; do
+ use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+ done
+
+ # 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)
+ -DOIIO_BUILD_TESTS=$(usex test)
+ -DINSTALL_FONTS=OFF
+ -DBUILD_DOCS=$(usex doc)
+ -DINSTALL_DOCS=$(usex doc)
+ -DSTOP_ON_WARNING=OFF
+ -DUSE_CCACHE=OFF
+ -DUSE_DCMTK=$(usex dicom)
+ -DUSE_EXTERNAL_PUGIXML=ON
+ -DUSE_JPEGTURBO=ON
+ -DUSE_NUKE=OFF # not in Gentoo
+ -DUSE_FFMPEG=$(usex ffmpeg)
+ -DUSE_GIF=$(usex gif)
+ -DUSE_OPENJPEG=$(usex jpeg2k)
+ -DUSE_OPENCV=$(usex opencv)
+ -DUSE_OPENGL=$(usex opengl)
+ -DUSE_OPENVDB=$(usex openvdb)
+ -DUSE_PTEX=$(usex ptex)
+ -DUSE_PYTHON=$(usex python)
+ -DUSE_QT=$(usex qt5)
+ -DUSE_LIBRAW=$(usex raw)
+ -DUSE_FREETYPE=$(usex truetype)
+ -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
+ )
+ if use python; then
+ mycmakeargs+=(
+ -DPYTHON_VERSION=${EPYTHON#python}
+ -DPYTHON_SITE_DIR=$(python_get_sitedir)
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+ # can't use font_src_install
+ # it does directory hierarchy recreation
+ FONT_S=(
+ "${S}/src/fonts/Droid_Sans"
+ "${S}/src/fonts/Droid_Sans_Mono"
+ "${S}/src/fonts/Droid_Serif"
+ )
+ insinto ${FONTDIR}
+ for dir in "${FONT_S[@]}"; do
+ doins "${dir}"/*.ttf
+ done
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
@ 2024-08-03 7:49 Andrew Ammerlaan
0 siblings, 0 replies; 11+ messages in thread
From: Andrew Ammerlaan @ 2024-08-03 7:49 UTC (permalink / raw
To: gentoo-commits
commit: 922111577300d9190370618c83baa2fa9766d878
Author: Huang Rui <vowstar <AT> gmail <DOT> com>
AuthorDate: Mon Jul 22 09:49:22 2024 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Aug 3 07:39:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92211157
media-libs/openimageio: add 2.5.13.1
Signed-off-by: Huang Rui <vowstar <AT> gmail.com>
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> 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 000000000000..6ffcdc3def3a
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-2.5.12.0-heif-find-fix.patch
@@ -0,0 +1,19 @@
+From: Huang Rui <vowstar@gmail.com>
+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.000000000 +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 000000000000..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="A library for reading and writing images"
+HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
+SRC_URI="
+ https://github.com/AcademySoftwareFoundation/OpenImageIO/archive/v${PV}.tar.gz -> ${P}.tar.gz
+ test? (
+ https://github.com/AcademySoftwareFoundation/OpenImageIO-images/archive/${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+ -> ${PN}-oiio-test-image-${TEST_OIIO_IMAGE_COMMIT}.tar.gz
+ https://github.com/AcademySoftwareFoundation/openexr-images/archive/${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+ -> ${PN}-oexr-test-image-${TEST_OEXR_IMAGE_COMMIT}.tar.gz
+ jpeg2k? ( https://www.itu.int/wftp3/Public/t/testsignal/SpeImage/T803/v2002_11/J2KP4files.zip )
+
+ fits? (
+ https://www.cv.nrao.edu/fits/data/tests/ftt4b/file001.fits
+ https://www.cv.nrao.edu/fits/data/tests/ftt4b/file002.fits
+ https://www.cv.nrao.edu/fits/data/tests/ftt4b/file003.fits
+ https://www.cv.nrao.edu/fits/data/tests/ftt4b/file009.fits
+ https://www.cv.nrao.edu/fits/data/tests/ftt4b/file012.fits
+ https://www.cv.nrao.edu/fits/data/tests/pg93/tst0001.fits
+ https://www.cv.nrao.edu/fits/data/tests/pg93/tst0003.fits
+ https://www.cv.nrao.edu/fits/data/tests/pg93/tst0005.fits
+ https://www.cv.nrao.edu/fits/data/tests/pg93/tst0006.fits
+ https://www.cv.nrao.edu/fits/data/tests/pg93/tst0007.fits
+ https://www.cv.nrao.edu/fits/data/tests/pg93/tst0008.fits
+ https://www.cv.nrao.edu/fits/data/tests/pg93/tst0013.fits
+ )
+ )
+"
+S="${WORKDIR}/OpenImageIO-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv"
+
+X86_CPU_FEATURES=(
+ aes:aes 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="dicom doc ffmpeg fits gif gui jpeg2k opencv openvdb ptex python qt6 raw test +tools +truetype ${CPU_FEATURES[*]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} ) gui? ( tools ) test? ( tools truetype )"
+
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+ jpeg2k? ( app-arch/unzip )
+ doc? (
+ app-text/doxygen
+ dev-texlive/texlive-bibtexextra
+ dev-texlive/texlive-fontsextra
+ dev-texlive/texlive-fontutils
+ dev-texlive/texlive-latex
+ dev-texlive/texlive-latexextra
+ )
+"
+RDEPEND="
+ dev-libs/boost:=
+ dev-cpp/robin-map
+ dev-libs/libfmt:=
+ dev-libs/pugixml:=
+ >=media-libs/libheif-1.13.0:=
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:0=
+ >=media-libs/libwebp-0.2.1:=
+ >=dev-libs/imath-3.1.2-r4:=
+ >=media-libs/opencolorio-2.1.1-r4:=
+ >=media-libs/openexr-3:0=
+ media-libs/tiff:=
+ sys-libs/zlib:=
+ dicom? ( sci-libs/dcmtk )
+ ffmpeg? ( media-video/ffmpeg:= )
+ fits? ( sci-libs/cfitsio:= )
+ gif? ( media-libs/giflib:0= )
+ jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
+ opencv? ( media-libs/opencv:= )
+ openvdb? (
+ dev-cpp/tbb:=
+ media-gfx/openvdb:=
+ )
+ ptex? ( media-libs/ptex:= )
+ python? (
+ ${PYTHON_DEPS}
+ $(python_gen_cond_dep '
+ dev-libs/boost:=[python,${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/pybind11[${PYTHON_USEDEP}]
+ ')
+ )
+ gui? (
+ media-libs/libglvnd
+ !qt6? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ )
+ qt6? (
+ dev-qt/qtbase:6[gui,widgets,opengl]
+ )
+ )
+ raw? ( media-libs/libraw:= )
+ truetype? ( media-libs/freetype:2= )
+"
+DEPEND="
+ ${RDEPEND}
+"
+
+DOCS=(
+ CHANGES.md
+ CREDITS.md
+ README.md
+)
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.5.8.0-fix-unit_simd.patch"
+ "${FILESDIR}/${PN}-2.5.8.0-fix-tests.patch"
+ "${FILESDIR}/${PN}-2.5.12.0-tests-optional.patch"
+ "${FILESDIR}/${PN}-2.5.12.0-heif-find-fix.patch"
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ if ! use dicom; then
+ rm "src/dicom.imageio" -r || die
+ fi
+
+ if ! use gif; then
+ rm src/gif.imageio -r || die
+ fi
+
+ if ! use jpeg2k; then
+ rm src/jpeg2000.imageio -r || die
+ fi
+
+ if ! use raw; then
+ rm src/raw.imageio -r || die
+ fi
+
+ cmake_src_prepare
+ cmake_comment_add_subdirectory src/fonts
+
+ if use test ; then
+ mv -v "${WORKDIR}/OpenImageIO-images-${TEST_OIIO_IMAGE_COMMIT}" "${WORKDIR}/oiio-images" || die
+ mv -v "${WORKDIR}/openexr-images-${TEST_OEXR_IMAGE_COMMIT}" "${WORKDIR}/openexr-images" || die
+
+ if use fits; then
+ mkdir -p "${WORKDIR}/fits-images/"{ftt4b,pg93} || die
+ for a in ${A}; do
+ if [[ "${a}" == file*.fits ]]; then
+ cp "${DISTDIR}/${a}" "${WORKDIR}/fits-images/ftt4b/" || die
+ fi
+ if [[ "${a}" == tst*.fits ]]; then
+ cp "${DISTDIR}/${a}" "${WORKDIR}/fits-images/pg93/" || die
+ fi
+ done
+ fi
+
+ if use jpeg2k; then
+ mv -v "${WORKDIR}/J2KP4files" "${WORKDIR}/j2kp4files_v1_5" || die
+ fi
+
+ cp testsuite/heif/ref/out-libheif1.1{2,5}-orient.txt || die
+ eapply "${FILESDIR}/${PN}-2.5.12.0_heif_test.patch"
+ fi
+}
+
+src_configure() {
+ # Build with SIMD support
+ local cpufeature
+ local mysimd=()
+ for cpufeature in "${CPU_FEATURES[@]}"; do
+ use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+ done
+
+ # If no CPU SIMDs were used, completely disable them
+ [[ -z ${mysimd[*]} ]] && mysimd=("0")
+
+ # This is currently needed on arm64 to get the NEON SIMD wrapper to compile the code successfully
+ # Even if there are no SIMD features selected, it seems like the code will turn on NEON support if it is available.
+ use arm64 && append-flags -flax-vector-conversions
+
+ local mycmakeargs=(
+ -DVERBOSE="yes"
+ -DINTERNALIZE_FMT="no"
+ # -DALWAYS_PREFER_CONFIG="yes"
+ # -DGLIBCXX_USE_CXX11_ABI="yes"
+ # -DTEX_BATCH_SIZE="8" # TODO AVX512 -> 16
+ -DSTOP_ON_WARNING="OFF"
+
+ -DCMAKE_CXX_STANDARD="17"
+ -DDOWNSTREAM_CXX_STANDARD="17"
+
+ -DCMAKE_UNITY_BUILD_MODE="BATCH"
+ -DUNITY_SMALL_BATCH_SIZE="$(nproc)"
+
+ -DBUILD_DOCS="$(usex doc)"
+ # -DBUILD_OIIOUTIL_ONLY="no"
+ -DBUILD_TESTING="$(usex test)"
+
+ -DINSTALL_FONTS="OFF"
+ -DINSTALL_DOCS="$(usex doc)"
+
+ -DENABLE_DCMTK="$(usex dicom)"
+ -DENABLE_FFmpeg="$(usex ffmpeg)"
+ -DENABLE_FITS="$(usex fits)"
+ -DENABLE_FREETYPE="$(usex truetype)"
+ -DENABLE_GIF="$(usex gif)"
+ -DENABLE_LibRaw="$(usex raw)"
+ -DENABLE_Nuke="no" # not in Gentoo
+ -DENABLE_OpenCV="$(usex opencv)"
+ -DENABLE_OpenJPEG="$(usex jpeg2k)"
+ -DENABLE_OpenVDB="$(usex openvdb)"
+ -DENABLE_TBB="$(usex openvdb)"
+ -DENABLE_Ptex="$(usex ptex)"
+
+ -DENABLE_GIF="$(usex gif)"
+ -DENABLE_LIBRAW="$(usex raw)"
+ -DENABLE_PTEX="$(usex ptex)"
+ -DENABLE_OPENJPEG="$(usex jpeg2k)"
+
+ -DOIIO_BUILD_TOOLS="$(usex tools)"
+ -DOIIO_BUILD_TESTS="$(usex test)"
+ -DOIIO_DOWNLOAD_MISSING_TESTDATA="no"
+
+ -DUSE_CCACHE="no"
+ -DUSE_EXTERNAL_PUGIXML="yes"
+ # -DUSE_LIBCPLUSPLUS="yes"
+ -DUSE_R3DSDK="no" # not in Gentoo
+ -DUSE_PYTHON="$(usex python)"
+ -DUSE_SIMD="$(local IFS=','; echo "${mysimd[*]}")"
+)
+
+ if use gui; then
+ mycmakeargs+=( -DUSE_IV="yes" -DUSE_OPENGL="yes" -DUSE_QT="yes" )
+ if ! use qt6; then
+ mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_Qt6="yes" )
+ fi
+ else
+ mycmakeargs+=(
+ -DUSE_QT="no"
+ )
+ fi
+
+ if use python; then
+ mycmakeargs+=(
+ "-DPYTHON_VERSION=${EPYTHON#python}"
+ "-DPYTHON_SITE_DIR=$(python_get_sitedir)"
+ )
+ fi
+
+ cmake_src_configure
+}
+
+src_test() {
+ # A lot of tests needs to have access to the installed data files.
+ # So install them into the image directory now.
+ DESTDIR="${T}" cmake_build install
+
+ CMAKE_SKIP_TESTS=(
+ "-broken$"
+ )
+
+ sed -e "s#../../../testsuite#../../../OpenImageIO-${PV}/testsuite#g" \
+ -i "${CMAKE_USE_DIR}/testsuite/python-imagebufalgo/ref/out.txt" || die
+
+ local -x CI CMAKE_PREFIX_PATH LD_LIBRARY_PATH OPENIMAGEIO_FONTS PYTHONPATH
+ CI=true
+ CMAKE_PREFIX_PATH="${T}/usr"
+ LD_LIBRARY_PATH="${T}/usr/$(get_libdir)"
+ OPENIMAGEIO_FONTS="${CMAKE_USE_DIR}/src/fonts"
+
+ if use python; then
+ PYTHONPATH="${T}$(python_get_sitedir)"
+ fi
+
+ virtx cmake_src_test
+
+ # Clean up the image directory for src_install
+ rm -fr "${T:?}"/usr || die
+}
+
+src_install() {
+ cmake_src_install
+
+ # remove Windows loader file
+ if use python; then
+ rm "${D}$(python_get_sitedir)/__init__.py" || die
+ fi
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
@ 2022-02-12 16:43 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-02-12 16:43 UTC (permalink / raw
To: gentoo-commits
commit: b42a99ee007f0b2ae28d8d9b7da23f66a2888b80
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 16:42:40 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 16:42:40 2022 +0000
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 <sam <AT> 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 <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.11.0-r3.ebuild b/media-libs/openimageio/openimageio-2.3.11.0-r2.ebuild
similarity index 100%
rename from media-libs/openimageio/openimageio-2.3.11.0-r3.ebuild
rename to media-libs/openimageio/openimageio-2.3.11.0-r2.ebuild
diff --git a/media-libs/openimageio/openimageio-2.3.12.0-r2.ebuild b/media-libs/openimageio/openimageio-2.3.12.0-r1.ebuild
similarity index 100%
rename from media-libs/openimageio/openimageio-2.3.12.0-r2.ebuild
rename to media-libs/openimageio/openimageio-2.3.12.0-r1.ebuild
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
@ 2022-02-12 16:25 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-02-12 16:25 UTC (permalink / raw
To: gentoo-commits
commit: 666a5bcdd83606553c0f35894fdbb90fd0653137
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 16:24:50 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 16:25:03 2022 +0000
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 <sam <AT> 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 <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/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/media-libs/openimageio/openimageio-2.3.11.0-r2.ebuild b/media-libs/openimageio/openimageio-2.3.11.0-r3.ebuild
similarity index 100%
rename from media-libs/openimageio/openimageio-2.3.11.0-r2.ebuild
rename to media-libs/openimageio/openimageio-2.3.11.0-r3.ebuild
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 100%
rename from media-libs/openimageio/openimageio-2.3.12.0-r1.ebuild
rename to media-libs/openimageio/openimageio-2.3.12.0-r2.ebuild
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
@ 2019-06-10 19:51 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2019-06-10 19:51 UTC (permalink / raw
To: gentoo-commits
commit: 6d4e4cb67556e26e103c9c4afa34f000a0fb12c9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 10 18:02:23 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 10 19:50:52 2019 +0000
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 <asturm <AT> 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 a72b7756257d4ffd1567efd73c24bf65fc2bffff82c96c18a77211e918323e65e1c99076e272b3b77115ca30910ea4cfced222892b062e339d8e4e85bd2221f7 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..00000000000
--- 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 <j.scruggs@gmail.com>
-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 override them as desired:
--set (PYLIB_INSTALL_DIR ${DEFAULT_PYLIB_INSTALL_DIR} CACHE STRING
-- "Install location for python libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (PYLIB3_INSTALL_DIR ${DEFAULT_PYLIB3_INSTALL_DIR} CACHE STRING
-- "Install location for python3 libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--
-+# Set default install options
- set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
-
- set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
-@@ -442,14 +415,9 @@ if (NOT EMBEDPLUGINS)
- add_subdirectory (src/zfile.imageio)
- endif ()
-
--if (USE_PYTHON AND oiio_boost_PYTHON_FOUND AND NOT BUILD_OIIOUTIL_ONLY)
-+if (USE_PYTHON AND NOT BUILD_OIIOUTIL_ONLY)
- add_subdirectory (src/python)
- endif ()
--if (USE_PYTHON3 AND NOT BUILD_OIIOUTIL_ONLY)
-- #build the python3 module in a different binary directory since it will
-- #have the same name as the python2 module (e.g. OpenImageIO.so)
-- add_subdirectory (src/python src/python3)
--endif ()
-
- add_subdirectory (src/include)
- add_subdirectory (src/doc)
-diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
-index 4799df22..2576dee5 100644
---- a/src/cmake/externalpackages.cmake
-+++ b/src/cmake/externalpackages.cmake
-@@ -102,10 +102,7 @@ if (NOT Boost_FIND_QUIETLY)
- endif ()
-
- if (NOT DEFINED Boost_ADDITIONAL_VERSIONS)
-- set (Boost_ADDITIONAL_VERSIONS "1.60" "1.59" "1.58" "1.57" "1.56"
-- "1.55" "1.54" "1.53" "1.52" "1.51" "1.50"
-- "1.49" "1.48" "1.47" "1.46" "1.45" "1.44"
-- "1.43" "1.43.0" "1.42" "1.42.0")
-+ set (Boost_ADDITIONAL_VERSIONS "1.65.1" "1.65" "1.63" "1.62")
- endif ()
- if (LINKSTATIC)
- set (Boost_USE_STATIC_LIBS ON)
-@@ -117,51 +114,7 @@ if (BOOST_CUSTOM)
- # Boost_VERSION, Boost_INCLUDE_DIRS, Boost_LIBRARY_DIRS, Boost_LIBRARIES.
- else ()
- set (Boost_COMPONENTS filesystem regex system thread)
-- find_package (Boost 1.42 REQUIRED
-- COMPONENTS ${Boost_COMPONENTS}
-- )
--
-- # Try to figure out if this boost distro has Boost::python. If we
-- # include python in the component list above, cmake will abort if
-- # it's not found. So we resort to checking for the boost_python
-- # library's existance to get a soft failure.
-- find_library (oiio_boost_python_lib boost_python
-- PATHS ${Boost_LIBRARY_DIRS} NO_DEFAULT_PATH)
-- mark_as_advanced (oiio_boost_python_lib)
-- if (NOT oiio_boost_python_lib AND Boost_SYSTEM_LIBRARY_RELEASE)
-- get_filename_component (oiio_boost_PYTHON_rel
-- ${Boost_SYSTEM_LIBRARY_RELEASE} NAME
-- )
-- string (REGEX REPLACE "^(lib)?(.+)_system(.+)$" "\\2_python\\3"
-- oiio_boost_PYTHON_rel ${oiio_boost_PYTHON_rel}
-- )
-- find_library (oiio_boost_PYTHON_LIBRARY_RELEASE
-- NAMES ${oiio_boost_PYTHON_rel} lib${oiio_boost_PYTHON_rel}
-- HINTS ${Boost_LIBRARY_DIRS}
-- NO_DEFAULT_PATH
-- )
-- mark_as_advanced (oiio_boost_PYTHON_LIBRARY_RELEASE)
-- endif ()
-- if (NOT oiio_boost_python_lib AND Boost_SYSTEM_LIBRARY_DEBUG)
-- get_filename_component (oiio_boost_PYTHON_dbg
-- ${Boost_SYSTEM_LIBRARY_DEBUG} NAME
-- )
-- string (REGEX REPLACE "^(lib)?(.+)_system(.+)$" "\\2_python\\3"
-- oiio_boost_PYTHON_dbg ${oiio_boost_PYTHON_dbg}
-- )
-- find_library (oiio_boost_PYTHON_LIBRARY_DEBUG
-- NAMES ${oiio_boost_PYTHON_dbg} lib${oiio_boost_PYTHON_dbg}
-- HINTS ${Boost_LIBRARY_DIRS}
-- NO_DEFAULT_PATH
-- )
-- mark_as_advanced (oiio_boost_PYTHON_LIBRARY_DEBUG)
-- endif ()
-- if (oiio_boost_python_lib OR
-- oiio_boost_PYTHON_LIBRARY_RELEASE OR oiio_boost_PYTHON_LIBRARY_DEBUG)
-- set (oiio_boost_PYTHON_FOUND ON)
-- else ()
-- set (oiio_boost_PYTHON_FOUND OFF)
-- endif ()
-+ find_package (Boost 1.62 REQUIRED COMPONENTS ${Boost_COMPONENTS})
- endif ()
-
- # On Linux, Boost 1.55 and higher seems to need to link against -lrt
-@@ -176,16 +129,6 @@ if (NOT Boost_FIND_QUIETLY)
- message (STATUS "Boost include dirs ${Boost_INCLUDE_DIRS}")
- message (STATUS "Boost library dirs ${Boost_LIBRARY_DIRS}")
- message (STATUS "Boost libraries ${Boost_LIBRARIES}")
-- message (STATUS "Boost python found ${oiio_boost_PYTHON_FOUND}")
--endif ()
--if (NOT oiio_boost_PYTHON_FOUND)
-- # If Boost python components were not found, turn off all python support.
-- message (STATUS "Boost python support not found -- will not build python components!")
-- if (APPLE AND USE_PYTHON)
-- message (STATUS " If your Boost is from Macports, you need the +python26 variant to get Python support.")
-- endif ()
-- set (USE_PYTHON OFF)
-- set (PYTHONLIBS_FOUND OFF)
- endif ()
-
- include_directories (SYSTEM "${Boost_INCLUDE_DIRS}")
-diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
-index 81a4a890..e58d372d 100644
---- a/src/python/CMakeLists.txt
-+++ b/src/python/CMakeLists.txt
-@@ -1,54 +1,30 @@
--#if the CMAKE_CURRENT_BINARY_DIR is python3, then build the python3 module,
--#otherwise the python2 module
--string (REGEX MATCH "python3\$" _py3_subdir ${CMAKE_CURRENT_BINARY_DIR})
-+# Attempt to find the desired version, but fall back to other
-+# additional versions.
-+find_package (PythonInterp ${PYTHON_VERSION} REQUIRED)
-
--if (_py3_subdir)
-- set (BUILD_PY3 ON)
--else ()
-- set (BUILD_PY3 OFF)
--endif ()
--
--if (NOT BOOST_CUSTOM AND NOT BUILD_PY3)
-- #Unset those, otherwise find_package(PythonLibs) will pick up old stuff
-- #if it has been run before
-- unset(Python_ADDITIONAL_VERSIONS)
-- unset(PYTHON_LIBRARY)
-- unset(PYTHON_LIBRARY CACHE)
-- unset(PYTHON_INCLUDE_DIR)
-- unset(PYTHON_INCLUDE_DIR CACHE)
-- unset(PYTHON_INCLUDE_PATH)
-- unset(PYTHON_INCLUDE_PATH CACHE)
-- find_package (PythonLibs ${PYTHON_VERSION} REQUIRED)
-- find_package (Boost 1.42 REQUIRED COMPONENTS python)
--elseif (BOOST_CUSTOM AND NOT BUILD_PY3)
-- find_package (PythonLibs ${PYTHON_VERSION} REQUIRED)
--else ()
-- #BOOST_CUSTOM is ignored for python3
-+# The version that was found may not be the default or user
-+# defined one.
-+set (PYTHON_VERSION_FOUND ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
-
-- #Unset those, otherwise find_package(PythonLibs) will pick up old stuff
-- #if it has been run before
-- unset(PYTHON_LIBRARY)
-- unset(PYTHON_LIBRARY CACHE)
-- unset(PYTHON_INCLUDE_DIR)
-- unset(PYTHON_INCLUDE_DIR CACHE)
-- unset(PYTHON_INCLUDE_PATH)
-- unset(PYTHON_INCLUDE_PATH CACHE)
-+if (NOT ${PYTHON_VERSION} EQUAL ${PYTHON_VERSION_FOUND} )
-+ message (WARNING "The requested version ${PYTHON_VERSION} was not found.")
-+ message (WARNING "Using ${PYTHON_VERSION_FOUND} instead.")
-+endif ()
-
-- #cmake 2.8 does not look for python 3.4
-- set(Python_ADDITIONAL_VERSIONS 3.4)
-- find_package (PythonInterp ${PYTHON3_VERSION} REQUIRED)
-- find_package (PythonLibs ${PYTHON3_VERSION} REQUIRED)
-+find_package (PythonLibs ${PYTHON_VERSION_FOUND} REQUIRED)
-
-- #Finding the python3 component for boost is a little tricky, since it has
-- #different names on different systems. Try the most common ones
-- #(boost_python3, boost_python-py34, …).
-- foreach (_boost_py3_lib python3 python-py34 python-py33 python-py32)
-- find_package (Boost 1.42 QUIET COMPONENTS ${_boost_py3_lib})
-- string (TOUPPER ${_boost_py3_lib} boost_py3_lib_name)
-- if (Boost_${boost_py3_lib_name}_FOUND)
-- #Not the most beautiful thing to do, but that gets them included in
-- #the target_link_libraries(…) call farther down
-- set (Boost_PYTHON_LIBRARIES ${Boost_${boost_py3_lib_name}_LIBRARIES})
-+if (NOT BOOST_CUSTOM)
-+ # Finding the python component for boost is a little tricky, since it has
-+ # different names on different systems. Try the most common ones.
-+ foreach (_py_lib python-${PYTHON_VERSION_FOUND} python
-+ python${PYTHON_VERSION_MAJOR}
-+ python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
-+ find_package (Boost QUIET COMPONENTS ${_py_lib})
-+ string (TOUPPER ${_py_lib} _py_lib_name)
-+ if (Boost_${_py_lib_name}_FOUND)
-+ # Not the most beautiful thing to do, but that gets them included in
-+ # the target_link_libraries(…) call farther down
-+ set (Boost_PYTHON_LIBRARIES ${Boost_${_py_lib_name}_LIBRARIES})
- break ()
- endif ()
- endforeach ()
-@@ -58,18 +34,19 @@ if (APPLE)
- # set (PYTHON_LIBRARIES /opt/local/lib)
- endif ()
-
-+if (NOT DEFINED PYTHON_SITE_DIR)
-+ set (PYTHON_SITE_DIR "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_FOUND}/site-packages")
-+endif ()
-+
- # Disable some warnings for Clang, it's a little too picky with boost
- if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- add_definitions ("-Wno-array-bounds")
- endif ()
-
--if (BUILD_PY3)
-- set (target_name Py3OpenImageIO)
--else ()
-- set (target_name PyOpenImageIO)
--endif ()
-+set (target_name PyOpenImageIO)
-
--if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
-+# Test if automatically found or manually set with BOOST_CUSTOM
-+if (DEFINED Boost_PYTHON_LIBRARIES)
-
- set (python_srcs py_imageinput.cpp py_imageoutput.cpp
- py_imagecache.cpp py_imagespec.cpp py_roi.cpp
-@@ -81,8 +58,12 @@ if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
- message (STATUS "Python found ${PYTHONLIBS_FOUND} ")
- message (STATUS "Python include dirs ${PYTHON_INCLUDE_PATH}")
- message (STATUS "Python libraries ${PYTHON_LIBRARIES}")
-+ message (STATUS "Python site packages dir ${PYTHON_SITE_DIR}")
- message (STATUS "Python to include 'lib' prefix: ${PYLIB_LIB_PREFIX}")
- message (STATUS "Python to include SO version: ${PYLIB_INCLUDE_SONAME}")
-+ message (STATUS "Python version ${PYTHON_VERSION_STRING}")
-+ message (STATUS "Python version major: ${PYTHON_VERSION_MAJOR} minor: ${PYTHON_VERSION_MINOR}")
-+ message (STATUS "Boost python libraries ${Boost_PYTHON_LIBRARIES}")
- endif ()
-
- include_directories (${PYTHON_INCLUDE_PATH} ${Boost_INCLUDE_DIRS})
-@@ -91,7 +72,7 @@ if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
- target_link_libraries (${target_name} OpenImageIO ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
- set_target_properties (${target_name} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
- else ()
-- target_link_libraries (${target_name} OpenImageIO ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
-+ target_link_libraries (${target_name} OpenImageIO ${SANITIZE_LIBRARIES} ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
- endif ()
-
- # Exclude the 'lib' prefix from the name
-@@ -123,21 +104,17 @@ if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
- SUFFIX ".pyd")
- endif()
-
-- if (BUILD_PY3)
-- install (TARGETS ${target_name}
-- RUNTIME DESTINATION ${PYLIB3_INSTALL_DIR} COMPONENT user
-- LIBRARY DESTINATION ${PYLIB3_INSTALL_DIR} COMPONENT user)
-- else ()
-- install (TARGETS ${target_name}
-- RUNTIME DESTINATION ${PYLIB_INSTALL_DIR} COMPONENT user
-- LIBRARY DESTINATION ${PYLIB_INSTALL_DIR} COMPONENT user)
-- endif ()
--elseif (BUILD_PY3)
-- if (NOT PYTHONLIBS_FOUND)
-- message (STATUS "Python3 libraries not found")
-- endif ()
-- if (NOT Boost_FOUND)
-- message (STATUS "Boost python3 component not found")
-- endif ()
-- set(USE_PYTHON3 OFF)
-+ install (TARGETS ${target_name}
-+ RUNTIME DESTINATION ${PYTHON_SITE_DIR} COMPONENT user
-+ LIBRARY DESTINATION ${PYTHON_SITE_DIR} COMPONENT user)
-+else ()
-+ # If Boost python components were not found, turn off all python support.
-+ message (STATUS "Boost python support not found!")
-+ if (APPLE AND USE_PYTHON)
-+ message (STATUS " If your Boost is from Macports, you need the +python26 variant to get Python support.")
-+ endif ()
-+ if (BOOST_CUSTOM)
-+ message (STATUS " Please set the variable Boost_PYTHON_LIBRARIES to the location of the boost python libraries.")
-+ endif ()
-+ message (FATAL_ERROR "Python module cannot be built. Either disable python support or check your boost installation.")
- endif ()
---
-2.14.2
-
diff --git a/media-libs/openimageio/files/openimageio-1.6.18-repair-breaks-after-boost-python-1.65-changes.patch b/media-libs/openimageio/files/openimageio-1.6.18-repair-breaks-after-boost-python-1.65-changes.patch
deleted file mode 100644
index 622890e981e..00000000000
--- a/media-libs/openimageio/files/openimageio-1.6.18-repair-breaks-after-boost-python-1.65-changes.patch
+++ /dev/null
@@ -1,251 +0,0 @@
-From 03eca9df5082e97f3b157ce7d1d86ef76016e52b Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Thu, 28 Sep 2017 16:00:16 +0100
-Subject: [PATCH 3/3] oiio/RB-1.6: Repair breaks after boost python 1.65
- changes (#1753)
-
-Alas, the new Boost 1.65 moves some boost python material from one
-namespace to another in a way that breaks compatibility related to
-support for numpy arrays. This breaks the build, including all of
-our MacOS-based TravisCI tests, which of course pick up the latest
-Boost via Homebrew.
-
-Backported from:
-https://github.com/OpenImageIO/oiio/commit/57f294df7430a860c60612c28235730fd429ea0d
----
- src/python/py_imagebuf.cpp | 22 +++++++++++++++-------
- src/python/py_imageoutput.cpp | 10 +++++-----
- src/python/py_oiio.cpp | 22 +++++++++++++++++++---
- src/python/py_oiio.h | 23 +++++++----------------
- 4 files changed, 46 insertions(+), 31 deletions(-)
-
-diff --git a/src/python/py_imagebuf.cpp b/src/python/py_imagebuf.cpp
-index 28a8c537..fa271fe2 100644
---- a/src/python/py_imagebuf.cpp
-+++ b/src/python/py_imagebuf.cpp
-@@ -329,7 +329,7 @@ BOOST_PYTHON_FUNCTION_OVERLOADS(ImageBuf_get_pixels_bt_overloads,
-
-
- bool
--ImageBuf_set_pixels_tuple (ImageBuf &buf, ROI roi, tuple data)
-+ImageBuf_set_pixels_tuple (ImageBuf &buf, ROI roi, const tuple& data)
- {
- if (! roi.defined())
- roi = buf.roi();
-@@ -347,8 +347,13 @@ ImageBuf_set_pixels_tuple (ImageBuf &buf, ROI roi, tuple data)
-
-
- bool
--ImageBuf_set_pixels_array (ImageBuf &buf, ROI roi, numeric::array data)
-+ImageBuf_set_pixels_array (ImageBuf &buf, ROI roi, const object& data)
- {
-+ // If it's a tuple, we handle that with the other function
-+ extract<tuple> tup (data);
-+ if (tup.check())
-+ return ImageBuf_set_pixels_tuple (buf, roi, tup());
-+
- if (! roi.defined())
- roi = buf.roi();
- roi.chend = std::min (roi.chend, buf.nchannels()+1);
-@@ -356,13 +361,16 @@ ImageBuf_set_pixels_array (ImageBuf &buf, ROI roi, numeric::array data)
- if (size == 0)
- return true; // done
-
-- TypeDesc type;
-- size_t pylen = 0;
-- const void *addr = python_array_address (data, type, pylen);
-- if (!addr || size > pylen)
-+ TypeDesc elementtype;
-+ size_t numelements;
-+ const void* addr = python_array_address (data, elementtype, numelements);
-+ if (!addr || size > numelements)
- return false; // Not enough data to fill our ROI
-
-- buf.set_pixels (roi, type, addr);
-+ std::vector<float> vals (numelements);
-+ convert_types (elementtype, addr, TypeDesc::TypeFloat, vals.data(),
-+ int(numelements));
-+ buf.set_pixels (roi, TypeDesc::TypeFloat, &vals[0]);
- return true;
- }
-
-diff --git a/src/python/py_imageoutput.cpp b/src/python/py_imageoutput.cpp
-index 1c2e5f3c..2203aac4 100644
---- a/src/python/py_imageoutput.cpp
-+++ b/src/python/py_imageoutput.cpp
-@@ -112,7 +112,7 @@ ImageOutputWrap::make_read_buffer (object &buffer, imagesize_t size)
-
-
- bool
--ImageOutputWrap::write_scanline_array (int y, int z, numeric::array &buffer)
-+ImageOutputWrap::write_scanline_array (int y, int z, object &buffer)
- {
- TypeDesc format;
- size_t numelements = 0;
-@@ -154,7 +154,7 @@ ImageOutputWrap::write_scanline_bt (int y, int z, TypeDesc::BASETYPE format,
-
- bool
- ImageOutputWrap::write_scanlines_array (int ybegin, int yend, int z,
-- numeric::array &buffer)
-+ object &buffer)
- {
- TypeDesc format;
- size_t numelements = 0;
-@@ -199,7 +199,7 @@ ImageOutputWrap::write_scanlines_bt (int ybegin, int yend, int z,
-
- bool
- ImageOutputWrap::write_tile_array (int x, int y, int z,
-- numeric::array &buffer)
-+ object &buffer)
- {
- TypeDesc format;
- size_t numelements = 0;
-@@ -243,7 +243,7 @@ ImageOutputWrap::write_tile_bt (int x, int y, int z, TypeDesc::BASETYPE format,
- bool
- ImageOutputWrap::write_tiles_array (int xbegin, int xend, int ybegin, int yend,
- int zbegin, int zend,
-- numeric::array &buffer)
-+ object &buffer)
- {
- TypeDesc format;
- size_t numelements = 0;
-@@ -290,7 +290,7 @@ ImageOutputWrap::write_tiles_bt (int xbegin, int xend, int ybegin, int yend,
-
-
- bool
--ImageOutputWrap::write_image_array (numeric::array &buffer)
-+ImageOutputWrap::write_image_array (object &buffer)
- {
- TypeDesc format;
- size_t numelements = 0;
-diff --git a/src/python/py_oiio.cpp b/src/python/py_oiio.cpp
-index bc10803c..5e965089 100644
---- a/src/python/py_oiio.cpp
-+++ b/src/python/py_oiio.cpp
-@@ -78,6 +78,13 @@ typedesc_from_python_array_code (char code)
- }
-
-
-+std::string
-+object_classname (const object& obj)
-+{
-+ return extract<std::string>(obj.attr("__class__").attr("__name__"));
-+}
-+
-+
-
- object
- C_array_to_Python_array (const char *data, TypeDesc type, size_t size)
-@@ -313,11 +320,18 @@ oiio_get_string_attribute_d (const char *name, const char *defaultval)
-
-
- const void *
--python_array_address (numeric::array &data, TypeDesc &elementtype,
-+python_array_address (const object &data, TypeDesc &elementtype,
- size_t &numelements)
- {
- // Figure out the type of the array
-- object tcobj = data.attr("typecode");
-+ object tcobj;
-+ try {
-+ tcobj = data.attr("typecode");
-+ } catch(...) {
-+ return NULL;
-+ }
-+ if (! tcobj)
-+ return NULL;
- extract<char> tce (tcobj);
- char typecode = tce.check() ? (char)tce : 0;
- elementtype = typedesc_from_python_array_code (typecode);
-@@ -395,7 +409,9 @@ OIIO_DECLARE_PYMODULE(OIIO_PYMODULE_NAME) {
- scope().attr("VERSION_PATCH") = OIIO_VERSION_PATCH;
- scope().attr("INTRO_STRING") = OIIO_INTRO_STRING;
-
-- boost::python::numeric::array::set_module_and_type("array", "array");
-+ #if BOOST_VERSION < 106500
-+ boost::python::numeric::array::set_module_and_type("array", "array");
-+ #endif
- }
-
- } // namespace PyOpenImageIO
-diff --git a/src/python/py_oiio.h b/src/python/py_oiio.h
-index febe2f9e..9fc04d06 100644
---- a/src/python/py_oiio.h
-+++ b/src/python/py_oiio.h
-@@ -68,12 +68,13 @@ bool PyProgressCallback(void*, float);
- object C_array_to_Python_array (const char *data, TypeDesc type, size_t size);
- const char * python_array_code (TypeDesc format);
- TypeDesc typedesc_from_python_array_code (char code);
-+std::string object_classname (const object& obj);
-
-
- // Given python array 'data', figure out its element type and number of
- // elements, and return the memory address of its contents. Return NULL as
- // the address for an error.
--const void * python_array_address (numeric::array &data, TypeDesc &elementtype,
-+const void * python_array_address (const object &data, TypeDesc &elementtype,
- size_t &numelements);
-
-
-@@ -105,16 +106,6 @@ void py_to_stdvector (std::vector<T> &vals, const tuple &tup)
-
-
-
--// Suck up a tuple of presumed T values into a vector<T>
--template<typename T>
--void py_to_stdvector (std::vector<T> &vals, const numeric::array &arr)
--{
-- for (int i = 0, e = len(arr); i < e; ++i)
-- vals.push_back (extract<T>(arr[i]));
--}
--
--
--
- // Convert an array of T values into either tuple. FUNC is a conversion
- // function such as PyInt_FromLong, PyFloat_FromDouble, or
- // PyString_FromString.
-@@ -312,12 +303,12 @@ public:
- stride_t xstride=AutoStride);
- bool write_scanline_bt (int, int, TypeDesc::BASETYPE,
- boost::python::object&, stride_t xstride=AutoStride);
-- bool write_scanline_array (int, int, numeric::array&);
-+ bool write_scanline_array (int, int, object&);
- bool write_scanlines (int, int, int, TypeDesc, boost::python::object&,
- stride_t xstride=AutoStride);
- bool write_scanlines_bt (int, int, int, TypeDesc::BASETYPE,
- boost::python::object&, stride_t xstride=AutoStride);
-- bool write_scanlines_array (int, int, int, numeric::array&);
-+ bool write_scanlines_array (int, int, int, object&);
- bool write_tile (int, int, int, TypeDesc, boost::python::object&,
- stride_t xstride=AutoStride, stride_t ystride=AutoStride,
- stride_t zstride=AutoStride);
-@@ -325,7 +316,7 @@ public:
- boost::python::object&, stride_t xstride=AutoStride,
- stride_t ystride=AutoStride,
- stride_t zstride=AutoStride);
-- bool write_tile_array (int, int, int, numeric::array&);
-+ bool write_tile_array (int, int, int, object&);
- bool write_tiles (int, int, int, int, int, int,
- TypeDesc, boost::python::object&,
- stride_t xstride=AutoStride, stride_t ystride=AutoStride,
-@@ -335,7 +326,7 @@ public:
- stride_t xstride=AutoStride,
- stride_t ystride=AutoStride,
- stride_t zstride=AutoStride);
-- bool write_tiles_array (int, int, int, int, int, int, numeric::array&);
-+ bool write_tiles_array (int, int, int, int, int, int, object&);
- bool write_image (TypeDesc format, object &buffer,
- stride_t xstride=AutoStride,
- stride_t ystride=AutoStride,
-@@ -344,7 +335,7 @@ public:
- stride_t xstride=AutoStride,
- stride_t ystride=AutoStride,
- stride_t zstride=AutoStride);
-- bool write_image_array (numeric::array &buffer);
-+ bool write_image_array (object &buffer);
- bool write_deep_scanlines (int ybegin, int yend, int z,
- const DeepData &deepdata);
- bool write_deep_tiles (int xbegin, int xend, int ybegin, int yend,
---
-2.14.2
-
diff --git a/media-libs/openimageio/files/openimageio-1.6.18-use-gnuinstalldirs.patch b/media-libs/openimageio/files/openimageio-1.6.18-use-gnuinstalldirs.patch
deleted file mode 100644
index eb6834d6b8f..00000000000
--- a/media-libs/openimageio/files/openimageio-1.6.18-use-gnuinstalldirs.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-From c078d90a6570d3cdf372f33f83057b21e44f40ad Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Thu, 28 Sep 2017 15:08:47 +0100
-Subject: [PATCH 1/2] oiio/RB-1.6: Use GNUInstallDirs for installation paths
- (#1747)
-
-* Change all hard coded paths to GNUInstallDirs varibles.
-* Remove variable setting in install.cmake file since
- GNUInstallDirs does all this for you.
-* Added new search paths for fonts.
-
-Backported from:
-https://github.com/OpenImageIO/oiio/commit/1383ba314ec2522b4f0c7e9037bd546b68bc2d7d
----
- CMakeLists.txt | 51 ++++++++------------------------
- src/cmake/oiio_macros.cmake | 6 ++--
- src/doc/CMakeLists.txt | 4 +--
- src/fonts/CMakeLists.txt | 2 +-
- src/include/CMakeLists.txt | 2 +-
- src/libOpenImageIO/imagebufalgo_draw.cpp | 11 +++++++
- src/nuke/txReader/CMakeLists.txt | 3 +-
- src/nuke/txWriter/CMakeLists.txt | 3 +-
- 8 files changed, 32 insertions(+), 50 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bcbcbf94..b29efac6 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -302,6 +302,8 @@ if (NOT OIIO_NAMESPACE)
- endif ()
- message(STATUS "Setting Namespace to: ${OIIO_NAMESPACE}")
-
-+include (GNUInstallDirs)
-+
- set (CMAKE_MODULE_PATH
- "${PROJECT_SOURCE_DIR}/src/cmake/modules"
- "${PROJECT_SOURCE_DIR}/src/cmake")
-@@ -319,58 +321,32 @@ include_directories (
-
-
- ###########################################################################
--# Paths for install tree customization. Note that relative paths are relative
--# to CMAKE_INSTALL_PREFIX.
--set (DEFAULT_BIN_INSTALL_DIR "bin")
--set (DEFAULT_LIB_INSTALL_DIR "lib")
--set (DEFAULT_INCLUDE_INSTALL_DIR "include/OpenImageIO")
-+# 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)
-- # Try to be well-behaved and install into reasonable places according to
-- # the "standard" unix directory heirarchy
- # TODO: Figure out how to get the correct python directory
-- set (DEFAULT_PYLIB_INSTALL_DIR "lib/python/site-packages")
-- set (DEFAULT_PYLIB3_INSTALL_DIR "lib/python3/site-packages")
-- set (DEFAULT_DOC_INSTALL_DIR "share/doc/OpenImageIO")
-- set (DEFAULT_MAN_INSTALL_DIR "share/man/man1")
-- set (DEFAULT_FONTS_INSTALL_DIR "share/fonts/oiio")
-+ 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 OIIO related will go into its own directory, not into
-- # some standard system heirarchy.
-+ # 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")
-- set (DEFAULT_DOC_INSTALL_DIR "doc")
-- set (DEFAULT_MAN_INSTALL_DIR "doc/man")
-- set (DEFAULT_FONTS_INSTALL_DIR "fonts/oiio")
- endif ()
- if (EXEC_INSTALL_PREFIX)
- # Tack on an extra prefix to support multi-arch builds.
-- set (DEFAULT_BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_BIN_INSTALL_DIR}")
-- set (DEFAULT_LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_LIB_INSTALL_DIR}")
- set (DEFAULT_PYLIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB_INSTALL_DIR}")
- set (DEFAULT_PYLIB3_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB3_INSTALL_DIR}")
-- set (DEFAULT_FONTS_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_FONTS_INSTALL_DIR}")
- endif ()
- # Set up cmake cache variables corresponding to the defaults deduced above, so
- # that the user can override them as desired:
--set (BIN_INSTALL_DIR ${DEFAULT_BIN_INSTALL_DIR} CACHE STRING
-- "Install location for binaries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (LIB_INSTALL_DIR ${DEFAULT_LIB_INSTALL_DIR} CACHE STRING
-- "Install location for libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
- set (PYLIB_INSTALL_DIR ${DEFAULT_PYLIB_INSTALL_DIR} CACHE STRING
- "Install location for python libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
- set (PYLIB3_INSTALL_DIR ${DEFAULT_PYLIB3_INSTALL_DIR} CACHE STRING
- "Install location for python3 libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (INCLUDE_INSTALL_DIR ${DEFAULT_INCLUDE_INSTALL_DIR} CACHE STRING
-- "Install location of header files (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (DOC_INSTALL_DIR ${DEFAULT_DOC_INSTALL_DIR} CACHE STRING
-- "Install location for documentation (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (FONTS_INSTALL_DIR ${DEFAULT_FONTS_INSTALL_DIR} CACHE STRING
-- "Install location for fonts (relative to CMAKE_INSTALL_PREFIX or absolute)")
--if (UNIX)
-- set (MAN_INSTALL_DIR ${DEFAULT_MAN_INSTALL_DIR} CACHE STRING
-- "Install location for manual pages (relative to CMAKE_INSTALL_PREFIX or absolute)")
--endif()
-+
- set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
-
- set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
-@@ -388,10 +364,7 @@ if (CMAKE_SKIP_RPATH)
- set (CMAKE_SKIP_RPATH FALSE)
- unset (CMAKE_INSTALL_RPATH)
- else ()
-- set (CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
-- if (NOT IS_ABSOLUTE ${CMAKE_INSTALL_RPATH})
-- set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
-- endif ()
-+ set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
- set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- endif ()
-
-diff --git a/src/cmake/oiio_macros.cmake b/src/cmake/oiio_macros.cmake
-index e65020bf..22d78ccd 100644
---- a/src/cmake/oiio_macros.cmake
-+++ b/src/cmake/oiio_macros.cmake
-@@ -7,9 +7,9 @@
- #
- macro (oiio_install_targets)
- install (TARGETS ${ARGN}
-- RUNTIME DESTINATION "${BIN_INSTALL_DIR}" COMPONENT user
-- LIBRARY DESTINATION "${LIB_INSTALL_DIR}" COMPONENT user
-- ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT developer)
-+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT user
-+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT user
-+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT developer)
- endmacro ()
-
- # Macro to add a build target for an IO plugin.
-diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
-index 5e2e9866..170ff89c 100644
---- a/src/doc/CMakeLists.txt
-+++ b/src/doc/CMakeLists.txt
-@@ -7,7 +7,7 @@ set (public_docs
- )
-
- if (INSTALL_DOCS)
-- install (FILES ${public_docs} DESTINATION ${DOC_INSTALL_DIR}
-+ install (FILES ${public_docs} DESTINATION ${CMAKE_INSTALL_DOCDIR}
- COMPONENT documentation)
- endif ()
-
-@@ -37,6 +37,6 @@ if (UNIX AND TXT2MAN AND PYTHONINTERP_FOUND)
-
- if (INSTALL_DOCS)
- install (FILES ${manpage_files}
-- DESTINATION ${MAN_INSTALL_DIR} COMPONENT documentation)
-+ DESTINATION ${CMAKE_INSTALL_MANDIR} COMPONENT documentation)
- endif ()
- endif()
-diff --git a/src/fonts/CMakeLists.txt b/src/fonts/CMakeLists.txt
-index 1e296da0..d1bd6409 100644
---- a/src/fonts/CMakeLists.txt
-+++ b/src/fonts/CMakeLists.txt
-@@ -1,7 +1,7 @@
- file (GLOB public_fonts "*/*.ttf")
-
- if (INSTALL_FONTS AND USE_FREETYPE)
-- install (FILES ${public_fonts} DESTINATION ${FONTS_INSTALL_DIR}
-+ install (FILES ${public_fonts} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/fonts/OpenImageIO
- COMPONENT fonts)
- endif ()
-
-diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt
-index b605b53b..5cdc6542 100644
---- a/src/include/CMakeLists.txt
-+++ b/src/include/CMakeLists.txt
-@@ -17,5 +17,5 @@ set (OIIO_VERSION_NS "v${MANGLED_SOVERSION}")
- configure_file(OpenImageIO/oiioversion.h.in "${CMAKE_BINARY_DIR}/include/OpenImageIO/oiioversion.h" @ONLY)
- list(APPEND public_headers "${CMAKE_BINARY_DIR}/include/OpenImageIO/oiioversion.h")
-
--install (FILES ${public_headers} DESTINATION ${INCLUDE_INSTALL_DIR}
-+install (FILES ${public_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OpenImageIO
- COMPONENT developer)
-diff --git a/src/libOpenImageIO/imagebufalgo_draw.cpp b/src/libOpenImageIO/imagebufalgo_draw.cpp
-index fb4dcf4d..cb9ef095 100644
---- a/src/libOpenImageIO/imagebufalgo_draw.cpp
-+++ b/src/libOpenImageIO/imagebufalgo_draw.cpp
-@@ -441,27 +441,38 @@ ImageBufAlgo::render_text (ImageBuf &R, int x, int y, string_view text,
- if (home && *home) {
- std::string h (home);
- search_dirs.push_back (h + "/fonts");
-+ search_dirs.push_back (h + "/fonts/OpenImageIO");
- search_dirs.push_back (h + "/Fonts");
-+ search_dirs.push_back (h + "/Fonts/OpenImageIO");
- search_dirs.push_back (h + "/Library/Fonts");
-+ search_dirs.push_back (h + "/Library/Fonts/OpenImageIO");
- }
- const char *systemRoot = getenv ("SystemRoot");
- if (systemRoot && *systemRoot)
- search_dirs.push_back (std::string(systemRoot) + "/Fonts");
-+ search_dirs.push_back (std::string(systemRoot) + "/Fonts/OpenImageIO");
- search_dirs.push_back ("/usr/share/fonts");
-+
- search_dirs.push_back ("/Library/Fonts");
-+ search_dirs.push_back ("/Library/Fonts/OpenImageIO");
- search_dirs.push_back ("C:/Windows/Fonts");
-+ search_dirs.push_back ("C:/Windows/Fonts/OpenImageIO");
- search_dirs.push_back ("/usr/local/share/fonts");
-+ search_dirs.push_back ("/usr/local/share/fonts/OpenImageIO");
- search_dirs.push_back ("/opt/local/share/fonts");
-+ search_dirs.push_back ("/opt/local/share/fonts/OpenImageIO");
- // Try $OPENIMAGEIOHOME/fonts
- const char *oiiohomedir = getenv ("OPENIMAGEIOHOME");
- if (oiiohomedir && *oiiohomedir)
- search_dirs.push_back (std::string(oiiohomedir) + "/fonts");
-+ search_dirs.push_back (std::string(oiiohomedir) + "/fonts/OpenImageIO");
- // Try ../fonts relative to where this executing binary came from
- std::string this_program = OIIO::Sysutil::this_program_path ();
- if (this_program.size()) {
- std::string path = Filesystem::parent_path (this_program);
- path = Filesystem::parent_path (path);
- search_dirs.push_back (path+"/fonts");
-+ search_dirs.push_back (path+"/fonts/OpenImageIO");
- }
-
- // Try to find the font. Experiment with several extensions
-diff --git a/src/nuke/txReader/CMakeLists.txt b/src/nuke/txReader/CMakeLists.txt
-index 3e72b6d4..660a2ee1 100644
---- a/src/nuke/txReader/CMakeLists.txt
-+++ b/src/nuke/txReader/CMakeLists.txt
-@@ -28,5 +28,4 @@ else ()
- COMPILE_FLAGS "-fPIC -msse")
- endif ()
-
--install (TARGETS txReader
-- LIBRARY DESTINATION "${LIB_INSTALL_DIR}/nuke")
-+oiio_install_targets (txReader)
-diff --git a/src/nuke/txWriter/CMakeLists.txt b/src/nuke/txWriter/CMakeLists.txt
-index 66312bc4..0fb70a36 100644
---- a/src/nuke/txWriter/CMakeLists.txt
-+++ b/src/nuke/txWriter/CMakeLists.txt
-@@ -28,5 +28,4 @@ else ()
- COMPILE_FLAGS "-fPIC -msse")
- endif ()
-
--install (TARGETS txWriter
-- LIBRARY DESTINATION "${LIB_INSTALL_DIR}/nuke")
-+oiio_install_targets (txWriter)
---
-2.14.2
-
diff --git a/media-libs/openimageio/files/openimageio-1.7.17-make-python-and-boost-detection-more-generic.patch b/media-libs/openimageio/files/openimageio-1.7.17-make-python-and-boost-detection-more-generic.patch
deleted file mode 100644
index 06934ca0f06..00000000000
--- a/media-libs/openimageio/files/openimageio-1.7.17-make-python-and-boost-detection-more-generic.patch
+++ /dev/null
@@ -1,336 +0,0 @@
-From 0ec53b0e2cd0713fa3e0fbe538eb1c89fe4e59d2 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Thu, 28 Sep 2017 16:42:25 +0100
-Subject: [PATCH 2/2] oiio/RB-1.7: 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 635c61f4..0f80959a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -181,9 +181,7 @@ 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 (PYTHON_VERSION 2.6)
--set (PYTHON3_VERSION 3.2)
-+set (PYTHON_VERSION "2.7" CACHE STRING "Target version of python to find")
- set (PYLIB_INCLUDE_SONAME OFF CACHE BOOL "If ON, soname/soversion will be set for Python module library")
- set (PYLIB_LIB_PREFIX OFF CACHE BOOL "If ON, prefix the Python module with 'lib'")
- set (USE_FIELD3D ON CACHE BOOL "Use Field3D if found")
-@@ -373,32 +371,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 override them as desired:
--set (PYLIB_INSTALL_DIR ${DEFAULT_PYLIB_INSTALL_DIR} CACHE STRING
-- "Install location for python libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (PYLIB3_INSTALL_DIR ${DEFAULT_PYLIB3_INSTALL_DIR} CACHE STRING
-- "Install location for python3 libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--
-+# Set default install options
- set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
-
- set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
-@@ -494,14 +467,9 @@ if (NOT EMBEDPLUGINS AND NOT BUILD_OIIOUTIL_ONLY)
- endforeach ()
- endif ()
-
--if (USE_PYTHON AND boost_PYTHON_FOUND AND NOT BUILD_OIIOUTIL_ONLY)
-+if (USE_PYTHON AND NOT BUILD_OIIOUTIL_ONLY)
- add_subdirectory (src/python)
- endif ()
--if (USE_PYTHON3 AND boost_PYTHON_FOUND AND NOT BUILD_OIIOUTIL_ONLY)
-- #build the python3 module in a different binary directory since it will
-- #have the same name as the python2 module (e.g. OpenImageIO.so)
-- add_subdirectory (src/python src/python3)
--endif ()
-
- add_subdirectory (src/include)
- add_subdirectory (src/doc)
-diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
-index 03faf7bd..b354cda0 100644
---- a/src/cmake/externalpackages.cmake
-+++ b/src/cmake/externalpackages.cmake
-@@ -116,10 +116,7 @@ if (NOT Boost_FIND_QUIETLY)
- endif ()
-
- if (NOT DEFINED Boost_ADDITIONAL_VERSIONS)
-- set (Boost_ADDITIONAL_VERSIONS "1.60" "1.59" "1.58" "1.57" "1.56"
-- "1.55" "1.54" "1.53" "1.52" "1.51" "1.50"
-- "1.49" "1.48" "1.47" "1.46" "1.45" "1.44"
-- "1.43" "1.43.0" "1.42" "1.42.0")
-+ set (Boost_ADDITIONAL_VERSIONS "1.65.1" "1.65" "1.63" "1.62")
- endif ()
- if (LINKSTATIC)
- set (Boost_USE_STATIC_LIBS ON)
-@@ -131,51 +128,7 @@ if (BOOST_CUSTOM)
- # Boost_VERSION, Boost_INCLUDE_DIRS, Boost_LIBRARY_DIRS, Boost_LIBRARIES.
- else ()
- set (Boost_COMPONENTS filesystem regex system thread)
-- find_package (Boost 1.42 REQUIRED
-- COMPONENTS ${Boost_COMPONENTS}
-- )
--
-- # Try to figure out if this boost distro has Boost::python. If we
-- # include python in the component list above, cmake will abort if
-- # it's not found. So we resort to checking for the boost_python
-- # library's existance to get a soft failure.
-- find_library (my_boost_python_lib boost_python
-- PATHS ${Boost_LIBRARY_DIRS} NO_DEFAULT_PATH)
-- mark_as_advanced (my_boost_python_lib)
-- if (NOT my_boost_python_lib AND Boost_SYSTEM_LIBRARY_RELEASE)
-- get_filename_component (my_boost_PYTHON_rel
-- ${Boost_SYSTEM_LIBRARY_RELEASE} NAME
-- )
-- string (REGEX REPLACE "^(lib)?(.+)_system(.+)$" "\\2_python\\3"
-- my_boost_PYTHON_rel ${my_boost_PYTHON_rel}
-- )
-- find_library (my_boost_PYTHON_LIBRARY_RELEASE
-- NAMES ${my_boost_PYTHON_rel} lib${my_boost_PYTHON_rel}
-- HINTS ${Boost_LIBRARY_DIRS}
-- NO_DEFAULT_PATH
-- )
-- mark_as_advanced (my_boost_PYTHON_LIBRARY_RELEASE)
-- endif ()
-- if (NOT my_boost_python_lib AND Boost_SYSTEM_LIBRARY_DEBUG)
-- get_filename_component (my_boost_PYTHON_dbg
-- ${Boost_SYSTEM_LIBRARY_DEBUG} NAME
-- )
-- string (REGEX REPLACE "^(lib)?(.+)_system(.+)$" "\\2_python\\3"
-- my_boost_PYTHON_dbg ${my_boost_PYTHON_dbg}
-- )
-- find_library (my_boost_PYTHON_LIBRARY_DEBUG
-- NAMES ${my_boost_PYTHON_dbg} lib${my_boost_PYTHON_dbg}
-- HINTS ${Boost_LIBRARY_DIRS}
-- NO_DEFAULT_PATH
-- )
-- mark_as_advanced (my_boost_PYTHON_LIBRARY_DEBUG)
-- endif ()
-- if (my_boost_python_lib OR
-- my_boost_PYTHON_LIBRARY_RELEASE OR my_boost_PYTHON_LIBRARY_DEBUG)
-- set (boost_PYTHON_FOUND ON)
-- else ()
-- set (boost_PYTHON_FOUND OFF)
-- endif ()
-+ find_package (Boost 1.62 REQUIRED COMPONENTS ${Boost_COMPONENTS})
- endif ()
-
- # On Linux, Boost 1.55 and higher seems to need to link against -lrt
-@@ -190,16 +143,6 @@ if (NOT Boost_FIND_QUIETLY)
- message (STATUS "Boost include dirs ${Boost_INCLUDE_DIRS}")
- message (STATUS "Boost library dirs ${Boost_LIBRARY_DIRS}")
- message (STATUS "Boost libraries ${Boost_LIBRARIES}")
-- message (STATUS "Boost python found ${boost_PYTHON_FOUND}")
--endif ()
--if (NOT boost_PYTHON_FOUND)
-- # If Boost python components were not found, turn off all python support.
-- message (STATUS "Boost python support not found -- will not build python components!")
-- if (APPLE AND USE_PYTHON)
-- message (STATUS " If your Boost is from Macports, you need the +python26 variant to get Python support.")
-- endif ()
-- set (USE_PYTHON OFF)
-- set (PYTHONLIBS_FOUND OFF)
- endif ()
-
- include_directories (SYSTEM "${Boost_INCLUDE_DIRS}")
-diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
-index 81a4a890..e58d372d 100644
---- a/src/python/CMakeLists.txt
-+++ b/src/python/CMakeLists.txt
-@@ -1,54 +1,30 @@
--#if the CMAKE_CURRENT_BINARY_DIR is python3, then build the python3 module,
--#otherwise the python2 module
--string (REGEX MATCH "python3\$" _py3_subdir ${CMAKE_CURRENT_BINARY_DIR})
-+# Attempt to find the desired version, but fall back to other
-+# additional versions.
-+find_package (PythonInterp ${PYTHON_VERSION} REQUIRED)
-
--if (_py3_subdir)
-- set (BUILD_PY3 ON)
--else ()
-- set (BUILD_PY3 OFF)
--endif ()
--
--if (NOT BOOST_CUSTOM AND NOT BUILD_PY3)
-- #Unset those, otherwise find_package(PythonLibs) will pick up old stuff
-- #if it has been run before
-- unset(Python_ADDITIONAL_VERSIONS)
-- unset(PYTHON_LIBRARY)
-- unset(PYTHON_LIBRARY CACHE)
-- unset(PYTHON_INCLUDE_DIR)
-- unset(PYTHON_INCLUDE_DIR CACHE)
-- unset(PYTHON_INCLUDE_PATH)
-- unset(PYTHON_INCLUDE_PATH CACHE)
-- find_package (PythonLibs ${PYTHON_VERSION} REQUIRED)
-- find_package (Boost 1.42 REQUIRED COMPONENTS python)
--elseif (BOOST_CUSTOM AND NOT BUILD_PY3)
-- find_package (PythonLibs ${PYTHON_VERSION} REQUIRED)
--else ()
-- #BOOST_CUSTOM is ignored for python3
-+# The version that was found may not be the default or user
-+# defined one.
-+set (PYTHON_VERSION_FOUND ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
-
-- #Unset those, otherwise find_package(PythonLibs) will pick up old stuff
-- #if it has been run before
-- unset(PYTHON_LIBRARY)
-- unset(PYTHON_LIBRARY CACHE)
-- unset(PYTHON_INCLUDE_DIR)
-- unset(PYTHON_INCLUDE_DIR CACHE)
-- unset(PYTHON_INCLUDE_PATH)
-- unset(PYTHON_INCLUDE_PATH CACHE)
-+if (NOT ${PYTHON_VERSION} EQUAL ${PYTHON_VERSION_FOUND} )
-+ message (WARNING "The requested version ${PYTHON_VERSION} was not found.")
-+ message (WARNING "Using ${PYTHON_VERSION_FOUND} instead.")
-+endif ()
-
-- #cmake 2.8 does not look for python 3.4
-- set(Python_ADDITIONAL_VERSIONS 3.4)
-- find_package (PythonInterp ${PYTHON3_VERSION} REQUIRED)
-- find_package (PythonLibs ${PYTHON3_VERSION} REQUIRED)
-+find_package (PythonLibs ${PYTHON_VERSION_FOUND} REQUIRED)
-
-- #Finding the python3 component for boost is a little tricky, since it has
-- #different names on different systems. Try the most common ones
-- #(boost_python3, boost_python-py34, …).
-- foreach (_boost_py3_lib python3 python-py34 python-py33 python-py32)
-- find_package (Boost 1.42 QUIET COMPONENTS ${_boost_py3_lib})
-- string (TOUPPER ${_boost_py3_lib} boost_py3_lib_name)
-- if (Boost_${boost_py3_lib_name}_FOUND)
-- #Not the most beautiful thing to do, but that gets them included in
-- #the target_link_libraries(…) call farther down
-- set (Boost_PYTHON_LIBRARIES ${Boost_${boost_py3_lib_name}_LIBRARIES})
-+if (NOT BOOST_CUSTOM)
-+ # Finding the python component for boost is a little tricky, since it has
-+ # different names on different systems. Try the most common ones.
-+ foreach (_py_lib python-${PYTHON_VERSION_FOUND} python
-+ python${PYTHON_VERSION_MAJOR}
-+ python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
-+ find_package (Boost QUIET COMPONENTS ${_py_lib})
-+ string (TOUPPER ${_py_lib} _py_lib_name)
-+ if (Boost_${_py_lib_name}_FOUND)
-+ # Not the most beautiful thing to do, but that gets them included in
-+ # the target_link_libraries(…) call farther down
-+ set (Boost_PYTHON_LIBRARIES ${Boost_${_py_lib_name}_LIBRARIES})
- break ()
- endif ()
- endforeach ()
-@@ -58,18 +34,19 @@ if (APPLE)
- # set (PYTHON_LIBRARIES /opt/local/lib)
- endif ()
-
-+if (NOT DEFINED PYTHON_SITE_DIR)
-+ set (PYTHON_SITE_DIR "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_FOUND}/site-packages")
-+endif ()
-+
- # Disable some warnings for Clang, it's a little too picky with boost
- if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
- add_definitions ("-Wno-array-bounds")
- endif ()
-
--if (BUILD_PY3)
-- set (target_name Py3OpenImageIO)
--else ()
-- set (target_name PyOpenImageIO)
--endif ()
-+set (target_name PyOpenImageIO)
-
--if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
-+# Test if automatically found or manually set with BOOST_CUSTOM
-+if (DEFINED Boost_PYTHON_LIBRARIES)
-
- set (python_srcs py_imageinput.cpp py_imageoutput.cpp
- py_imagecache.cpp py_imagespec.cpp py_roi.cpp
-@@ -81,8 +58,12 @@ if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
- message (STATUS "Python found ${PYTHONLIBS_FOUND} ")
- message (STATUS "Python include dirs ${PYTHON_INCLUDE_PATH}")
- message (STATUS "Python libraries ${PYTHON_LIBRARIES}")
-+ message (STATUS "Python site packages dir ${PYTHON_SITE_DIR}")
- message (STATUS "Python to include 'lib' prefix: ${PYLIB_LIB_PREFIX}")
- message (STATUS "Python to include SO version: ${PYLIB_INCLUDE_SONAME}")
-+ message (STATUS "Python version ${PYTHON_VERSION_STRING}")
-+ message (STATUS "Python version major: ${PYTHON_VERSION_MAJOR} minor: ${PYTHON_VERSION_MINOR}")
-+ message (STATUS "Boost python libraries ${Boost_PYTHON_LIBRARIES}")
- endif ()
-
- include_directories (${PYTHON_INCLUDE_PATH} ${Boost_INCLUDE_DIRS})
-@@ -91,7 +72,7 @@ if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
- target_link_libraries (${target_name} OpenImageIO ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
- set_target_properties (${target_name} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
- else ()
-- target_link_libraries (${target_name} OpenImageIO ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
-+ target_link_libraries (${target_name} OpenImageIO ${SANITIZE_LIBRARIES} ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
- endif ()
-
- # Exclude the 'lib' prefix from the name
-@@ -123,21 +104,17 @@ if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
- SUFFIX ".pyd")
- endif()
-
-- if (BUILD_PY3)
-- install (TARGETS ${target_name}
-- RUNTIME DESTINATION ${PYLIB3_INSTALL_DIR} COMPONENT user
-- LIBRARY DESTINATION ${PYLIB3_INSTALL_DIR} COMPONENT user)
-- else ()
-- install (TARGETS ${target_name}
-- RUNTIME DESTINATION ${PYLIB_INSTALL_DIR} COMPONENT user
-- LIBRARY DESTINATION ${PYLIB_INSTALL_DIR} COMPONENT user)
-- endif ()
--elseif (BUILD_PY3)
-- if (NOT PYTHONLIBS_FOUND)
-- message (STATUS "Python3 libraries not found")
-- endif ()
-- if (NOT Boost_FOUND)
-- message (STATUS "Boost python3 component not found")
-- endif ()
-- set(USE_PYTHON3 OFF)
-+ install (TARGETS ${target_name}
-+ RUNTIME DESTINATION ${PYTHON_SITE_DIR} COMPONENT user
-+ LIBRARY DESTINATION ${PYTHON_SITE_DIR} COMPONENT user)
-+else ()
-+ # If Boost python components were not found, turn off all python support.
-+ message (STATUS "Boost python support not found!")
-+ if (APPLE AND USE_PYTHON)
-+ message (STATUS " If your Boost is from Macports, you need the +python26 variant to get Python support.")
-+ endif ()
-+ if (BOOST_CUSTOM)
-+ message (STATUS " Please set the variable Boost_PYTHON_LIBRARIES to the location of the boost python libraries.")
-+ endif ()
-+ message (FATAL_ERROR "Python module cannot be built. Either disable python support or check your boost installation.")
- endif ()
---
-2.14.2
-
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
deleted file mode 100644
index e4bd3562adc..00000000000
--- a/media-libs/openimageio/files/openimageio-1.7.17-openexr-2.3.0.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-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/files/openimageio-1.7.17-use-gnuinstalldirs.patch b/media-libs/openimageio/files/openimageio-1.7.17-use-gnuinstalldirs.patch
deleted file mode 100644
index e77b362be69..00000000000
--- a/media-libs/openimageio/files/openimageio-1.7.17-use-gnuinstalldirs.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-From 603f85536982669f2618be061511c48c93e1c5e9 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Thu, 28 Sep 2017 16:35:26 +0100
-Subject: [PATCH 1/2] oiio/RB-1.7: Use GNUInstallDirs for installation paths
- (#1747)
-
-* Change all hard coded paths to GNUInstallDirs varibles.
-* Remove variable setting in install.cmake file since
- GNUInstallDirs does all this for you.
-* Added new search paths for fonts.
-
-Backported from:
-https://github.com/OpenImageIO/oiio/commit/1383ba314ec2522b4f0c7e9037bd546b68bc2d7d
----
- CMakeLists.txt | 51 ++++++++------------------------
- src/cmake/oiio_macros.cmake | 6 ++--
- src/doc/CMakeLists.txt | 4 +--
- src/fonts/CMakeLists.txt | 2 +-
- src/include/CMakeLists.txt | 2 +-
- src/libOpenImageIO/imagebufalgo_draw.cpp | 11 +++++++
- src/nuke/txReader/CMakeLists.txt | 3 +-
- src/nuke/txWriter/CMakeLists.txt | 3 +-
- 8 files changed, 32 insertions(+), 50 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index ca8da565..635c61f4 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -353,6 +353,8 @@ if (LINKSTATIC)
- set (Boost_USE_STATIC_LIBS 1)
- endif ()
-
-+include (GNUInstallDirs)
-+
- set (CMAKE_MODULE_PATH
- "${PROJECT_SOURCE_DIR}/src/cmake/modules"
- "${PROJECT_SOURCE_DIR}/src/cmake")
-@@ -371,58 +373,32 @@ include_directories (
-
-
- ###########################################################################
--# Paths for install tree customization. Note that relative paths are relative
--# to CMAKE_INSTALL_PREFIX.
--set (DEFAULT_BIN_INSTALL_DIR "bin")
--set (DEFAULT_LIB_INSTALL_DIR "lib")
--set (DEFAULT_INCLUDE_INSTALL_DIR "include/OpenImageIO")
-+# 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)
-- # Try to be well-behaved and install into reasonable places according to
-- # the "standard" unix directory heirarchy
- # TODO: Figure out how to get the correct python directory
-- set (DEFAULT_PYLIB_INSTALL_DIR "lib/python/site-packages")
-- set (DEFAULT_PYLIB3_INSTALL_DIR "lib/python3/site-packages")
-- set (DEFAULT_DOC_INSTALL_DIR "share/doc/OpenImageIO")
-- set (DEFAULT_MAN_INSTALL_DIR "share/man/man1")
-- set (DEFAULT_FONTS_INSTALL_DIR "share/fonts/oiio")
-+ 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 OIIO related will go into its own directory, not into
-- # some standard system heirarchy.
-+ # 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")
-- set (DEFAULT_DOC_INSTALL_DIR "doc")
-- set (DEFAULT_MAN_INSTALL_DIR "doc/man")
-- set (DEFAULT_FONTS_INSTALL_DIR "fonts/oiio")
- endif ()
- if (EXEC_INSTALL_PREFIX)
- # Tack on an extra prefix to support multi-arch builds.
-- set (DEFAULT_BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_BIN_INSTALL_DIR}")
-- set (DEFAULT_LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_LIB_INSTALL_DIR}")
- set (DEFAULT_PYLIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB_INSTALL_DIR}")
- set (DEFAULT_PYLIB3_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB3_INSTALL_DIR}")
-- set (DEFAULT_FONTS_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_FONTS_INSTALL_DIR}")
- endif ()
- # Set up cmake cache variables corresponding to the defaults deduced above, so
- # that the user can override them as desired:
--set (BIN_INSTALL_DIR ${DEFAULT_BIN_INSTALL_DIR} CACHE STRING
-- "Install location for binaries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (LIB_INSTALL_DIR ${DEFAULT_LIB_INSTALL_DIR} CACHE STRING
-- "Install location for libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
- set (PYLIB_INSTALL_DIR ${DEFAULT_PYLIB_INSTALL_DIR} CACHE STRING
- "Install location for python libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
- set (PYLIB3_INSTALL_DIR ${DEFAULT_PYLIB3_INSTALL_DIR} CACHE STRING
- "Install location for python3 libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (INCLUDE_INSTALL_DIR ${DEFAULT_INCLUDE_INSTALL_DIR} CACHE STRING
-- "Install location of header files (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (DOC_INSTALL_DIR ${DEFAULT_DOC_INSTALL_DIR} CACHE STRING
-- "Install location for documentation (relative to CMAKE_INSTALL_PREFIX or absolute)")
--set (FONTS_INSTALL_DIR ${DEFAULT_FONTS_INSTALL_DIR} CACHE STRING
-- "Install location for fonts (relative to CMAKE_INSTALL_PREFIX or absolute)")
--if (UNIX)
-- set (MAN_INSTALL_DIR ${DEFAULT_MAN_INSTALL_DIR} CACHE STRING
-- "Install location for manual pages (relative to CMAKE_INSTALL_PREFIX or absolute)")
--endif()
-+
- set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
-
- set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
-@@ -440,10 +416,7 @@ if (CMAKE_SKIP_RPATH)
- set (CMAKE_SKIP_RPATH FALSE)
- unset (CMAKE_INSTALL_RPATH)
- else ()
-- set (CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
-- if (NOT IS_ABSOLUTE ${CMAKE_INSTALL_RPATH})
-- set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
-- endif ()
-+ set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
- set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- endif ()
- set (MACOSX_RPATH ON)
-diff --git a/src/cmake/oiio_macros.cmake b/src/cmake/oiio_macros.cmake
-index ee7be325..bfd07413 100644
---- a/src/cmake/oiio_macros.cmake
-+++ b/src/cmake/oiio_macros.cmake
-@@ -7,9 +7,9 @@
- #
- macro (oiio_install_targets)
- install (TARGETS ${ARGN}
-- RUNTIME DESTINATION "${BIN_INSTALL_DIR}" COMPONENT user
-- LIBRARY DESTINATION "${LIB_INSTALL_DIR}" COMPONENT user
-- ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT developer)
-+ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT user
-+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT user
-+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT developer)
- endmacro ()
-
- # Macro to add a build target for an IO plugin.
-diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
-index eea04340..a3dc1e71 100644
---- a/src/doc/CMakeLists.txt
-+++ b/src/doc/CMakeLists.txt
-@@ -7,7 +7,7 @@ set (public_docs
- )
-
- if (INSTALL_DOCS)
-- install (FILES ${public_docs} DESTINATION ${DOC_INSTALL_DIR}
-+ install (FILES ${public_docs} DESTINATION ${CMAKE_INSTALL_DOCDIR}
- COMPONENT documentation)
- endif ()
-
-@@ -39,6 +39,6 @@ if (UNIX AND TXT2MAN AND PYTHONINTERP_FOUND)
-
- if (INSTALL_DOCS)
- install (FILES ${manpage_files}
-- DESTINATION ${MAN_INSTALL_DIR} COMPONENT documentation)
-+ DESTINATION ${CMAKE_INSTALL_MANDIR} COMPONENT documentation)
- endif ()
- endif()
-diff --git a/src/fonts/CMakeLists.txt b/src/fonts/CMakeLists.txt
-index 1e296da0..d1bd6409 100644
---- a/src/fonts/CMakeLists.txt
-+++ b/src/fonts/CMakeLists.txt
-@@ -1,7 +1,7 @@
- file (GLOB public_fonts "*/*.ttf")
-
- if (INSTALL_FONTS AND USE_FREETYPE)
-- install (FILES ${public_fonts} DESTINATION ${FONTS_INSTALL_DIR}
-+ install (FILES ${public_fonts} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/fonts/OpenImageIO
- COMPONENT fonts)
- endif ()
-
-diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt
-index b063e6f3..3aa96877 100644
---- a/src/include/CMakeLists.txt
-+++ b/src/include/CMakeLists.txt
-@@ -19,5 +19,5 @@ set (OIIO_BUILD_CPP14 ${USE_CPP14})
- configure_file(OpenImageIO/oiioversion.h.in "${CMAKE_BINARY_DIR}/include/OpenImageIO/oiioversion.h" @ONLY)
- list(APPEND public_headers "${CMAKE_BINARY_DIR}/include/OpenImageIO/oiioversion.h")
-
--install (FILES ${public_headers} DESTINATION ${INCLUDE_INSTALL_DIR}
-+install (FILES ${public_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OpenImageIO
- COMPONENT developer)
-diff --git a/src/libOpenImageIO/imagebufalgo_draw.cpp b/src/libOpenImageIO/imagebufalgo_draw.cpp
-index 4e3cc985..a877ff6e 100644
---- a/src/libOpenImageIO/imagebufalgo_draw.cpp
-+++ b/src/libOpenImageIO/imagebufalgo_draw.cpp
-@@ -685,27 +685,38 @@ ImageBufAlgo::render_text (ImageBuf &R, int x, int y, string_view text,
- if (home && *home) {
- std::string h (home);
- search_dirs.push_back (h + "/fonts");
-+ search_dirs.push_back (h + "/fonts/OpenImageIO");
- search_dirs.push_back (h + "/Fonts");
-+ search_dirs.push_back (h + "/Fonts/OpenImageIO");
- search_dirs.push_back (h + "/Library/Fonts");
-+ search_dirs.push_back (h + "/Library/Fonts/OpenImageIO");
- }
- const char *systemRoot = getenv ("SystemRoot");
- if (systemRoot && *systemRoot)
- search_dirs.push_back (std::string(systemRoot) + "/Fonts");
-+ search_dirs.push_back (std::string(systemRoot) + "/Fonts/OpenImageIO");
- search_dirs.push_back ("/usr/share/fonts");
-+
- search_dirs.push_back ("/Library/Fonts");
-+ search_dirs.push_back ("/Library/Fonts/OpenImageIO");
- search_dirs.push_back ("C:/Windows/Fonts");
-+ search_dirs.push_back ("C:/Windows/Fonts/OpenImageIO");
- search_dirs.push_back ("/usr/local/share/fonts");
-+ search_dirs.push_back ("/usr/local/share/fonts/OpenImageIO");
- search_dirs.push_back ("/opt/local/share/fonts");
-+ search_dirs.push_back ("/opt/local/share/fonts/OpenImageIO");
- // Try $OPENIMAGEIOHOME/fonts
- const char *oiiohomedir = getenv ("OPENIMAGEIOHOME");
- if (oiiohomedir && *oiiohomedir)
- search_dirs.push_back (std::string(oiiohomedir) + "/fonts");
-+ search_dirs.push_back (std::string(oiiohomedir) + "/fonts/OpenImageIO");
- // Try ../fonts relative to where this executing binary came from
- std::string this_program = OIIO::Sysutil::this_program_path ();
- if (this_program.size()) {
- std::string path = Filesystem::parent_path (this_program);
- path = Filesystem::parent_path (path);
- search_dirs.push_back (path+"/fonts");
-+ search_dirs.push_back (path+"/fonts/OpenImageIO");
- }
-
- // Try to find the font. Experiment with several extensions
-diff --git a/src/nuke/txReader/CMakeLists.txt b/src/nuke/txReader/CMakeLists.txt
-index 3e72b6d4..660a2ee1 100644
---- a/src/nuke/txReader/CMakeLists.txt
-+++ b/src/nuke/txReader/CMakeLists.txt
-@@ -28,5 +28,4 @@ else ()
- COMPILE_FLAGS "-fPIC -msse")
- endif ()
-
--install (TARGETS txReader
-- LIBRARY DESTINATION "${LIB_INSTALL_DIR}/nuke")
-+oiio_install_targets (txReader)
-diff --git a/src/nuke/txWriter/CMakeLists.txt b/src/nuke/txWriter/CMakeLists.txt
-index 66312bc4..0fb70a36 100644
---- a/src/nuke/txWriter/CMakeLists.txt
-+++ b/src/nuke/txWriter/CMakeLists.txt
-@@ -28,5 +28,4 @@ else ()
- COMPILE_FLAGS "-fPIC -msse")
- endif ()
-
--install (TARGETS txWriter
-- LIBRARY DESTINATION "${LIB_INSTALL_DIR}/nuke")
-+oiio_install_targets (txWriter)
---
-2.14.2
-
diff --git a/media-libs/openimageio/openimageio-1.6.18.ebuild b/media-libs/openimageio/openimageio-1.6.18.ebuild
deleted file mode 100644
index 30b8d9ae2d0..00000000000
--- a/media-libs/openimageio/openimageio-1.6.18.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit cmake-utils vcs-snapshot 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 )
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python raw ssl +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="test" #431412
-
-RDEPEND="dev-libs/boost:=
- dev-libs/pugixml:0=
- media-libs/ilmbase:=
- media-libs/libpng:0=
- >=media-libs/libwebp-0.2.1:=
- media-libs/openexr:=
- media-libs/tiff:0=
- sys-libs/zlib:=
- virtual/jpeg:0
- colorio? ( media-libs/opencolorio:0= )
- ffmpeg? ( media-video/ffmpeg:0= )
- field3d? ( media-libs/Field3D )
- gif? ( media-libs/giflib:0= )
- jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
- opencv? ( media-libs/opencv:= )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- ptex? ( media-libs/ptex )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- )
- raw? ( media-libs/libraw:0= )
- ssl? ( dev-libs/openssl:0= )
- truetype? ( media-libs/freetype:2= )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
- "${FILESDIR}/${P}-make-python-and-boost-detection-more-generic.patch"
- "${FILESDIR}/${P}-repair-breaks-after-boost-python-1.65-changes.patch"
-)
-
-DOCS=( CHANGES CREDITS README.rst src/doc/${PN}.pdf )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- # Build with SIMD support (choices: 0, sse2, sse3,"
- # ssse3, sse4.1, sse4.2)"
- local cpufeature
- local mysimd=()
- for cpufeature in "${CPU_FEATURES[@]}"; do
- use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
- done
- # If no CPU SIMDs were used, completely disable them
- [[ -z ${mysimd} ]] && mysimd=("0")
-
- local mycmakeargs=(
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
- -DINSTALL_DOCS=$(usex doc)
- -DOIIO_BUILD_CPP11=ON
- -DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
- -DSTOP_ON_WARNING=OFF
- -DUSE_EXTERNAL_PUGIXML=ON
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FIELD3D=$(usex field3d)
- -DUSE_FREETYPE=$(usex truetype)
- -DUSE_GIF=$(usex gif)
- -DUSE_JPEGTURBO=ON
- -DUSE_LIBRAW=$(usex raw)
- -DUSE_NUKE=NO # Missing in Gentoo
- -DUSE_OCIO=$(usex colorio)
- -DUSE_OPENCV=$(usex opencv)
- -DUSE_OPENGL=$(usex opengl)
- -DUSE_OPENJPEG=$(usex jpeg2k)
- -DUSE_OPENSSL=$(usex ssl)
- -DUSE_PTEX=$(usex ptex)
- -DUSE_PYTHON=$(usex python)
- -DUSE_QT=OFF # Deprecated
- -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
- )
-
- cmake-utils_src_configure
-}
diff --git a/media-libs/openimageio/openimageio-1.7.17.ebuild b/media-libs/openimageio/openimageio-1.7.17.ebuild
deleted file mode 100644
index 2e5bb080fb5..00000000000
--- a/media-libs/openimageio/openimageio-1.7.17.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_5,3_6} )
-
-inherit cmake-utils vcs-snapshot 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 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="test" #431412
-
-RDEPEND=">=dev-libs/boost-1.62:=
- dev-libs/pugixml:=
- >=media-libs/ilmbase-2.2.0-r1:=
- media-libs/libpng:0=
- >=media-libs/libwebp-0.2.1:=
- >=media-libs/openexr-2.2.0-r2:=
- media-libs/tiff:0=
- sys-libs/zlib:=
- virtual/jpeg:0
- colorio? ( media-libs/opencolorio:= )
- ffmpeg? ( media-video/ffmpeg:= )
- field3d? ( media-libs/Field3D:= )
- gif? ( media-libs/giflib:0= )
- jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
- opencv? ( media-libs/opencv:= )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- ptex? ( media-libs/ptex:= )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- )
- raw? ( media-libs/libraw:= )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- truetype? ( media-libs/freetype:2= )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[latex] )"
-
-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 )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- # Build with SIMD support
- local cpufeature
- local mysimd=()
- for cpufeature in "${CPU_FEATURES[@]}"; do
- use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
- done
-
- # If no CPU SIMDs were used, completely disable them
- [[ -z ${mysimd} ]] && mysimd=("0")
-
- local mycmakeargs=(
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
- -DINSTALL_DOCS=$(usex doc)
- -DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
- -DSTOP_ON_WARNING=OFF
- -DUSE_CPP14=ON
- -DUSE_EXTERNAL_PUGIXML=ON
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FIELD3D=$(usex field3d)
- -DUSE_FREETYPE=$(usex truetype)
- -DUSE_GIF=$(usex gif)
- -DUSE_JPEGTURBO=ON
- -DUSE_LIBRAW=$(usex raw)
- -DUSE_NUKE=NO # Missing in Gentoo
- -DUSE_NUKE=OFF
- -DUSE_OCIO=$(usex colorio)
- -DUSE_OPENCV=$(usex opencv)
- -DUSE_OPENGL=$(usex opengl)
- -DUSE_OPENJPEG=$(usex jpeg2k)
- -DUSE_OPENSSL=$(usex ssl)
- -DUSE_PTEX=$(usex ptex)
- -DUSE_PYTHON=$(usex python)
- -DUSE_QT=OFF # Deprecated
- -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
- )
-
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
@ 2019-04-21 18:24 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2019-04-21 18:24 UTC (permalink / raw
To: gentoo-commits
commit: 3aaca40c1636ae63b4fbe4fa04108f22607ae261
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 17:18:12 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 18:21:40 2019 +0000
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 <alex.miller <AT> gmx.de>
Closes: https://bugs.gentoo.org/683126
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> 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 00000000000..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 )
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
@ 2019-01-07 12:38 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2019-01-07 12:38 UTC (permalink / raw
To: gentoo-commits
commit: 32852865d59bc3ab579d4664d5c9b5790edfca46
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 7 12:35:48 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jan 7 12:38:15 2019 +0000
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 <polynomial-c <AT> 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 a72b7756257d4ffd1567efd73c24bf65fc2bffff82c96c18a77211e918323e65e1c99076e272b3b77115ca30910ea4cfced222892b062e339d8e4e85bd2221f7 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..00000000000
--- a/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-commit 810a0235837d6f31d8b3c05544f99461df71403e
-Author: Larry Gritz <lg@larrygritz.com>
-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 <boost/thread/once.hpp>
-
- #include <OpenImageIO/imageio.h>
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..00000000000
--- 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="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="test" #431412
-
-RDEPEND=">=dev-libs/boost-1.62:=
- dev-libs/pugixml:=
- >=media-libs/ilmbase-2.2.0-r1:=
- media-libs/libpng:0=
- >=media-libs/libwebp-0.2.1:=
- >=media-libs/openexr-2.2.0-r2:=
- media-libs/tiff:0=
- sys-libs/zlib:=
- virtual/jpeg:0
- colorio? ( media-libs/opencolorio:= )
- ffmpeg? ( media-video/ffmpeg:= )
- field3d? ( media-libs/Field3D:= )
- gif? ( media-libs/giflib:0= )
- jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
- opencv? ( media-libs/opencv:= )
- opengl? (
- virtual/glu
- virtual/opengl
- media-libs/glew:=
- )
- ptex? ( media-libs/ptex:= )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- raw? ( media-libs/libraw:= )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- truetype? ( media-libs/freetype:2= )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen[latex] )"
-
-DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-S="${WORKDIR}/oiio-Release-${PV}"
-
-src_configure() {
- # Build with SIMD support
- local cpufeature
- local mysimd=()
- for cpufeature in "${CPU_FEATURES[@]}"; do
- use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
- done
-
- # If no CPU SIMDs were used, completely disable them
- [[ -z ${mysimd} ]] && mysimd=("0")
-
- local mycmakeargs=(
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
- -DINSTALL_DOCS=$(usex doc)
- -DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
- -DSTOP_ON_WARNING=OFF
- -DUSE_CPP14=ON
- -DUSE_EXTERNAL_PUGIXML=ON
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FIELD3D=$(usex field3d)
- -DUSE_FREETYPE=$(usex truetype)
- -DUSE_GIF=$(usex gif)
- -DUSE_JPEGTURBO=ON
- -DUSE_LIBRAW=$(usex raw)
- -DUSE_NUKE=NO # Missing in Gentoo
- -DUSE_NUKE=OFF
- -DUSE_OCIO=$(usex colorio)
- -DUSE_OPENCV=$(usex opencv)
- -DUSE_OPENGL=$(usex opengl)
- -DUSE_OPENJPEG=$(usex jpeg2k)
- -DUSE_OPENSSL=$(usex ssl)
- -DUSE_PTEX=$(usex ptex)
- -DUSE_PYTHON=$(usex python)
- -DUSE_QT=$(usex qt5)
- -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
- )
-
- cmake-utils_src_configure
-}
diff --git a/media-libs/openimageio/openimageio-1.8.7.ebuild b/media-libs/openimageio/openimageio-1.8.7.ebuild
deleted file mode 100644
index 22956201293..00000000000
--- a/media-libs/openimageio/openimageio-1.8.7.ebuild
+++ /dev/null
@@ -1,116 +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 vcs-snapshot 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="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RESTRICT="test" #431412
-
-RDEPEND=">=dev-libs/boost-1.62:=
- dev-libs/pugixml:=
- >=media-libs/ilmbase-2.2.0-r1:=
- media-libs/libpng:0=
- >=media-libs/libwebp-0.2.1:=
- >=media-libs/openexr-2.2.0-r2:=
- media-libs/tiff:0=
- sys-libs/zlib:=
- virtual/jpeg:0
- colorio? ( media-libs/opencolorio:= )
- ffmpeg? ( media-video/ffmpeg:= )
- field3d? ( media-libs/Field3D:= )
- gif? ( media-libs/giflib:0= )
- jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
- opencv? ( media-libs/opencv:= )
- opengl? (
- virtual/glu
- virtual/opengl
- media-libs/glew:=
- )
- ptex? ( media-libs/ptex:= )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- raw? ( media-libs/libraw:= )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- truetype? ( media-libs/freetype:2= )"
-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() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- # Build with SIMD support
- local cpufeature
- local mysimd=()
- for cpufeature in "${CPU_FEATURES[@]}"; do
- use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
- done
-
- # If no CPU SIMDs were used, completely disable them
- [[ -z ${mysimd} ]] && mysimd=("0")
-
- local mycmakeargs=(
- -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
- -DINSTALL_DOCS=$(usex doc)
- -DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
- -DSTOP_ON_WARNING=OFF
- -DUSE_CPP14=ON
- -DUSE_EXTERNAL_PUGIXML=ON
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FIELD3D=$(usex field3d)
- -DUSE_FREETYPE=$(usex truetype)
- -DUSE_GIF=$(usex gif)
- -DUSE_JPEGTURBO=ON
- -DUSE_LIBRAW=$(usex raw)
- -DUSE_NUKE=NO # Missing in Gentoo
- -DUSE_NUKE=OFF
- -DUSE_OCIO=$(usex colorio)
- -DUSE_OPENCV=$(usex opencv)
- -DUSE_OPENGL=$(usex opengl)
- -DUSE_OPENJPEG=$(usex jpeg2k)
- -DUSE_OPENSSL=$(usex ssl)
- -DUSE_PTEX=$(usex ptex)
- -DUSE_PYTHON=$(usex python)
- -DUSE_QT=$(usex qt5)
- -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
- )
-
- cmake-utils_src_configure
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
@ 2018-04-27 12:13 Alexis Ballier
0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier @ 2018-04-27 12:13 UTC (permalink / raw
To: gentoo-commits
commit: aca6a611eb0cda805b60113ccd0a6f56369ef41a
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 27 12:12:58 2018 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Fri Apr 27 12:13:23 2018 +0000
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 00000000000..92cad26c933
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-1.8.7-ffmpeg4.patch
@@ -0,0 +1,26 @@
+commit 810a0235837d6f31d8b3c05544f99461df71403e
+Author: Larry Gritz <lg@larrygritz.com>
+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 <boost/thread/once.hpp>
+
+ #include <OpenImageIO/imageio.h>
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() {
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
@ 2018-01-22 21:52 Patrice Clement
0 siblings, 0 replies; 11+ messages in thread
From: Patrice Clement @ 2018-01-22 21:52 UTC (permalink / raw
To: gentoo-commits
commit: fec97980e4511ce4bf1d6b4da548d5cf346830aa
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Fri Jan 19 10:35:51 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Jan 22 21:50:42 2018 +0000
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 a72b7756257d4ffd1567efd73c24bf65fc2bffff82c96c18a77211e918323e65e1c99076e272b3b77115ca30910ea4cfced222892b062e339d8e4e85bd2221f7 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..00000000000
--- 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..00000000000
--- 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} )"
-
-RESTRICT="test" #431412
-
-RDEPEND="
- dev-libs/boost:=
- 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:0
- gif? ( media-libs/giflib )
- jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
- colorio? ( >=media-libs/opencolorio-1.0.7:= )
- opencv? (
- >=media-libs/opencv-2.3:=
- python? ( >=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}] )
- )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- python? (
- ${PYTHON_DEPS}
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- )
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtopengl:4
- )
- ssl? ( dev-libs/openssl:0 )
- tbb? ( dev-cpp/tbb )
- truetype? ( media-libs/freetype:2= )"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${P}/src
-PATCHES=( "${FILESDIR}"/${P}-openexr-2.x.patch )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # remove bundled code to make it build
- # https://github.com/OpenImageIO/oiio/issues/403
- rm */pugixml* || die
-
- # fix man page building
- # https://github.com/OpenImageIO/oiio/issues/404
- use qt4 || sed -i -e '/list.*APPEND.*cli_tools.*iv/d' doc/CMakeLists.txt
-
- use python && python_fix_shebang .
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
- -DBUILDSTATIC=OFF
- -DLINKSTATIC=OFF
- $(use python && echo -DPYLIB_INSTALL_DIR="$(python_get_sitedir)")
- -DUSE_EXTERNAL_PUGIXML=ON
- -DUSE_FIELD3D=OFF # missing in Portage
- -DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
- -DSTOP_ON_WARNING=OFF
- $(cmake-utils_use_use truetype freetype)
- $(cmake-utils_use_use colorio OCIO)
- $(cmake-utils_use_use opencv)
- $(cmake-utils_use_use opengl)
- $(cmake-utils_use_use jpeg2k OPENJPEG)
- $(cmake-utils_use_use python)
- $(cmake-utils_use_use qt4 QT)
- $(cmake-utils_use_use tbb)
- $(cmake-utils_use_use ssl OPENSSL)
- $(cmake-utils_use_use gif)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- rm -rf "${ED}"/usr/share/doc
- dodoc ../{CHANGES,CREDITS,README*} # doc/CLA-{CORPORATE,INDIVIDUAL}
- docinto pdf
- dodoc doc/*.pdf
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
@ 2017-12-21 20:16 Patrice Clement
0 siblings, 0 replies; 11+ messages in thread
From: Patrice Clement @ 2017-12-21 20:16 UTC (permalink / raw
To: gentoo-commits
commit: 3075eade9d4edba26a19f36577bd5f094b3da890
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Thu Sep 28 17:42:09 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Thu Dec 21 20:16:34 2017 +0000
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 00000000000..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 <j.scruggs@gmail.com>
+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 override them as desired:
+-set (PYLIB_INSTALL_DIR ${DEFAULT_PYLIB_INSTALL_DIR} CACHE STRING
+- "Install location for python libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-set (PYLIB3_INSTALL_DIR ${DEFAULT_PYLIB3_INSTALL_DIR} CACHE STRING
+- "Install location for python3 libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-
++# Set default install options
+ set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
+
+ set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
+@@ -442,14 +415,9 @@ if (NOT EMBEDPLUGINS)
+ add_subdirectory (src/zfile.imageio)
+ endif ()
+
+-if (USE_PYTHON AND oiio_boost_PYTHON_FOUND AND NOT BUILD_OIIOUTIL_ONLY)
++if (USE_PYTHON AND NOT BUILD_OIIOUTIL_ONLY)
+ add_subdirectory (src/python)
+ endif ()
+-if (USE_PYTHON3 AND NOT BUILD_OIIOUTIL_ONLY)
+- #build the python3 module in a different binary directory since it will
+- #have the same name as the python2 module (e.g. OpenImageIO.so)
+- add_subdirectory (src/python src/python3)
+-endif ()
+
+ add_subdirectory (src/include)
+ add_subdirectory (src/doc)
+diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
+index 4799df22..2576dee5 100644
+--- a/src/cmake/externalpackages.cmake
++++ b/src/cmake/externalpackages.cmake
+@@ -102,10 +102,7 @@ if (NOT Boost_FIND_QUIETLY)
+ endif ()
+
+ if (NOT DEFINED Boost_ADDITIONAL_VERSIONS)
+- set (Boost_ADDITIONAL_VERSIONS "1.60" "1.59" "1.58" "1.57" "1.56"
+- "1.55" "1.54" "1.53" "1.52" "1.51" "1.50"
+- "1.49" "1.48" "1.47" "1.46" "1.45" "1.44"
+- "1.43" "1.43.0" "1.42" "1.42.0")
++ set (Boost_ADDITIONAL_VERSIONS "1.65.1" "1.65" "1.63" "1.62")
+ endif ()
+ if (LINKSTATIC)
+ set (Boost_USE_STATIC_LIBS ON)
+@@ -117,51 +114,7 @@ if (BOOST_CUSTOM)
+ # Boost_VERSION, Boost_INCLUDE_DIRS, Boost_LIBRARY_DIRS, Boost_LIBRARIES.
+ else ()
+ set (Boost_COMPONENTS filesystem regex system thread)
+- find_package (Boost 1.42 REQUIRED
+- COMPONENTS ${Boost_COMPONENTS}
+- )
+-
+- # Try to figure out if this boost distro has Boost::python. If we
+- # include python in the component list above, cmake will abort if
+- # it's not found. So we resort to checking for the boost_python
+- # library's existance to get a soft failure.
+- find_library (oiio_boost_python_lib boost_python
+- PATHS ${Boost_LIBRARY_DIRS} NO_DEFAULT_PATH)
+- mark_as_advanced (oiio_boost_python_lib)
+- if (NOT oiio_boost_python_lib AND Boost_SYSTEM_LIBRARY_RELEASE)
+- get_filename_component (oiio_boost_PYTHON_rel
+- ${Boost_SYSTEM_LIBRARY_RELEASE} NAME
+- )
+- string (REGEX REPLACE "^(lib)?(.+)_system(.+)$" "\\2_python\\3"
+- oiio_boost_PYTHON_rel ${oiio_boost_PYTHON_rel}
+- )
+- find_library (oiio_boost_PYTHON_LIBRARY_RELEASE
+- NAMES ${oiio_boost_PYTHON_rel} lib${oiio_boost_PYTHON_rel}
+- HINTS ${Boost_LIBRARY_DIRS}
+- NO_DEFAULT_PATH
+- )
+- mark_as_advanced (oiio_boost_PYTHON_LIBRARY_RELEASE)
+- endif ()
+- if (NOT oiio_boost_python_lib AND Boost_SYSTEM_LIBRARY_DEBUG)
+- get_filename_component (oiio_boost_PYTHON_dbg
+- ${Boost_SYSTEM_LIBRARY_DEBUG} NAME
+- )
+- string (REGEX REPLACE "^(lib)?(.+)_system(.+)$" "\\2_python\\3"
+- oiio_boost_PYTHON_dbg ${oiio_boost_PYTHON_dbg}
+- )
+- find_library (oiio_boost_PYTHON_LIBRARY_DEBUG
+- NAMES ${oiio_boost_PYTHON_dbg} lib${oiio_boost_PYTHON_dbg}
+- HINTS ${Boost_LIBRARY_DIRS}
+- NO_DEFAULT_PATH
+- )
+- mark_as_advanced (oiio_boost_PYTHON_LIBRARY_DEBUG)
+- endif ()
+- if (oiio_boost_python_lib OR
+- oiio_boost_PYTHON_LIBRARY_RELEASE OR oiio_boost_PYTHON_LIBRARY_DEBUG)
+- set (oiio_boost_PYTHON_FOUND ON)
+- else ()
+- set (oiio_boost_PYTHON_FOUND OFF)
+- endif ()
++ find_package (Boost 1.62 REQUIRED COMPONENTS ${Boost_COMPONENTS})
+ endif ()
+
+ # On Linux, Boost 1.55 and higher seems to need to link against -lrt
+@@ -176,16 +129,6 @@ if (NOT Boost_FIND_QUIETLY)
+ message (STATUS "Boost include dirs ${Boost_INCLUDE_DIRS}")
+ message (STATUS "Boost library dirs ${Boost_LIBRARY_DIRS}")
+ message (STATUS "Boost libraries ${Boost_LIBRARIES}")
+- message (STATUS "Boost python found ${oiio_boost_PYTHON_FOUND}")
+-endif ()
+-if (NOT oiio_boost_PYTHON_FOUND)
+- # If Boost python components were not found, turn off all python support.
+- message (STATUS "Boost python support not found -- will not build python components!")
+- if (APPLE AND USE_PYTHON)
+- message (STATUS " If your Boost is from Macports, you need the +python26 variant to get Python support.")
+- endif ()
+- set (USE_PYTHON OFF)
+- set (PYTHONLIBS_FOUND OFF)
+ endif ()
+
+ include_directories (SYSTEM "${Boost_INCLUDE_DIRS}")
+diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
+index 81a4a890..e58d372d 100644
+--- a/src/python/CMakeLists.txt
++++ b/src/python/CMakeLists.txt
+@@ -1,54 +1,30 @@
+-#if the CMAKE_CURRENT_BINARY_DIR is python3, then build the python3 module,
+-#otherwise the python2 module
+-string (REGEX MATCH "python3\$" _py3_subdir ${CMAKE_CURRENT_BINARY_DIR})
++# Attempt to find the desired version, but fall back to other
++# additional versions.
++find_package (PythonInterp ${PYTHON_VERSION} REQUIRED)
+
+-if (_py3_subdir)
+- set (BUILD_PY3 ON)
+-else ()
+- set (BUILD_PY3 OFF)
+-endif ()
+-
+-if (NOT BOOST_CUSTOM AND NOT BUILD_PY3)
+- #Unset those, otherwise find_package(PythonLibs) will pick up old stuff
+- #if it has been run before
+- unset(Python_ADDITIONAL_VERSIONS)
+- unset(PYTHON_LIBRARY)
+- unset(PYTHON_LIBRARY CACHE)
+- unset(PYTHON_INCLUDE_DIR)
+- unset(PYTHON_INCLUDE_DIR CACHE)
+- unset(PYTHON_INCLUDE_PATH)
+- unset(PYTHON_INCLUDE_PATH CACHE)
+- find_package (PythonLibs ${PYTHON_VERSION} REQUIRED)
+- find_package (Boost 1.42 REQUIRED COMPONENTS python)
+-elseif (BOOST_CUSTOM AND NOT BUILD_PY3)
+- find_package (PythonLibs ${PYTHON_VERSION} REQUIRED)
+-else ()
+- #BOOST_CUSTOM is ignored for python3
++# The version that was found may not be the default or user
++# defined one.
++set (PYTHON_VERSION_FOUND ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+
+- #Unset those, otherwise find_package(PythonLibs) will pick up old stuff
+- #if it has been run before
+- unset(PYTHON_LIBRARY)
+- unset(PYTHON_LIBRARY CACHE)
+- unset(PYTHON_INCLUDE_DIR)
+- unset(PYTHON_INCLUDE_DIR CACHE)
+- unset(PYTHON_INCLUDE_PATH)
+- unset(PYTHON_INCLUDE_PATH CACHE)
++if (NOT ${PYTHON_VERSION} EQUAL ${PYTHON_VERSION_FOUND} )
++ message (WARNING "The requested version ${PYTHON_VERSION} was not found.")
++ message (WARNING "Using ${PYTHON_VERSION_FOUND} instead.")
++endif ()
+
+- #cmake 2.8 does not look for python 3.4
+- set(Python_ADDITIONAL_VERSIONS 3.4)
+- find_package (PythonInterp ${PYTHON3_VERSION} REQUIRED)
+- find_package (PythonLibs ${PYTHON3_VERSION} REQUIRED)
++find_package (PythonLibs ${PYTHON_VERSION_FOUND} REQUIRED)
+
+- #Finding the python3 component for boost is a little tricky, since it has
+- #different names on different systems. Try the most common ones
+- #(boost_python3, boost_python-py34, …).
+- foreach (_boost_py3_lib python3 python-py34 python-py33 python-py32)
+- find_package (Boost 1.42 QUIET COMPONENTS ${_boost_py3_lib})
+- string (TOUPPER ${_boost_py3_lib} boost_py3_lib_name)
+- if (Boost_${boost_py3_lib_name}_FOUND)
+- #Not the most beautiful thing to do, but that gets them included in
+- #the target_link_libraries(…) call farther down
+- set (Boost_PYTHON_LIBRARIES ${Boost_${boost_py3_lib_name}_LIBRARIES})
++if (NOT BOOST_CUSTOM)
++ # Finding the python component for boost is a little tricky, since it has
++ # different names on different systems. Try the most common ones.
++ foreach (_py_lib python-${PYTHON_VERSION_FOUND} python
++ python${PYTHON_VERSION_MAJOR}
++ python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
++ find_package (Boost QUIET COMPONENTS ${_py_lib})
++ string (TOUPPER ${_py_lib} _py_lib_name)
++ if (Boost_${_py_lib_name}_FOUND)
++ # Not the most beautiful thing to do, but that gets them included in
++ # the target_link_libraries(…) call farther down
++ set (Boost_PYTHON_LIBRARIES ${Boost_${_py_lib_name}_LIBRARIES})
+ break ()
+ endif ()
+ endforeach ()
+@@ -58,18 +34,19 @@ if (APPLE)
+ # set (PYTHON_LIBRARIES /opt/local/lib)
+ endif ()
+
++if (NOT DEFINED PYTHON_SITE_DIR)
++ set (PYTHON_SITE_DIR "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_FOUND}/site-packages")
++endif ()
++
+ # Disable some warnings for Clang, it's a little too picky with boost
+ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ add_definitions ("-Wno-array-bounds")
+ endif ()
+
+-if (BUILD_PY3)
+- set (target_name Py3OpenImageIO)
+-else ()
+- set (target_name PyOpenImageIO)
+-endif ()
++set (target_name PyOpenImageIO)
+
+-if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
++# Test if automatically found or manually set with BOOST_CUSTOM
++if (DEFINED Boost_PYTHON_LIBRARIES)
+
+ set (python_srcs py_imageinput.cpp py_imageoutput.cpp
+ py_imagecache.cpp py_imagespec.cpp py_roi.cpp
+@@ -81,8 +58,12 @@ if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
+ message (STATUS "Python found ${PYTHONLIBS_FOUND} ")
+ message (STATUS "Python include dirs ${PYTHON_INCLUDE_PATH}")
+ message (STATUS "Python libraries ${PYTHON_LIBRARIES}")
++ message (STATUS "Python site packages dir ${PYTHON_SITE_DIR}")
+ message (STATUS "Python to include 'lib' prefix: ${PYLIB_LIB_PREFIX}")
+ message (STATUS "Python to include SO version: ${PYLIB_INCLUDE_SONAME}")
++ message (STATUS "Python version ${PYTHON_VERSION_STRING}")
++ message (STATUS "Python version major: ${PYTHON_VERSION_MAJOR} minor: ${PYTHON_VERSION_MINOR}")
++ message (STATUS "Boost python libraries ${Boost_PYTHON_LIBRARIES}")
+ endif ()
+
+ include_directories (${PYTHON_INCLUDE_PATH} ${Boost_INCLUDE_DIRS})
+@@ -91,7 +72,7 @@ if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
+ target_link_libraries (${target_name} OpenImageIO ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
+ set_target_properties (${target_name} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ else ()
+- target_link_libraries (${target_name} OpenImageIO ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
++ target_link_libraries (${target_name} OpenImageIO ${SANITIZE_LIBRARIES} ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
+ endif ()
+
+ # Exclude the 'lib' prefix from the name
+@@ -123,21 +104,17 @@ if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
+ SUFFIX ".pyd")
+ endif()
+
+- if (BUILD_PY3)
+- install (TARGETS ${target_name}
+- RUNTIME DESTINATION ${PYLIB3_INSTALL_DIR} COMPONENT user
+- LIBRARY DESTINATION ${PYLIB3_INSTALL_DIR} COMPONENT user)
+- else ()
+- install (TARGETS ${target_name}
+- RUNTIME DESTINATION ${PYLIB_INSTALL_DIR} COMPONENT user
+- LIBRARY DESTINATION ${PYLIB_INSTALL_DIR} COMPONENT user)
+- endif ()
+-elseif (BUILD_PY3)
+- if (NOT PYTHONLIBS_FOUND)
+- message (STATUS "Python3 libraries not found")
+- endif ()
+- if (NOT Boost_FOUND)
+- message (STATUS "Boost python3 component not found")
+- endif ()
+- set(USE_PYTHON3 OFF)
++ install (TARGETS ${target_name}
++ RUNTIME DESTINATION ${PYTHON_SITE_DIR} COMPONENT user
++ LIBRARY DESTINATION ${PYTHON_SITE_DIR} COMPONENT user)
++else ()
++ # If Boost python components were not found, turn off all python support.
++ message (STATUS "Boost python support not found!")
++ if (APPLE AND USE_PYTHON)
++ message (STATUS " If your Boost is from Macports, you need the +python26 variant to get Python support.")
++ endif ()
++ if (BOOST_CUSTOM)
++ message (STATUS " Please set the variable Boost_PYTHON_LIBRARIES to the location of the boost python libraries.")
++ endif ()
++ message (FATAL_ERROR "Python module cannot be built. Either disable python support or check your boost installation.")
+ endif ()
+--
+2.14.2
+
diff --git a/media-libs/openimageio/files/openimageio-1.6.18-repair-breaks-after-boost-python-1.65-changes.patch b/media-libs/openimageio/files/openimageio-1.6.18-repair-breaks-after-boost-python-1.65-changes.patch
new file mode 100644
index 00000000000..622890e981e
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-1.6.18-repair-breaks-after-boost-python-1.65-changes.patch
@@ -0,0 +1,251 @@
+From 03eca9df5082e97f3b157ce7d1d86ef76016e52b Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+Date: Thu, 28 Sep 2017 16:00:16 +0100
+Subject: [PATCH 3/3] oiio/RB-1.6: Repair breaks after boost python 1.65
+ changes (#1753)
+
+Alas, the new Boost 1.65 moves some boost python material from one
+namespace to another in a way that breaks compatibility related to
+support for numpy arrays. This breaks the build, including all of
+our MacOS-based TravisCI tests, which of course pick up the latest
+Boost via Homebrew.
+
+Backported from:
+https://github.com/OpenImageIO/oiio/commit/57f294df7430a860c60612c28235730fd429ea0d
+---
+ src/python/py_imagebuf.cpp | 22 +++++++++++++++-------
+ src/python/py_imageoutput.cpp | 10 +++++-----
+ src/python/py_oiio.cpp | 22 +++++++++++++++++++---
+ src/python/py_oiio.h | 23 +++++++----------------
+ 4 files changed, 46 insertions(+), 31 deletions(-)
+
+diff --git a/src/python/py_imagebuf.cpp b/src/python/py_imagebuf.cpp
+index 28a8c537..fa271fe2 100644
+--- a/src/python/py_imagebuf.cpp
++++ b/src/python/py_imagebuf.cpp
+@@ -329,7 +329,7 @@ BOOST_PYTHON_FUNCTION_OVERLOADS(ImageBuf_get_pixels_bt_overloads,
+
+
+ bool
+-ImageBuf_set_pixels_tuple (ImageBuf &buf, ROI roi, tuple data)
++ImageBuf_set_pixels_tuple (ImageBuf &buf, ROI roi, const tuple& data)
+ {
+ if (! roi.defined())
+ roi = buf.roi();
+@@ -347,8 +347,13 @@ ImageBuf_set_pixels_tuple (ImageBuf &buf, ROI roi, tuple data)
+
+
+ bool
+-ImageBuf_set_pixels_array (ImageBuf &buf, ROI roi, numeric::array data)
++ImageBuf_set_pixels_array (ImageBuf &buf, ROI roi, const object& data)
+ {
++ // If it's a tuple, we handle that with the other function
++ extract<tuple> tup (data);
++ if (tup.check())
++ return ImageBuf_set_pixels_tuple (buf, roi, tup());
++
+ if (! roi.defined())
+ roi = buf.roi();
+ roi.chend = std::min (roi.chend, buf.nchannels()+1);
+@@ -356,13 +361,16 @@ ImageBuf_set_pixels_array (ImageBuf &buf, ROI roi, numeric::array data)
+ if (size == 0)
+ return true; // done
+
+- TypeDesc type;
+- size_t pylen = 0;
+- const void *addr = python_array_address (data, type, pylen);
+- if (!addr || size > pylen)
++ TypeDesc elementtype;
++ size_t numelements;
++ const void* addr = python_array_address (data, elementtype, numelements);
++ if (!addr || size > numelements)
+ return false; // Not enough data to fill our ROI
+
+- buf.set_pixels (roi, type, addr);
++ std::vector<float> vals (numelements);
++ convert_types (elementtype, addr, TypeDesc::TypeFloat, vals.data(),
++ int(numelements));
++ buf.set_pixels (roi, TypeDesc::TypeFloat, &vals[0]);
+ return true;
+ }
+
+diff --git a/src/python/py_imageoutput.cpp b/src/python/py_imageoutput.cpp
+index 1c2e5f3c..2203aac4 100644
+--- a/src/python/py_imageoutput.cpp
++++ b/src/python/py_imageoutput.cpp
+@@ -112,7 +112,7 @@ ImageOutputWrap::make_read_buffer (object &buffer, imagesize_t size)
+
+
+ bool
+-ImageOutputWrap::write_scanline_array (int y, int z, numeric::array &buffer)
++ImageOutputWrap::write_scanline_array (int y, int z, object &buffer)
+ {
+ TypeDesc format;
+ size_t numelements = 0;
+@@ -154,7 +154,7 @@ ImageOutputWrap::write_scanline_bt (int y, int z, TypeDesc::BASETYPE format,
+
+ bool
+ ImageOutputWrap::write_scanlines_array (int ybegin, int yend, int z,
+- numeric::array &buffer)
++ object &buffer)
+ {
+ TypeDesc format;
+ size_t numelements = 0;
+@@ -199,7 +199,7 @@ ImageOutputWrap::write_scanlines_bt (int ybegin, int yend, int z,
+
+ bool
+ ImageOutputWrap::write_tile_array (int x, int y, int z,
+- numeric::array &buffer)
++ object &buffer)
+ {
+ TypeDesc format;
+ size_t numelements = 0;
+@@ -243,7 +243,7 @@ ImageOutputWrap::write_tile_bt (int x, int y, int z, TypeDesc::BASETYPE format,
+ bool
+ ImageOutputWrap::write_tiles_array (int xbegin, int xend, int ybegin, int yend,
+ int zbegin, int zend,
+- numeric::array &buffer)
++ object &buffer)
+ {
+ TypeDesc format;
+ size_t numelements = 0;
+@@ -290,7 +290,7 @@ ImageOutputWrap::write_tiles_bt (int xbegin, int xend, int ybegin, int yend,
+
+
+ bool
+-ImageOutputWrap::write_image_array (numeric::array &buffer)
++ImageOutputWrap::write_image_array (object &buffer)
+ {
+ TypeDesc format;
+ size_t numelements = 0;
+diff --git a/src/python/py_oiio.cpp b/src/python/py_oiio.cpp
+index bc10803c..5e965089 100644
+--- a/src/python/py_oiio.cpp
++++ b/src/python/py_oiio.cpp
+@@ -78,6 +78,13 @@ typedesc_from_python_array_code (char code)
+ }
+
+
++std::string
++object_classname (const object& obj)
++{
++ return extract<std::string>(obj.attr("__class__").attr("__name__"));
++}
++
++
+
+ object
+ C_array_to_Python_array (const char *data, TypeDesc type, size_t size)
+@@ -313,11 +320,18 @@ oiio_get_string_attribute_d (const char *name, const char *defaultval)
+
+
+ const void *
+-python_array_address (numeric::array &data, TypeDesc &elementtype,
++python_array_address (const object &data, TypeDesc &elementtype,
+ size_t &numelements)
+ {
+ // Figure out the type of the array
+- object tcobj = data.attr("typecode");
++ object tcobj;
++ try {
++ tcobj = data.attr("typecode");
++ } catch(...) {
++ return NULL;
++ }
++ if (! tcobj)
++ return NULL;
+ extract<char> tce (tcobj);
+ char typecode = tce.check() ? (char)tce : 0;
+ elementtype = typedesc_from_python_array_code (typecode);
+@@ -395,7 +409,9 @@ OIIO_DECLARE_PYMODULE(OIIO_PYMODULE_NAME) {
+ scope().attr("VERSION_PATCH") = OIIO_VERSION_PATCH;
+ scope().attr("INTRO_STRING") = OIIO_INTRO_STRING;
+
+- boost::python::numeric::array::set_module_and_type("array", "array");
++ #if BOOST_VERSION < 106500
++ boost::python::numeric::array::set_module_and_type("array", "array");
++ #endif
+ }
+
+ } // namespace PyOpenImageIO
+diff --git a/src/python/py_oiio.h b/src/python/py_oiio.h
+index febe2f9e..9fc04d06 100644
+--- a/src/python/py_oiio.h
++++ b/src/python/py_oiio.h
+@@ -68,12 +68,13 @@ bool PyProgressCallback(void*, float);
+ object C_array_to_Python_array (const char *data, TypeDesc type, size_t size);
+ const char * python_array_code (TypeDesc format);
+ TypeDesc typedesc_from_python_array_code (char code);
++std::string object_classname (const object& obj);
+
+
+ // Given python array 'data', figure out its element type and number of
+ // elements, and return the memory address of its contents. Return NULL as
+ // the address for an error.
+-const void * python_array_address (numeric::array &data, TypeDesc &elementtype,
++const void * python_array_address (const object &data, TypeDesc &elementtype,
+ size_t &numelements);
+
+
+@@ -105,16 +106,6 @@ void py_to_stdvector (std::vector<T> &vals, const tuple &tup)
+
+
+
+-// Suck up a tuple of presumed T values into a vector<T>
+-template<typename T>
+-void py_to_stdvector (std::vector<T> &vals, const numeric::array &arr)
+-{
+- for (int i = 0, e = len(arr); i < e; ++i)
+- vals.push_back (extract<T>(arr[i]));
+-}
+-
+-
+-
+ // Convert an array of T values into either tuple. FUNC is a conversion
+ // function such as PyInt_FromLong, PyFloat_FromDouble, or
+ // PyString_FromString.
+@@ -312,12 +303,12 @@ public:
+ stride_t xstride=AutoStride);
+ bool write_scanline_bt (int, int, TypeDesc::BASETYPE,
+ boost::python::object&, stride_t xstride=AutoStride);
+- bool write_scanline_array (int, int, numeric::array&);
++ bool write_scanline_array (int, int, object&);
+ bool write_scanlines (int, int, int, TypeDesc, boost::python::object&,
+ stride_t xstride=AutoStride);
+ bool write_scanlines_bt (int, int, int, TypeDesc::BASETYPE,
+ boost::python::object&, stride_t xstride=AutoStride);
+- bool write_scanlines_array (int, int, int, numeric::array&);
++ bool write_scanlines_array (int, int, int, object&);
+ bool write_tile (int, int, int, TypeDesc, boost::python::object&,
+ stride_t xstride=AutoStride, stride_t ystride=AutoStride,
+ stride_t zstride=AutoStride);
+@@ -325,7 +316,7 @@ public:
+ boost::python::object&, stride_t xstride=AutoStride,
+ stride_t ystride=AutoStride,
+ stride_t zstride=AutoStride);
+- bool write_tile_array (int, int, int, numeric::array&);
++ bool write_tile_array (int, int, int, object&);
+ bool write_tiles (int, int, int, int, int, int,
+ TypeDesc, boost::python::object&,
+ stride_t xstride=AutoStride, stride_t ystride=AutoStride,
+@@ -335,7 +326,7 @@ public:
+ stride_t xstride=AutoStride,
+ stride_t ystride=AutoStride,
+ stride_t zstride=AutoStride);
+- bool write_tiles_array (int, int, int, int, int, int, numeric::array&);
++ bool write_tiles_array (int, int, int, int, int, int, object&);
+ bool write_image (TypeDesc format, object &buffer,
+ stride_t xstride=AutoStride,
+ stride_t ystride=AutoStride,
+@@ -344,7 +335,7 @@ public:
+ stride_t xstride=AutoStride,
+ stride_t ystride=AutoStride,
+ stride_t zstride=AutoStride);
+- bool write_image_array (numeric::array &buffer);
++ bool write_image_array (object &buffer);
+ bool write_deep_scanlines (int ybegin, int yend, int z,
+ const DeepData &deepdata);
+ bool write_deep_tiles (int xbegin, int xend, int ybegin, int yend,
+--
+2.14.2
+
diff --git a/media-libs/openimageio/files/openimageio-1.6.18-use-gnuinstalldirs.patch b/media-libs/openimageio/files/openimageio-1.6.18-use-gnuinstalldirs.patch
new file mode 100644
index 00000000000..eb6834d6b8f
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-1.6.18-use-gnuinstalldirs.patch
@@ -0,0 +1,247 @@
+From c078d90a6570d3cdf372f33f83057b21e44f40ad Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+Date: Thu, 28 Sep 2017 15:08:47 +0100
+Subject: [PATCH 1/2] oiio/RB-1.6: Use GNUInstallDirs for installation paths
+ (#1747)
+
+* Change all hard coded paths to GNUInstallDirs varibles.
+* Remove variable setting in install.cmake file since
+ GNUInstallDirs does all this for you.
+* Added new search paths for fonts.
+
+Backported from:
+https://github.com/OpenImageIO/oiio/commit/1383ba314ec2522b4f0c7e9037bd546b68bc2d7d
+---
+ CMakeLists.txt | 51 ++++++++------------------------
+ src/cmake/oiio_macros.cmake | 6 ++--
+ src/doc/CMakeLists.txt | 4 +--
+ src/fonts/CMakeLists.txt | 2 +-
+ src/include/CMakeLists.txt | 2 +-
+ src/libOpenImageIO/imagebufalgo_draw.cpp | 11 +++++++
+ src/nuke/txReader/CMakeLists.txt | 3 +-
+ src/nuke/txWriter/CMakeLists.txt | 3 +-
+ 8 files changed, 32 insertions(+), 50 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bcbcbf94..b29efac6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -302,6 +302,8 @@ if (NOT OIIO_NAMESPACE)
+ endif ()
+ message(STATUS "Setting Namespace to: ${OIIO_NAMESPACE}")
+
++include (GNUInstallDirs)
++
+ set (CMAKE_MODULE_PATH
+ "${PROJECT_SOURCE_DIR}/src/cmake/modules"
+ "${PROJECT_SOURCE_DIR}/src/cmake")
+@@ -319,58 +321,32 @@ include_directories (
+
+
+ ###########################################################################
+-# Paths for install tree customization. Note that relative paths are relative
+-# to CMAKE_INSTALL_PREFIX.
+-set (DEFAULT_BIN_INSTALL_DIR "bin")
+-set (DEFAULT_LIB_INSTALL_DIR "lib")
+-set (DEFAULT_INCLUDE_INSTALL_DIR "include/OpenImageIO")
++# 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)
+- # Try to be well-behaved and install into reasonable places according to
+- # the "standard" unix directory heirarchy
+ # TODO: Figure out how to get the correct python directory
+- set (DEFAULT_PYLIB_INSTALL_DIR "lib/python/site-packages")
+- set (DEFAULT_PYLIB3_INSTALL_DIR "lib/python3/site-packages")
+- set (DEFAULT_DOC_INSTALL_DIR "share/doc/OpenImageIO")
+- set (DEFAULT_MAN_INSTALL_DIR "share/man/man1")
+- set (DEFAULT_FONTS_INSTALL_DIR "share/fonts/oiio")
++ 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 OIIO related will go into its own directory, not into
+- # some standard system heirarchy.
++ # 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")
+- set (DEFAULT_DOC_INSTALL_DIR "doc")
+- set (DEFAULT_MAN_INSTALL_DIR "doc/man")
+- set (DEFAULT_FONTS_INSTALL_DIR "fonts/oiio")
+ endif ()
+ if (EXEC_INSTALL_PREFIX)
+ # Tack on an extra prefix to support multi-arch builds.
+- set (DEFAULT_BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_BIN_INSTALL_DIR}")
+- set (DEFAULT_LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_LIB_INSTALL_DIR}")
+ set (DEFAULT_PYLIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB_INSTALL_DIR}")
+ set (DEFAULT_PYLIB3_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB3_INSTALL_DIR}")
+- set (DEFAULT_FONTS_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_FONTS_INSTALL_DIR}")
+ endif ()
+ # Set up cmake cache variables corresponding to the defaults deduced above, so
+ # that the user can override them as desired:
+-set (BIN_INSTALL_DIR ${DEFAULT_BIN_INSTALL_DIR} CACHE STRING
+- "Install location for binaries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-set (LIB_INSTALL_DIR ${DEFAULT_LIB_INSTALL_DIR} CACHE STRING
+- "Install location for libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+ set (PYLIB_INSTALL_DIR ${DEFAULT_PYLIB_INSTALL_DIR} CACHE STRING
+ "Install location for python libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+ set (PYLIB3_INSTALL_DIR ${DEFAULT_PYLIB3_INSTALL_DIR} CACHE STRING
+ "Install location for python3 libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-set (INCLUDE_INSTALL_DIR ${DEFAULT_INCLUDE_INSTALL_DIR} CACHE STRING
+- "Install location of header files (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-set (DOC_INSTALL_DIR ${DEFAULT_DOC_INSTALL_DIR} CACHE STRING
+- "Install location for documentation (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-set (FONTS_INSTALL_DIR ${DEFAULT_FONTS_INSTALL_DIR} CACHE STRING
+- "Install location for fonts (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-if (UNIX)
+- set (MAN_INSTALL_DIR ${DEFAULT_MAN_INSTALL_DIR} CACHE STRING
+- "Install location for manual pages (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-endif()
++
+ set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
+
+ set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
+@@ -388,10 +364,7 @@ if (CMAKE_SKIP_RPATH)
+ set (CMAKE_SKIP_RPATH FALSE)
+ unset (CMAKE_INSTALL_RPATH)
+ else ()
+- set (CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
+- if (NOT IS_ABSOLUTE ${CMAKE_INSTALL_RPATH})
+- set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
+- endif ()
++ set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
+ set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ endif ()
+
+diff --git a/src/cmake/oiio_macros.cmake b/src/cmake/oiio_macros.cmake
+index e65020bf..22d78ccd 100644
+--- a/src/cmake/oiio_macros.cmake
++++ b/src/cmake/oiio_macros.cmake
+@@ -7,9 +7,9 @@
+ #
+ macro (oiio_install_targets)
+ install (TARGETS ${ARGN}
+- RUNTIME DESTINATION "${BIN_INSTALL_DIR}" COMPONENT user
+- LIBRARY DESTINATION "${LIB_INSTALL_DIR}" COMPONENT user
+- ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT developer)
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT user
++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT user
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT developer)
+ endmacro ()
+
+ # Macro to add a build target for an IO plugin.
+diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
+index 5e2e9866..170ff89c 100644
+--- a/src/doc/CMakeLists.txt
++++ b/src/doc/CMakeLists.txt
+@@ -7,7 +7,7 @@ set (public_docs
+ )
+
+ if (INSTALL_DOCS)
+- install (FILES ${public_docs} DESTINATION ${DOC_INSTALL_DIR}
++ install (FILES ${public_docs} DESTINATION ${CMAKE_INSTALL_DOCDIR}
+ COMPONENT documentation)
+ endif ()
+
+@@ -37,6 +37,6 @@ if (UNIX AND TXT2MAN AND PYTHONINTERP_FOUND)
+
+ if (INSTALL_DOCS)
+ install (FILES ${manpage_files}
+- DESTINATION ${MAN_INSTALL_DIR} COMPONENT documentation)
++ DESTINATION ${CMAKE_INSTALL_MANDIR} COMPONENT documentation)
+ endif ()
+ endif()
+diff --git a/src/fonts/CMakeLists.txt b/src/fonts/CMakeLists.txt
+index 1e296da0..d1bd6409 100644
+--- a/src/fonts/CMakeLists.txt
++++ b/src/fonts/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ file (GLOB public_fonts "*/*.ttf")
+
+ if (INSTALL_FONTS AND USE_FREETYPE)
+- install (FILES ${public_fonts} DESTINATION ${FONTS_INSTALL_DIR}
++ install (FILES ${public_fonts} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/fonts/OpenImageIO
+ COMPONENT fonts)
+ endif ()
+
+diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt
+index b605b53b..5cdc6542 100644
+--- a/src/include/CMakeLists.txt
++++ b/src/include/CMakeLists.txt
+@@ -17,5 +17,5 @@ set (OIIO_VERSION_NS "v${MANGLED_SOVERSION}")
+ configure_file(OpenImageIO/oiioversion.h.in "${CMAKE_BINARY_DIR}/include/OpenImageIO/oiioversion.h" @ONLY)
+ list(APPEND public_headers "${CMAKE_BINARY_DIR}/include/OpenImageIO/oiioversion.h")
+
+-install (FILES ${public_headers} DESTINATION ${INCLUDE_INSTALL_DIR}
++install (FILES ${public_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OpenImageIO
+ COMPONENT developer)
+diff --git a/src/libOpenImageIO/imagebufalgo_draw.cpp b/src/libOpenImageIO/imagebufalgo_draw.cpp
+index fb4dcf4d..cb9ef095 100644
+--- a/src/libOpenImageIO/imagebufalgo_draw.cpp
++++ b/src/libOpenImageIO/imagebufalgo_draw.cpp
+@@ -441,27 +441,38 @@ ImageBufAlgo::render_text (ImageBuf &R, int x, int y, string_view text,
+ if (home && *home) {
+ std::string h (home);
+ search_dirs.push_back (h + "/fonts");
++ search_dirs.push_back (h + "/fonts/OpenImageIO");
+ search_dirs.push_back (h + "/Fonts");
++ search_dirs.push_back (h + "/Fonts/OpenImageIO");
+ search_dirs.push_back (h + "/Library/Fonts");
++ search_dirs.push_back (h + "/Library/Fonts/OpenImageIO");
+ }
+ const char *systemRoot = getenv ("SystemRoot");
+ if (systemRoot && *systemRoot)
+ search_dirs.push_back (std::string(systemRoot) + "/Fonts");
++ search_dirs.push_back (std::string(systemRoot) + "/Fonts/OpenImageIO");
+ search_dirs.push_back ("/usr/share/fonts");
++
+ search_dirs.push_back ("/Library/Fonts");
++ search_dirs.push_back ("/Library/Fonts/OpenImageIO");
+ search_dirs.push_back ("C:/Windows/Fonts");
++ search_dirs.push_back ("C:/Windows/Fonts/OpenImageIO");
+ search_dirs.push_back ("/usr/local/share/fonts");
++ search_dirs.push_back ("/usr/local/share/fonts/OpenImageIO");
+ search_dirs.push_back ("/opt/local/share/fonts");
++ search_dirs.push_back ("/opt/local/share/fonts/OpenImageIO");
+ // Try $OPENIMAGEIOHOME/fonts
+ const char *oiiohomedir = getenv ("OPENIMAGEIOHOME");
+ if (oiiohomedir && *oiiohomedir)
+ search_dirs.push_back (std::string(oiiohomedir) + "/fonts");
++ search_dirs.push_back (std::string(oiiohomedir) + "/fonts/OpenImageIO");
+ // Try ../fonts relative to where this executing binary came from
+ std::string this_program = OIIO::Sysutil::this_program_path ();
+ if (this_program.size()) {
+ std::string path = Filesystem::parent_path (this_program);
+ path = Filesystem::parent_path (path);
+ search_dirs.push_back (path+"/fonts");
++ search_dirs.push_back (path+"/fonts/OpenImageIO");
+ }
+
+ // Try to find the font. Experiment with several extensions
+diff --git a/src/nuke/txReader/CMakeLists.txt b/src/nuke/txReader/CMakeLists.txt
+index 3e72b6d4..660a2ee1 100644
+--- a/src/nuke/txReader/CMakeLists.txt
++++ b/src/nuke/txReader/CMakeLists.txt
+@@ -28,5 +28,4 @@ else ()
+ COMPILE_FLAGS "-fPIC -msse")
+ endif ()
+
+-install (TARGETS txReader
+- LIBRARY DESTINATION "${LIB_INSTALL_DIR}/nuke")
++oiio_install_targets (txReader)
+diff --git a/src/nuke/txWriter/CMakeLists.txt b/src/nuke/txWriter/CMakeLists.txt
+index 66312bc4..0fb70a36 100644
+--- a/src/nuke/txWriter/CMakeLists.txt
++++ b/src/nuke/txWriter/CMakeLists.txt
+@@ -28,5 +28,4 @@ else ()
+ COMPILE_FLAGS "-fPIC -msse")
+ endif ()
+
+-install (TARGETS txWriter
+- LIBRARY DESTINATION "${LIB_INSTALL_DIR}/nuke")
++oiio_install_targets (txWriter)
+--
+2.14.2
+
diff --git a/media-libs/openimageio/files/openimageio-1.7.17-make-python-and-boost-detection-more-generic.patch b/media-libs/openimageio/files/openimageio-1.7.17-make-python-and-boost-detection-more-generic.patch
new file mode 100644
index 00000000000..06934ca0f06
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-1.7.17-make-python-and-boost-detection-more-generic.patch
@@ -0,0 +1,336 @@
+From 0ec53b0e2cd0713fa3e0fbe538eb1c89fe4e59d2 Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+Date: Thu, 28 Sep 2017 16:42:25 +0100
+Subject: [PATCH 2/2] oiio/RB-1.7: 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 635c61f4..0f80959a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -181,9 +181,7 @@ 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 (PYTHON_VERSION 2.6)
+-set (PYTHON3_VERSION 3.2)
++set (PYTHON_VERSION "2.7" CACHE STRING "Target version of python to find")
+ set (PYLIB_INCLUDE_SONAME OFF CACHE BOOL "If ON, soname/soversion will be set for Python module library")
+ set (PYLIB_LIB_PREFIX OFF CACHE BOOL "If ON, prefix the Python module with 'lib'")
+ set (USE_FIELD3D ON CACHE BOOL "Use Field3D if found")
+@@ -373,32 +371,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 override them as desired:
+-set (PYLIB_INSTALL_DIR ${DEFAULT_PYLIB_INSTALL_DIR} CACHE STRING
+- "Install location for python libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-set (PYLIB3_INSTALL_DIR ${DEFAULT_PYLIB3_INSTALL_DIR} CACHE STRING
+- "Install location for python3 libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-
++# Set default install options
+ set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
+
+ set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
+@@ -494,14 +467,9 @@ if (NOT EMBEDPLUGINS AND NOT BUILD_OIIOUTIL_ONLY)
+ endforeach ()
+ endif ()
+
+-if (USE_PYTHON AND boost_PYTHON_FOUND AND NOT BUILD_OIIOUTIL_ONLY)
++if (USE_PYTHON AND NOT BUILD_OIIOUTIL_ONLY)
+ add_subdirectory (src/python)
+ endif ()
+-if (USE_PYTHON3 AND boost_PYTHON_FOUND AND NOT BUILD_OIIOUTIL_ONLY)
+- #build the python3 module in a different binary directory since it will
+- #have the same name as the python2 module (e.g. OpenImageIO.so)
+- add_subdirectory (src/python src/python3)
+-endif ()
+
+ add_subdirectory (src/include)
+ add_subdirectory (src/doc)
+diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
+index 03faf7bd..b354cda0 100644
+--- a/src/cmake/externalpackages.cmake
++++ b/src/cmake/externalpackages.cmake
+@@ -116,10 +116,7 @@ if (NOT Boost_FIND_QUIETLY)
+ endif ()
+
+ if (NOT DEFINED Boost_ADDITIONAL_VERSIONS)
+- set (Boost_ADDITIONAL_VERSIONS "1.60" "1.59" "1.58" "1.57" "1.56"
+- "1.55" "1.54" "1.53" "1.52" "1.51" "1.50"
+- "1.49" "1.48" "1.47" "1.46" "1.45" "1.44"
+- "1.43" "1.43.0" "1.42" "1.42.0")
++ set (Boost_ADDITIONAL_VERSIONS "1.65.1" "1.65" "1.63" "1.62")
+ endif ()
+ if (LINKSTATIC)
+ set (Boost_USE_STATIC_LIBS ON)
+@@ -131,51 +128,7 @@ if (BOOST_CUSTOM)
+ # Boost_VERSION, Boost_INCLUDE_DIRS, Boost_LIBRARY_DIRS, Boost_LIBRARIES.
+ else ()
+ set (Boost_COMPONENTS filesystem regex system thread)
+- find_package (Boost 1.42 REQUIRED
+- COMPONENTS ${Boost_COMPONENTS}
+- )
+-
+- # Try to figure out if this boost distro has Boost::python. If we
+- # include python in the component list above, cmake will abort if
+- # it's not found. So we resort to checking for the boost_python
+- # library's existance to get a soft failure.
+- find_library (my_boost_python_lib boost_python
+- PATHS ${Boost_LIBRARY_DIRS} NO_DEFAULT_PATH)
+- mark_as_advanced (my_boost_python_lib)
+- if (NOT my_boost_python_lib AND Boost_SYSTEM_LIBRARY_RELEASE)
+- get_filename_component (my_boost_PYTHON_rel
+- ${Boost_SYSTEM_LIBRARY_RELEASE} NAME
+- )
+- string (REGEX REPLACE "^(lib)?(.+)_system(.+)$" "\\2_python\\3"
+- my_boost_PYTHON_rel ${my_boost_PYTHON_rel}
+- )
+- find_library (my_boost_PYTHON_LIBRARY_RELEASE
+- NAMES ${my_boost_PYTHON_rel} lib${my_boost_PYTHON_rel}
+- HINTS ${Boost_LIBRARY_DIRS}
+- NO_DEFAULT_PATH
+- )
+- mark_as_advanced (my_boost_PYTHON_LIBRARY_RELEASE)
+- endif ()
+- if (NOT my_boost_python_lib AND Boost_SYSTEM_LIBRARY_DEBUG)
+- get_filename_component (my_boost_PYTHON_dbg
+- ${Boost_SYSTEM_LIBRARY_DEBUG} NAME
+- )
+- string (REGEX REPLACE "^(lib)?(.+)_system(.+)$" "\\2_python\\3"
+- my_boost_PYTHON_dbg ${my_boost_PYTHON_dbg}
+- )
+- find_library (my_boost_PYTHON_LIBRARY_DEBUG
+- NAMES ${my_boost_PYTHON_dbg} lib${my_boost_PYTHON_dbg}
+- HINTS ${Boost_LIBRARY_DIRS}
+- NO_DEFAULT_PATH
+- )
+- mark_as_advanced (my_boost_PYTHON_LIBRARY_DEBUG)
+- endif ()
+- if (my_boost_python_lib OR
+- my_boost_PYTHON_LIBRARY_RELEASE OR my_boost_PYTHON_LIBRARY_DEBUG)
+- set (boost_PYTHON_FOUND ON)
+- else ()
+- set (boost_PYTHON_FOUND OFF)
+- endif ()
++ find_package (Boost 1.62 REQUIRED COMPONENTS ${Boost_COMPONENTS})
+ endif ()
+
+ # On Linux, Boost 1.55 and higher seems to need to link against -lrt
+@@ -190,16 +143,6 @@ if (NOT Boost_FIND_QUIETLY)
+ message (STATUS "Boost include dirs ${Boost_INCLUDE_DIRS}")
+ message (STATUS "Boost library dirs ${Boost_LIBRARY_DIRS}")
+ message (STATUS "Boost libraries ${Boost_LIBRARIES}")
+- message (STATUS "Boost python found ${boost_PYTHON_FOUND}")
+-endif ()
+-if (NOT boost_PYTHON_FOUND)
+- # If Boost python components were not found, turn off all python support.
+- message (STATUS "Boost python support not found -- will not build python components!")
+- if (APPLE AND USE_PYTHON)
+- message (STATUS " If your Boost is from Macports, you need the +python26 variant to get Python support.")
+- endif ()
+- set (USE_PYTHON OFF)
+- set (PYTHONLIBS_FOUND OFF)
+ endif ()
+
+ include_directories (SYSTEM "${Boost_INCLUDE_DIRS}")
+diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
+index 81a4a890..e58d372d 100644
+--- a/src/python/CMakeLists.txt
++++ b/src/python/CMakeLists.txt
+@@ -1,54 +1,30 @@
+-#if the CMAKE_CURRENT_BINARY_DIR is python3, then build the python3 module,
+-#otherwise the python2 module
+-string (REGEX MATCH "python3\$" _py3_subdir ${CMAKE_CURRENT_BINARY_DIR})
++# Attempt to find the desired version, but fall back to other
++# additional versions.
++find_package (PythonInterp ${PYTHON_VERSION} REQUIRED)
+
+-if (_py3_subdir)
+- set (BUILD_PY3 ON)
+-else ()
+- set (BUILD_PY3 OFF)
+-endif ()
+-
+-if (NOT BOOST_CUSTOM AND NOT BUILD_PY3)
+- #Unset those, otherwise find_package(PythonLibs) will pick up old stuff
+- #if it has been run before
+- unset(Python_ADDITIONAL_VERSIONS)
+- unset(PYTHON_LIBRARY)
+- unset(PYTHON_LIBRARY CACHE)
+- unset(PYTHON_INCLUDE_DIR)
+- unset(PYTHON_INCLUDE_DIR CACHE)
+- unset(PYTHON_INCLUDE_PATH)
+- unset(PYTHON_INCLUDE_PATH CACHE)
+- find_package (PythonLibs ${PYTHON_VERSION} REQUIRED)
+- find_package (Boost 1.42 REQUIRED COMPONENTS python)
+-elseif (BOOST_CUSTOM AND NOT BUILD_PY3)
+- find_package (PythonLibs ${PYTHON_VERSION} REQUIRED)
+-else ()
+- #BOOST_CUSTOM is ignored for python3
++# The version that was found may not be the default or user
++# defined one.
++set (PYTHON_VERSION_FOUND ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
+
+- #Unset those, otherwise find_package(PythonLibs) will pick up old stuff
+- #if it has been run before
+- unset(PYTHON_LIBRARY)
+- unset(PYTHON_LIBRARY CACHE)
+- unset(PYTHON_INCLUDE_DIR)
+- unset(PYTHON_INCLUDE_DIR CACHE)
+- unset(PYTHON_INCLUDE_PATH)
+- unset(PYTHON_INCLUDE_PATH CACHE)
++if (NOT ${PYTHON_VERSION} EQUAL ${PYTHON_VERSION_FOUND} )
++ message (WARNING "The requested version ${PYTHON_VERSION} was not found.")
++ message (WARNING "Using ${PYTHON_VERSION_FOUND} instead.")
++endif ()
+
+- #cmake 2.8 does not look for python 3.4
+- set(Python_ADDITIONAL_VERSIONS 3.4)
+- find_package (PythonInterp ${PYTHON3_VERSION} REQUIRED)
+- find_package (PythonLibs ${PYTHON3_VERSION} REQUIRED)
++find_package (PythonLibs ${PYTHON_VERSION_FOUND} REQUIRED)
+
+- #Finding the python3 component for boost is a little tricky, since it has
+- #different names on different systems. Try the most common ones
+- #(boost_python3, boost_python-py34, …).
+- foreach (_boost_py3_lib python3 python-py34 python-py33 python-py32)
+- find_package (Boost 1.42 QUIET COMPONENTS ${_boost_py3_lib})
+- string (TOUPPER ${_boost_py3_lib} boost_py3_lib_name)
+- if (Boost_${boost_py3_lib_name}_FOUND)
+- #Not the most beautiful thing to do, but that gets them included in
+- #the target_link_libraries(…) call farther down
+- set (Boost_PYTHON_LIBRARIES ${Boost_${boost_py3_lib_name}_LIBRARIES})
++if (NOT BOOST_CUSTOM)
++ # Finding the python component for boost is a little tricky, since it has
++ # different names on different systems. Try the most common ones.
++ foreach (_py_lib python-${PYTHON_VERSION_FOUND} python
++ python${PYTHON_VERSION_MAJOR}
++ python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
++ find_package (Boost QUIET COMPONENTS ${_py_lib})
++ string (TOUPPER ${_py_lib} _py_lib_name)
++ if (Boost_${_py_lib_name}_FOUND)
++ # Not the most beautiful thing to do, but that gets them included in
++ # the target_link_libraries(…) call farther down
++ set (Boost_PYTHON_LIBRARIES ${Boost_${_py_lib_name}_LIBRARIES})
+ break ()
+ endif ()
+ endforeach ()
+@@ -58,18 +34,19 @@ if (APPLE)
+ # set (PYTHON_LIBRARIES /opt/local/lib)
+ endif ()
+
++if (NOT DEFINED PYTHON_SITE_DIR)
++ set (PYTHON_SITE_DIR "${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_FOUND}/site-packages")
++endif ()
++
+ # Disable some warnings for Clang, it's a little too picky with boost
+ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ add_definitions ("-Wno-array-bounds")
+ endif ()
+
+-if (BUILD_PY3)
+- set (target_name Py3OpenImageIO)
+-else ()
+- set (target_name PyOpenImageIO)
+-endif ()
++set (target_name PyOpenImageIO)
+
+-if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
++# Test if automatically found or manually set with BOOST_CUSTOM
++if (DEFINED Boost_PYTHON_LIBRARIES)
+
+ set (python_srcs py_imageinput.cpp py_imageoutput.cpp
+ py_imagecache.cpp py_imagespec.cpp py_roi.cpp
+@@ -81,8 +58,12 @@ if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
+ message (STATUS "Python found ${PYTHONLIBS_FOUND} ")
+ message (STATUS "Python include dirs ${PYTHON_INCLUDE_PATH}")
+ message (STATUS "Python libraries ${PYTHON_LIBRARIES}")
++ message (STATUS "Python site packages dir ${PYTHON_SITE_DIR}")
+ message (STATUS "Python to include 'lib' prefix: ${PYLIB_LIB_PREFIX}")
+ message (STATUS "Python to include SO version: ${PYLIB_INCLUDE_SONAME}")
++ message (STATUS "Python version ${PYTHON_VERSION_STRING}")
++ message (STATUS "Python version major: ${PYTHON_VERSION_MAJOR} minor: ${PYTHON_VERSION_MINOR}")
++ message (STATUS "Boost python libraries ${Boost_PYTHON_LIBRARIES}")
+ endif ()
+
+ include_directories (${PYTHON_INCLUDE_PATH} ${Boost_INCLUDE_DIRS})
+@@ -91,7 +72,7 @@ if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
+ target_link_libraries (${target_name} OpenImageIO ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
+ set_target_properties (${target_name} PROPERTIES LINK_FLAGS "-undefined dynamic_lookup")
+ else ()
+- target_link_libraries (${target_name} OpenImageIO ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
++ target_link_libraries (${target_name} OpenImageIO ${SANITIZE_LIBRARIES} ${Boost_LIBRARIES} ${Boost_PYTHON_LIBRARIES} ${PYTHON_LIBRARIES} ${CMAKE_DL_LIBS})
+ endif ()
+
+ # Exclude the 'lib' prefix from the name
+@@ -123,21 +104,17 @@ if (BOOST_CUSTOM OR Boost_FOUND AND PYTHONLIBS_FOUND)
+ SUFFIX ".pyd")
+ endif()
+
+- if (BUILD_PY3)
+- install (TARGETS ${target_name}
+- RUNTIME DESTINATION ${PYLIB3_INSTALL_DIR} COMPONENT user
+- LIBRARY DESTINATION ${PYLIB3_INSTALL_DIR} COMPONENT user)
+- else ()
+- install (TARGETS ${target_name}
+- RUNTIME DESTINATION ${PYLIB_INSTALL_DIR} COMPONENT user
+- LIBRARY DESTINATION ${PYLIB_INSTALL_DIR} COMPONENT user)
+- endif ()
+-elseif (BUILD_PY3)
+- if (NOT PYTHONLIBS_FOUND)
+- message (STATUS "Python3 libraries not found")
+- endif ()
+- if (NOT Boost_FOUND)
+- message (STATUS "Boost python3 component not found")
+- endif ()
+- set(USE_PYTHON3 OFF)
++ install (TARGETS ${target_name}
++ RUNTIME DESTINATION ${PYTHON_SITE_DIR} COMPONENT user
++ LIBRARY DESTINATION ${PYTHON_SITE_DIR} COMPONENT user)
++else ()
++ # If Boost python components were not found, turn off all python support.
++ message (STATUS "Boost python support not found!")
++ if (APPLE AND USE_PYTHON)
++ message (STATUS " If your Boost is from Macports, you need the +python26 variant to get Python support.")
++ endif ()
++ if (BOOST_CUSTOM)
++ message (STATUS " Please set the variable Boost_PYTHON_LIBRARIES to the location of the boost python libraries.")
++ endif ()
++ message (FATAL_ERROR "Python module cannot be built. Either disable python support or check your boost installation.")
+ endif ()
+--
+2.14.2
+
diff --git a/media-libs/openimageio/files/openimageio-1.7.17-use-gnuinstalldirs.patch b/media-libs/openimageio/files/openimageio-1.7.17-use-gnuinstalldirs.patch
new file mode 100644
index 00000000000..e77b362be69
--- /dev/null
+++ b/media-libs/openimageio/files/openimageio-1.7.17-use-gnuinstalldirs.patch
@@ -0,0 +1,247 @@
+From 603f85536982669f2618be061511c48c93e1c5e9 Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+Date: Thu, 28 Sep 2017 16:35:26 +0100
+Subject: [PATCH 1/2] oiio/RB-1.7: Use GNUInstallDirs for installation paths
+ (#1747)
+
+* Change all hard coded paths to GNUInstallDirs varibles.
+* Remove variable setting in install.cmake file since
+ GNUInstallDirs does all this for you.
+* Added new search paths for fonts.
+
+Backported from:
+https://github.com/OpenImageIO/oiio/commit/1383ba314ec2522b4f0c7e9037bd546b68bc2d7d
+---
+ CMakeLists.txt | 51 ++++++++------------------------
+ src/cmake/oiio_macros.cmake | 6 ++--
+ src/doc/CMakeLists.txt | 4 +--
+ src/fonts/CMakeLists.txt | 2 +-
+ src/include/CMakeLists.txt | 2 +-
+ src/libOpenImageIO/imagebufalgo_draw.cpp | 11 +++++++
+ src/nuke/txReader/CMakeLists.txt | 3 +-
+ src/nuke/txWriter/CMakeLists.txt | 3 +-
+ 8 files changed, 32 insertions(+), 50 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ca8da565..635c61f4 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -353,6 +353,8 @@ if (LINKSTATIC)
+ set (Boost_USE_STATIC_LIBS 1)
+ endif ()
+
++include (GNUInstallDirs)
++
+ set (CMAKE_MODULE_PATH
+ "${PROJECT_SOURCE_DIR}/src/cmake/modules"
+ "${PROJECT_SOURCE_DIR}/src/cmake")
+@@ -371,58 +373,32 @@ include_directories (
+
+
+ ###########################################################################
+-# Paths for install tree customization. Note that relative paths are relative
+-# to CMAKE_INSTALL_PREFIX.
+-set (DEFAULT_BIN_INSTALL_DIR "bin")
+-set (DEFAULT_LIB_INSTALL_DIR "lib")
+-set (DEFAULT_INCLUDE_INSTALL_DIR "include/OpenImageIO")
++# 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)
+- # Try to be well-behaved and install into reasonable places according to
+- # the "standard" unix directory heirarchy
+ # TODO: Figure out how to get the correct python directory
+- set (DEFAULT_PYLIB_INSTALL_DIR "lib/python/site-packages")
+- set (DEFAULT_PYLIB3_INSTALL_DIR "lib/python3/site-packages")
+- set (DEFAULT_DOC_INSTALL_DIR "share/doc/OpenImageIO")
+- set (DEFAULT_MAN_INSTALL_DIR "share/man/man1")
+- set (DEFAULT_FONTS_INSTALL_DIR "share/fonts/oiio")
++ 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 OIIO related will go into its own directory, not into
+- # some standard system heirarchy.
++ # 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")
+- set (DEFAULT_DOC_INSTALL_DIR "doc")
+- set (DEFAULT_MAN_INSTALL_DIR "doc/man")
+- set (DEFAULT_FONTS_INSTALL_DIR "fonts/oiio")
+ endif ()
+ if (EXEC_INSTALL_PREFIX)
+ # Tack on an extra prefix to support multi-arch builds.
+- set (DEFAULT_BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_BIN_INSTALL_DIR}")
+- set (DEFAULT_LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_LIB_INSTALL_DIR}")
+ set (DEFAULT_PYLIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB_INSTALL_DIR}")
+ set (DEFAULT_PYLIB3_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB3_INSTALL_DIR}")
+- set (DEFAULT_FONTS_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_FONTS_INSTALL_DIR}")
+ endif ()
+ # Set up cmake cache variables corresponding to the defaults deduced above, so
+ # that the user can override them as desired:
+-set (BIN_INSTALL_DIR ${DEFAULT_BIN_INSTALL_DIR} CACHE STRING
+- "Install location for binaries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-set (LIB_INSTALL_DIR ${DEFAULT_LIB_INSTALL_DIR} CACHE STRING
+- "Install location for libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+ set (PYLIB_INSTALL_DIR ${DEFAULT_PYLIB_INSTALL_DIR} CACHE STRING
+ "Install location for python libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+ set (PYLIB3_INSTALL_DIR ${DEFAULT_PYLIB3_INSTALL_DIR} CACHE STRING
+ "Install location for python3 libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-set (INCLUDE_INSTALL_DIR ${DEFAULT_INCLUDE_INSTALL_DIR} CACHE STRING
+- "Install location of header files (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-set (DOC_INSTALL_DIR ${DEFAULT_DOC_INSTALL_DIR} CACHE STRING
+- "Install location for documentation (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-set (FONTS_INSTALL_DIR ${DEFAULT_FONTS_INSTALL_DIR} CACHE STRING
+- "Install location for fonts (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-if (UNIX)
+- set (MAN_INSTALL_DIR ${DEFAULT_MAN_INSTALL_DIR} CACHE STRING
+- "Install location for manual pages (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-endif()
++
+ set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
+
+ set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
+@@ -440,10 +416,7 @@ if (CMAKE_SKIP_RPATH)
+ set (CMAKE_SKIP_RPATH FALSE)
+ unset (CMAKE_INSTALL_RPATH)
+ else ()
+- set (CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
+- if (NOT IS_ABSOLUTE ${CMAKE_INSTALL_RPATH})
+- set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${LIB_INSTALL_DIR}")
+- endif ()
++ set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
+ set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ endif ()
+ set (MACOSX_RPATH ON)
+diff --git a/src/cmake/oiio_macros.cmake b/src/cmake/oiio_macros.cmake
+index ee7be325..bfd07413 100644
+--- a/src/cmake/oiio_macros.cmake
++++ b/src/cmake/oiio_macros.cmake
+@@ -7,9 +7,9 @@
+ #
+ macro (oiio_install_targets)
+ install (TARGETS ${ARGN}
+- RUNTIME DESTINATION "${BIN_INSTALL_DIR}" COMPONENT user
+- LIBRARY DESTINATION "${LIB_INSTALL_DIR}" COMPONENT user
+- ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT developer)
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT user
++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT user
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT developer)
+ endmacro ()
+
+ # Macro to add a build target for an IO plugin.
+diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
+index eea04340..a3dc1e71 100644
+--- a/src/doc/CMakeLists.txt
++++ b/src/doc/CMakeLists.txt
+@@ -7,7 +7,7 @@ set (public_docs
+ )
+
+ if (INSTALL_DOCS)
+- install (FILES ${public_docs} DESTINATION ${DOC_INSTALL_DIR}
++ install (FILES ${public_docs} DESTINATION ${CMAKE_INSTALL_DOCDIR}
+ COMPONENT documentation)
+ endif ()
+
+@@ -39,6 +39,6 @@ if (UNIX AND TXT2MAN AND PYTHONINTERP_FOUND)
+
+ if (INSTALL_DOCS)
+ install (FILES ${manpage_files}
+- DESTINATION ${MAN_INSTALL_DIR} COMPONENT documentation)
++ DESTINATION ${CMAKE_INSTALL_MANDIR} COMPONENT documentation)
+ endif ()
+ endif()
+diff --git a/src/fonts/CMakeLists.txt b/src/fonts/CMakeLists.txt
+index 1e296da0..d1bd6409 100644
+--- a/src/fonts/CMakeLists.txt
++++ b/src/fonts/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ file (GLOB public_fonts "*/*.ttf")
+
+ if (INSTALL_FONTS AND USE_FREETYPE)
+- install (FILES ${public_fonts} DESTINATION ${FONTS_INSTALL_DIR}
++ install (FILES ${public_fonts} DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/fonts/OpenImageIO
+ COMPONENT fonts)
+ endif ()
+
+diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt
+index b063e6f3..3aa96877 100644
+--- a/src/include/CMakeLists.txt
++++ b/src/include/CMakeLists.txt
+@@ -19,5 +19,5 @@ set (OIIO_BUILD_CPP14 ${USE_CPP14})
+ configure_file(OpenImageIO/oiioversion.h.in "${CMAKE_BINARY_DIR}/include/OpenImageIO/oiioversion.h" @ONLY)
+ list(APPEND public_headers "${CMAKE_BINARY_DIR}/include/OpenImageIO/oiioversion.h")
+
+-install (FILES ${public_headers} DESTINATION ${INCLUDE_INSTALL_DIR}
++install (FILES ${public_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OpenImageIO
+ COMPONENT developer)
+diff --git a/src/libOpenImageIO/imagebufalgo_draw.cpp b/src/libOpenImageIO/imagebufalgo_draw.cpp
+index 4e3cc985..a877ff6e 100644
+--- a/src/libOpenImageIO/imagebufalgo_draw.cpp
++++ b/src/libOpenImageIO/imagebufalgo_draw.cpp
+@@ -685,27 +685,38 @@ ImageBufAlgo::render_text (ImageBuf &R, int x, int y, string_view text,
+ if (home && *home) {
+ std::string h (home);
+ search_dirs.push_back (h + "/fonts");
++ search_dirs.push_back (h + "/fonts/OpenImageIO");
+ search_dirs.push_back (h + "/Fonts");
++ search_dirs.push_back (h + "/Fonts/OpenImageIO");
+ search_dirs.push_back (h + "/Library/Fonts");
++ search_dirs.push_back (h + "/Library/Fonts/OpenImageIO");
+ }
+ const char *systemRoot = getenv ("SystemRoot");
+ if (systemRoot && *systemRoot)
+ search_dirs.push_back (std::string(systemRoot) + "/Fonts");
++ search_dirs.push_back (std::string(systemRoot) + "/Fonts/OpenImageIO");
+ search_dirs.push_back ("/usr/share/fonts");
++
+ search_dirs.push_back ("/Library/Fonts");
++ search_dirs.push_back ("/Library/Fonts/OpenImageIO");
+ search_dirs.push_back ("C:/Windows/Fonts");
++ search_dirs.push_back ("C:/Windows/Fonts/OpenImageIO");
+ search_dirs.push_back ("/usr/local/share/fonts");
++ search_dirs.push_back ("/usr/local/share/fonts/OpenImageIO");
+ search_dirs.push_back ("/opt/local/share/fonts");
++ search_dirs.push_back ("/opt/local/share/fonts/OpenImageIO");
+ // Try $OPENIMAGEIOHOME/fonts
+ const char *oiiohomedir = getenv ("OPENIMAGEIOHOME");
+ if (oiiohomedir && *oiiohomedir)
+ search_dirs.push_back (std::string(oiiohomedir) + "/fonts");
++ search_dirs.push_back (std::string(oiiohomedir) + "/fonts/OpenImageIO");
+ // Try ../fonts relative to where this executing binary came from
+ std::string this_program = OIIO::Sysutil::this_program_path ();
+ if (this_program.size()) {
+ std::string path = Filesystem::parent_path (this_program);
+ path = Filesystem::parent_path (path);
+ search_dirs.push_back (path+"/fonts");
++ search_dirs.push_back (path+"/fonts/OpenImageIO");
+ }
+
+ // Try to find the font. Experiment with several extensions
+diff --git a/src/nuke/txReader/CMakeLists.txt b/src/nuke/txReader/CMakeLists.txt
+index 3e72b6d4..660a2ee1 100644
+--- a/src/nuke/txReader/CMakeLists.txt
++++ b/src/nuke/txReader/CMakeLists.txt
+@@ -28,5 +28,4 @@ else ()
+ COMPILE_FLAGS "-fPIC -msse")
+ endif ()
+
+-install (TARGETS txReader
+- LIBRARY DESTINATION "${LIB_INSTALL_DIR}/nuke")
++oiio_install_targets (txReader)
+diff --git a/src/nuke/txWriter/CMakeLists.txt b/src/nuke/txWriter/CMakeLists.txt
+index 66312bc4..0fb70a36 100644
+--- a/src/nuke/txWriter/CMakeLists.txt
++++ b/src/nuke/txWriter/CMakeLists.txt
+@@ -28,5 +28,4 @@ else ()
+ COMPILE_FLAGS "-fPIC -msse")
+ endif ()
+
+-install (TARGETS txWriter
+- LIBRARY DESTINATION "${LIB_INSTALL_DIR}/nuke")
++oiio_install_targets (txWriter)
+--
+2.14.2
+
diff --git a/media-libs/openimageio/metadata.xml b/media-libs/openimageio/metadata.xml
index f8f22f8b6fd..935e4012def 100644
--- a/media-libs/openimageio/metadata.xml
+++ b/media-libs/openimageio/metadata.xml
@@ -6,8 +6,20 @@
<name>Gentoo Graphics Project</name>
</maintainer>
<use>
+ <flag name="cpu_flags_x86_avx512f" restrict=">=media-libs/openimageio-1.7.11">
+ SIMD Optimization
+ </flag>
+ <flag name="cpu_flags_x86_f16c" restrict=">=media-libs/openimageio-1.7.11">
+ SIMD Optimization
+ </flag>
<flag name="colorio">Use <pkg>media-libs/opencolorio</pkg></flag>
+ <flag name="field3d" restrict=">=media-libs/openimageio-1.6.18">
+ Use <pkg>media-libs/Field3D</pkg>
+ </flag>
<flag name="opencv">Use <pkg>media-libs/opencv</pkg></flag>
+ <flag name="ptex" restrict=">=media-libs/openimageio-1.6.18">
+ Use <pkg>media-libs/ptex</pkg>
+ </flag>
<flag name="tbb">Use <pkg>dev-cpp/tbb</pkg></flag>
</use>
<upstream>
diff --git a/media-libs/openimageio/openimageio-1.6.18.ebuild b/media-libs/openimageio/openimageio-1.6.18.ebuild
new file mode 100644
index 00000000000..874a927f7b8
--- /dev/null
+++ b/media-libs/openimageio/openimageio-1.6.18.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2017 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 vcs-snapshot 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 )
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="colorio doc ffmpeg field3d gif jpeg2k opencv opengl ptex python qt4 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="test" #431412
+
+RDEPEND="dev-libs/boost:=
+ dev-libs/pugixml:0=
+ media-libs/ilmbase:=
+ media-libs/libpng:0=
+ >=media-libs/libwebp-0.2.1:=
+ media-libs/openexr:=
+ media-libs/tiff:0=
+ sys-libs/zlib:=
+ virtual/jpeg:=
+ colorio? ( media-libs/opencolorio:0= )
+ ffmpeg? ( media-video/ffmpeg:0= )
+ field3d? ( media-libs/Field3D )
+ gif? ( media-libs/giflib:0= )
+ jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
+ opencv? ( media-libs/opencv:= )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ ptex? ( media-libs/ptex )
+ python? (
+ ${PYTHON_DEPS}
+ dev-libs/boost:=[python,${PYTHON_USEDEP}]
+ )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtopengl:4
+ media-libs/glew:=
+ )
+ raw? ( media-libs/libraw:0= )
+ ssl? ( dev-libs/openssl:0= )
+ truetype? ( media-libs/freetype:2= )"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
+ "${FILESDIR}/${P}-make-python-and-boost-detection-more-generic.patch"
+ "${FILESDIR}/${P}-repair-breaks-after-boost-python-1.65-changes.patch"
+)
+
+DOCS=( CHANGES CREDITS README.rst src/doc/${PN}.pdf )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ # Build with SIMD support (choices: 0, sse2, sse3,"
+ # ssse3, sse4.1, sse4.2)"
+ local cpufeature
+ local mysimd=()
+ for cpufeature in "${CPU_FEATURES[@]}"; do
+ use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+ done
+ # If no CPU SIMDs were used, completely disable them
+ [[ -z ${mysimd} ]] && mysimd=("0")
+
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DINSTALL_DOCS=$(usex doc)
+ -DOIIO_BUILD_CPP11=ON
+ -DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
+ -DSTOP_ON_WARNING=OFF
+ -DUSE_EXTERNAL_PUGIXML=ON
+ -DUSE_FFMPEG=$(usex ffmpeg)
+ -DUSE_FIELD3D=$(usex field3d)
+ -DUSE_FREETYPE=$(usex truetype)
+ -DUSE_GIF=$(usex gif)
+ -DUSE_JPEGTURBO=ON
+ -DUSE_LIBRAW=$(usex raw)
+ -DUSE_NUKE=NO # Missing in Gentoo
+ -DUSE_OCIO=$(usex colorio)
+ -DUSE_OPENCV=$(usex opencv)
+ -DUSE_OPENGL=$(usex opengl)
+ -DUSE_OPENJPEG=$(usex jpeg2k)
+ -DUSE_OPENSSL=$(usex ssl)
+ -DUSE_PTEX=$(usex ptex)
+ -DUSE_PYTHON=$(usex python)
+ -DUSE_QT=$(usex qt4)
+ -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/media-libs/openimageio/openimageio-1.7.17.ebuild b/media-libs/openimageio/openimageio-1.7.17.ebuild
new file mode 100644
index 00000000000..20a3d954203
--- /dev/null
+++ b/media-libs/openimageio/openimageio-1.7.17.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2017 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 vcs-snapshot 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 opencv opengl ptex python qt4 raw ssl +truetype ${CPU_FEATURES[@]%:*}"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RESTRICT="test" #431412
+
+RDEPEND=">=dev-libs/boost-1.62:=
+ dev-libs/pugixml:=
+ >=media-libs/ilmbase-2.2.0-r1:=
+ media-libs/libpng:0=
+ >=media-libs/libwebp-0.2.1:=
+ >=media-libs/openexr-2.2.0-r2:=
+ media-libs/tiff:0=
+ sys-libs/zlib:=
+ virtual/jpeg:=
+ colorio? ( media-libs/opencolorio:= )
+ ffmpeg? ( media-video/ffmpeg:= )
+ field3d? ( media-libs/Field3D:= )
+ gif? ( media-libs/giflib:0= )
+ jpeg2k? ( >=media-libs/openjpeg-1.5:0= )
+ opencv? ( media-libs/opencv:= )
+ opengl? (
+ virtual/glu
+ virtual/opengl
+ )
+ ptex? ( media-libs/ptex:= )
+ python? (
+ ${PYTHON_DEPS}
+ dev-libs/boost:=[python,${PYTHON_USEDEP}]
+ )
+ qt4? (
+ dev-qt/qtcore:4
+ dev-qt/qtgui:4
+ dev-qt/qtopengl:4
+ media-libs/glew:=
+ )
+ raw? ( media-libs/libraw:= )
+ ssl? ( dev-libs/openssl:0= )
+ truetype? ( media-libs/freetype:2= )"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen[latex] )"
+
+PATCHES=(
+ "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
+ "${FILESDIR}/${P}-make-python-and-boost-detection-more-generic.patch"
+)
+
+DOCS=( CHANGES.md CREDITS.md README.md src/doc/${PN}.pdf )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ # Build with SIMD support
+ local cpufeature
+ local mysimd=()
+ for cpufeature in "${CPU_FEATURES[@]}"; do
+ use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+ done
+
+ # If no CPU SIMDs were used, completely disable them
+ [[ -z ${mysimd} ]] && mysimd=("0")
+
+ local mycmakeargs=(
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DINSTALL_DOCS=$(usex doc)
+ -DOIIO_BUILD_TESTS=OFF # as they are RESTRICTed
+ -DSTOP_ON_WARNING=OFF
+ -DUSE_CPP14=ON
+ -DUSE_EXTERNAL_PUGIXML=ON
+ -DUSE_FFMPEG=$(usex ffmpeg)
+ -DUSE_FIELD3D=$(usex field3d)
+ -DUSE_FREETYPE=$(usex truetype)
+ -DUSE_GIF=$(usex gif)
+ -DUSE_JPEGTURBO=ON
+ -DUSE_LIBRAW=$(usex raw)
+ -DUSE_NUKE=NO # Missing in Gentoo
+ -DUSE_NUKE=OFF
+ -DUSE_OCIO=$(usex colorio)
+ -DUSE_OPENCV=$(usex opencv)
+ -DUSE_OPENGL=$(usex opengl)
+ -DUSE_OPENJPEG=$(usex jpeg2k)
+ -DUSE_OPENSSL=$(usex ssl)
+ -DUSE_PTEX=$(usex ptex)
+ -DUSE_PYTHON=$(usex python)
+ -DUSE_QT=$(usex qt4)
+ -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ )
+
+ cmake-utils_src_configure
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/
@ 2016-05-05 20:09 Michael Palimaka
0 siblings, 0 replies; 11+ messages in thread
From: Michael Palimaka @ 2016-05-05 20:09 UTC (permalink / raw
To: gentoo-commits
commit: 5d45436825d316d669267866653d93f3d605d9fa
Author: Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu May 5 20:06:34 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu May 5 20:09:37 2016 +0000
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..0000000
--- 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..0000000
--- 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 >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
-
- # remove bundled code to make it build
- # https://github.com/OpenImageIO/oiio/issues/403
- rm */pugixml* || die
-
- # fix man page building
- # https://github.com/OpenImageIO/oiio/issues/404
- use qt4 || sed -i -e '/list.*APPEND.*cli_tools.*iv/d' doc/CMakeLists.txt
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR=/usr/$(get_libdir)
- -DBUILDSTATIC=OFF
- -DLINKSTATIC=OFF
- $(use python && echo -DPYLIB_INSTALL_DIR=$(python_get_sitedir))
- -DUSE_EXTERNAL_PUGIXML=ON
- -DUSE_FIELD3D=OFF # missing in Portage
- $(cmake-utils_use_use truetype freetype)
- $(cmake-utils_use_use colorio OCIO)
- $(cmake-utils_use_use opencv)
- $(cmake-utils_use_use opengl)
- $(cmake-utils_use_use jpeg2k OPENJPEG)
- $(cmake-utils_use_use python)
- $(cmake-utils_use_use qt4 QT)
- $(cmake-utils_use_use tbb)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- rm -rf "${ED}"/usr/share/doc
- dodoc ../{CHANGES,CREDITS,README*} # doc/CLA-{CORPORATE,INDIVIDUAL}
- docinto pdf
- dodoc doc/*.pdf
-}
diff --git a/media-libs/openimageio/openimageio-1.1.7.ebuild b/media-libs/openimageio/openimageio-1.1.7.ebuild
deleted file mode 100644
index 0b632d0..0000000
--- a/media-libs/openimageio/openimageio-1.1.7.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-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="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:=
- python? ( || ( <media-libs/opencv-2.4.8 >=media-libs/opencv-2.4.8[python,${PYTHON_USEDEP}] ) )
- )
- opengl? (
- virtual/glu
- virtual/opengl
- )
- python? ( ${PYTHON_DEPS} )
- 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() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- # remove bundled code to make it build
- # https://github.com/OpenImageIO/oiio/issues/403
- rm */pugixml* || die
-
- # fix man page building
- # https://github.com/OpenImageIO/oiio/issues/404
- use qt4 || sed -i -e '/list.*APPEND.*cli_tools.*iv/d' doc/CMakeLists.txt
-
- use python && python_fix_shebang .
-}
-
-src_configure() {
- local mycmakeargs=(
- -DLIB_INSTALL_DIR="/usr/$(get_libdir)"
- -DBUILDSTATIC=OFF
- -DLINKSTATIC=OFF
- $(use python && echo -DPYLIB_INSTALL_DIR="$(python_get_sitedir)")
- -DUSE_EXTERNAL_PUGIXML=ON
- -DUSE_FIELD3D=OFF # missing in Portage
- $(cmake-utils_use_use truetype freetype)
- $(cmake-utils_use_use colorio OCIO)
- $(cmake-utils_use_use opencv)
- $(cmake-utils_use_use opengl)
- $(cmake-utils_use_use jpeg2k OPENJPEG)
- $(cmake-utils_use_use python)
- $(cmake-utils_use_use qt4 QT)
- $(cmake-utils_use_use tbb)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- cmake-utils_src_install
-
- rm -rf "${ED}"/usr/share/doc
- dodoc ../{CHANGES,CREDITS,README*} # doc/CLA-{CORPORATE,INDIVIDUAL}
- docinto pdf
- dodoc doc/*.pdf
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-08-03 7:49 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-02-12 3:55 [gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/, media-libs/openimageio/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-08-03 7:49 Andrew Ammerlaan
2022-02-12 16:43 Sam James
2022-02-12 16:25 Sam James
2019-06-10 19:51 Andreas Sturmlechner
2019-04-21 18:24 Andreas Sturmlechner
2019-01-07 12:38 Lars Wendler
2018-04-27 12:13 Alexis Ballier
2018-01-22 21:52 Patrice Clement
2017-12-21 20:16 Patrice Clement
2016-05-05 20:09 Michael Palimaka
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox