* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/files/, media-libs/openexr/
@ 2017-09-28 12:50 Alexis Ballier
0 siblings, 0 replies; 11+ messages in thread
From: Alexis Ballier @ 2017-09-28 12:50 UTC (permalink / raw
To: gentoo-commits
commit: dd4ad81b5d8ba426b3d2d75b27f9993119f73e30
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Sat Sep 23 13:04:39 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Sep 28 12:45:07 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd4ad81b
media-libs/openexr: Revision bump to 2.2.0-r2
* Added patch to fix a typo in the C bindings
* Added patch to install the missing header files
* Added patch to fix security issues:
CVE-2017-9110, CVE-2017-9111, CVE-2017-9112, CVE-2017-9113,
CVE-2017-9114, CVE-2017-9115, CVE-2017-9116
* Fixed build system patch
* Added tabs in the metadata.xml file
Closes: https://bugs.gentoo.org/616996
Closes: https://bugs.gentoo.org/631382
Closes: https://bugs.gentoo.org/620324
....2.0-CVE-2017-9110-to-9116-security-fixes.patch | 98 ++++++++++++++++++++++
.../openexr-2.2.0-Fix-typo-in-C-bindings.patch | 26 ++++++
| 60 +++++++++++++
.../files/openexr-2.2.0-fix-build-system.patch | 4 +-
media-libs/openexr/metadata.xml | 9 +-
media-libs/openexr/openexr-2.2.0-r2.ebuild | 64 ++++++++++++++
6 files changed, 256 insertions(+), 5 deletions(-)
diff --git a/media-libs/openexr/files/openexr-2.2.0-CVE-2017-9110-to-9116-security-fixes.patch b/media-libs/openexr/files/openexr-2.2.0-CVE-2017-9110-to-9116-security-fixes.patch
new file mode 100644
index 00000000000..0a37ee9c2d9
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.2.0-CVE-2017-9110-to-9116-security-fixes.patch
@@ -0,0 +1,98 @@
+From c2b32f21cbe2db7c7ef485d62ffe9bec8eaa5165 Mon Sep 17 00:00:00 2001
+From: Shawn Walker-Salas <shawn.walker@oracle.com>
+Date: Tue, 30 May 2017 19:07:52 -0700
+Subject: [PATCH] CVE-2017-{9110,9111,9112,9113,9114,9115,9116} fixes
+
+---
+ OpenEXR/IlmImf/ImfDwaCompressor.cpp | 7 ++++++-
+ OpenEXR/IlmImf/ImfHuf.cpp | 10 ++++++----
+ OpenEXR/IlmImf/ImfPizCompressor.cpp | 6 ++++++
+ 3 files changed, 18 insertions(+), 5 deletions(-)
+
+diff --git a/IlmImf/ImfDwaCompressor.cpp b/IlmImf/ImfDwaCompressor.cpp
+index 1c1bd45..2ef8878 100644
+--- a/IlmImf/ImfDwaCompressor.cpp
++++ b/IlmImf/ImfDwaCompressor.cpp
+@@ -2377,7 +2377,12 @@ DwaCompressor::uncompress
+
+ const char *dataPtr = inPtr + NUM_SIZES_SINGLE * sizeof(Int64);
+
+- if (inSize < headerSize + compressedSize)
++ /* Both the sum and individual sizes are checked in case of overflow. */
++ if (inSize < (headerSize + compressedSize) ||
++ inSize < unknownCompressedSize ||
++ inSize < acCompressedSize ||
++ inSize < dcCompressedSize ||
++ inSize < rleCompressedSize)
+ {
+ throw Iex::InputExc("Error uncompressing DWA data"
+ "(truncated file).");
+diff --git a/IlmImf/ImfHuf.cpp b/IlmImf/ImfHuf.cpp
+index a375d05..97909a5 100644
+--- a/IlmImf/ImfHuf.cpp
++++ b/IlmImf/ImfHuf.cpp
+@@ -822,7 +822,7 @@ hufEncode // return: output size (in bits)
+ }
+
+
+-#define getCode(po, rlc, c, lc, in, out, oe) \
++#define getCode(po, rlc, c, lc, in, out, ob, oe)\
+ { \
+ if (po == rlc) \
+ { \
+@@ -835,6 +835,8 @@ hufEncode // return: output size (in bits)
+ \
+ if (out + cs > oe) \
+ tooMuchData(); \
++ else if (out - 1 < ob) \
++ notEnoughData(); \
+ \
+ unsigned short s = out[-1]; \
+ \
+@@ -895,7 +897,7 @@ hufDecode
+ //
+
+ lc -= pl.len;
+- getCode (pl.lit, rlc, c, lc, in, out, oe);
++ getCode (pl.lit, rlc, c, lc, in, out, outb, oe);
+ }
+ else
+ {
+@@ -925,7 +927,7 @@ hufDecode
+ //
+
+ lc -= l;
+- getCode (pl.p[j], rlc, c, lc, in, out, oe);
++ getCode (pl.p[j], rlc, c, lc, in, out, outb, oe);
+ break;
+ }
+ }
+@@ -952,7 +954,7 @@ hufDecode
+ if (pl.len)
+ {
+ lc -= pl.len;
+- getCode (pl.lit, rlc, c, lc, in, out, oe);
++ getCode (pl.lit, rlc, c, lc, in, out, outb, oe);
+ }
+ else
+ {
+diff --git a/IlmImf/ImfPizCompressor.cpp b/IlmImf/ImfPizCompressor.cpp
+index 46c6fba..8b3ee38 100644
+--- a/IlmImf/ImfPizCompressor.cpp
++++ b/IlmImf/ImfPizCompressor.cpp
+@@ -573,6 +573,12 @@ PizCompressor::uncompress (const char *inPtr,
+ int length;
+ Xdr::read <CharPtrIO> (inPtr, length);
+
++ if (length > inSize)
++ {
++ throw InputExc ("Error in header for PIZ-compressed data "
++ "(invalid array length).");
++ }
++
+ hufUncompress (inPtr, length, _tmpBuffer, tmpBufferEnd - _tmpBuffer);
+
+ //
+--
+2.14.1
+
diff --git a/media-libs/openexr/files/openexr-2.2.0-Fix-typo-in-C-bindings.patch b/media-libs/openexr/files/openexr-2.2.0-Fix-typo-in-C-bindings.patch
new file mode 100644
index 00000000000..966e95e72c3
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.2.0-Fix-typo-in-C-bindings.patch
@@ -0,0 +1,26 @@
+From c229dfe63380f41dfae1e977b10dfc7c49c7efc7 Mon Sep 17 00:00:00 2001
+From: Edward Kmett <ekmett@gmail.com>
+Date: Wed, 9 Dec 2015 12:15:48 -0500
+Subject: [PATCH] Fix typo in C bindings (Close #140)
+
+IMF_RAMDOM_Y should be IMF_RANDOM_Y
+---
+ OpenEXR/IlmImf/ImfCRgbaFile.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/IlmImf/ImfCRgbaFile.h b/IlmImf/ImfCRgbaFile.h
+index 5ac2bf8..db58247 100644
+--- a/IlmImf/ImfCRgbaFile.h
++++ b/IlmImf/ImfCRgbaFile.h
+@@ -98,7 +98,7 @@ typedef struct ImfRgba ImfRgba;
+
+ #define IMF_INCREASING_Y 0
+ #define IMF_DECREASING_Y 1
+-#define IMF_RAMDOM_Y 2
++#define IMF_RANDOM_Y 2
+
+
+ /*
+--
+2.14.1
+
--git a/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch b/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch
new file mode 100644
index 00000000000..1075cd9a30f
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch
@@ -0,0 +1,60 @@
+From a018f82655402421a995565dd4a5192259cbc207 Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+Date: Sat, 23 Sep 2017 10:36:40 +0100
+Subject: [PATCH] OpenEXR: Install missing header files
+
+Some header files are not installed via Autotools, but are with
+CMake which breaks compatibility with certain programs. This patch
+enables Autotools to install these header files.
+
+Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
+---
+ OpenEXR/IlmImf/Makefile.am | 3 ++-
+ OpenEXR/IlmImfUtil/Makefile.am | 17 +++++++++++++++++
+ 2 files changed, 19 insertions(+), 1 deletion(-)
+
+diff --git a/IlmImf/Makefile.am b/IlmImf/Makefile.am
+index a7c219c..b7b96ac 100644
+--- a/IlmImf/Makefile.am
++++ b/IlmImf/Makefile.am
+@@ -162,7 +162,8 @@ libIlmImfinclude_HEADERS = ImfForward.h ImfAttribute.h ImfBoxAttribute.h \
+ ImfMisc.h \
+ ImfPartHelper.h \
+ ImfDeepImageState.h \
+- ImfDeepImageStateAttribute.h
++ ImfDeepImageStateAttribute.h \
++ ImfFloatVectorAttribute.h
+
+ noinst_HEADERS = ImfCompressor.h \
+ ImfRleCompressor.h \
+diff --git a/IlmImfUtil/Makefile.am b/IlmImfUtil/Makefile.am
+index 8005ee1..e1d3674 100644
+--- a/IlmImfUtil/Makefile.am
++++ b/IlmImfUtil/Makefile.am
+@@ -33,6 +33,23 @@ libIlmImfUtil_la_LIBADD = -L$(top_builddir)/IlmImf $(ILMBASE_LIBS) -lIlmImf
+
+ libIlmImfUtilincludedir = $(includedir)/OpenEXR
+
++libIlmImfUtilinclude_HEADERS = ImfFlatImage.h \
++ ImfDeepImage.h \
++ ImfDeepImageChannel.h \
++ ImfImageLevel.h \
++ ImfDeepImageLevel.h \
++ ImfDeepImageIO.h \
++ ImfImageChannelRenaming.h \
++ ImfImageIO.h \
++ ImfFlatImageChannel.h \
++ ImfImage.h \
++ ImfFlatImageLevel.h \
++ ImfImageDataWindow.h \
++ ImfSampleCountChannel.h \
++ ImfFlatImageIO.h \
++ ImfImageChannel.h
++
++
+ EXTRA_DIST = CMakeLists.txt
+
+ INCLUDES = \
+--
+2.14.1
+
diff --git a/media-libs/openexr/files/openexr-2.2.0-fix-build-system.patch b/media-libs/openexr/files/openexr-2.2.0-fix-build-system.patch
index 446e4e53c87..3ccfb1da7ac 100644
--- a/media-libs/openexr/files/openexr-2.2.0-fix-build-system.patch
+++ b/media-libs/openexr/files/openexr-2.2.0-fix-build-system.patch
@@ -69,8 +69,8 @@
-AC_DEFINE_UNQUOTED(OPENEXR_VERSION_MAJOR, ${OPENEXR_VERSION_MAJOR})
-AC_DEFINE_UNQUOTED(OPENEXR_VERSION_MINOR, ${OPENEXR_VERSION_MINOR})
-AC_DEFINE_UNQUOTED(OPENEXR_VERSION_PATCH, ${OPENEXR_VERSION_PATCH})
-+AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], [${VERSION}], [OpenEXR version string])
-+AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], [${PACKAGE_STRING}], [OpenEXR version string])
++AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], ["${VERSION}"], [OpenEXR version string])
++AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], ["${PACKAGE_STRING}"], [OpenEXR version string])
+AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MAJOR], [${OPENEXR_VERSION_MAJOR}], [OpenEXR version string])
+AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MINOR], [${OPENEXR_VERSION_MINOR}], [OpenEXR version string])
+AC_DEFINE_UNQUOTED([OPENEXR_VERSION_PATCH], [${OPENEXR_VERSION_PATCH}], [OpenEXR version string])
diff --git a/media-libs/openexr/metadata.xml b/media-libs/openexr/metadata.xml
index 0427ec20bfd..fc9e500d69e 100644
--- a/media-libs/openexr/metadata.xml
+++ b/media-libs/openexr/metadata.xml
@@ -1,7 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="project">
-<email>media-video@gentoo.org</email>
-</maintainer>
+ <maintainer type="project">
+ <email>media-video@gentoo.org</email>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">openexr/openexr</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/media-libs/openexr/openexr-2.2.0-r2.ebuild b/media-libs/openexr/openexr-2.2.0-r2.ebuild
new file mode 100644
index 00000000000..91e85f36c2b
--- /dev/null
+++ b/media-libs/openexr/openexr-2.2.0-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools multilib-minimal
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="http://openexr.com/"
+SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/22" # based on SONAME
+KEYWORDS="~amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="cpu_flags_x86_avx examples static-libs"
+
+RDEPEND="
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+ >=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig[${MULTILIB_USEDEP}]
+ >=sys-devel/autoconf-archive-2016.09.16"
+
+PATCHES=(
+ "${FILESDIR}/${P}-fix-cpuid-on-abi_x86_32.patch"
+ "${FILESDIR}/${P}-use-ull-for-64-bit-literals.patch"
+ "${FILESDIR}/${P}-fix-build-system.patch"
+ "${FILESDIR}/${P}-fix-config.h-collision.patch"
+ "${FILESDIR}/${P}-Fix-typo-in-C-bindings.patch"
+ "${FILESDIR}/${P}-Install-missing-header-files.patch"
+ "${FILESDIR}/${P}-CVE-2017-9110-to-9116-security-fixes.patch"
+)
+
+src_prepare() {
+ default
+ # Fix path for testsuite
+ sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die
+
+ # delete stray config files causing havoc
+ rm -f config*/OpenEXRConfig.h* || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ --enable-threading \
+ $(use_enable cpu_flags_x86_avx avx) \
+ $(use_enable static-libs static) \
+ $(use_enable examples imfexamples)
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ if use examples; then
+ docompress -x /usr/share/doc/${PF}/examples
+ else
+ rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die
+ fi
+
+ # package provides .pc files
+ find "${D}" -name '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/files/, media-libs/openexr/
@ 2018-10-13 9:05 Mikle Kolyada
0 siblings, 0 replies; 11+ messages in thread
From: Mikle Kolyada @ 2018-10-13 9:05 UTC (permalink / raw
To: gentoo-commits
commit: 9ea27ead32a4e592780685fc71d19eb4d2ce6df1
Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 09:05:03 2018 +0000
Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 09:05:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ea27ead
media-libs/openexr: Drop old (EAPI=2)
Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11
media-libs/openexr/Manifest | 1 -
media-libs/openexr/files/openexr-1.7.0-gcc43.patch | 11 -----
media-libs/openexr/openexr-1.7.0.ebuild | 54 ----------------------
3 files changed, 66 deletions(-)
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index dee477215a0..62492ad010f 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,4 +1,3 @@
-DIST openexr-1.7.0.tar.gz 13542910 BLAKE2B f187aa1b7c703bc912bfc87eb6f9d44f1ed08dcfd466cff46845afd1e338c5cd518da54628a9cd96c08dc796aaf6f35d5a4188ac7c3db3d2cdb8bc20a70edaf0 SHA512 1fb033f909961a9778b762241e09946d19c7e75bbade7b5a942bb159eec3af9200afd722c3170165ad4b1fa602d9dbe6938112aad1716e7c7e6b8c37ee3980e0
DIST openexr-2.0.1.tar.gz 12609335 BLAKE2B 25adcf5a679a0419a7ff0ddd29d4d1c5f1c28cd3fd6c81b0a5c0cc63d907e741eaea378f4ebaa9a66afce0349edf7231ebd2bb3e493aee484860c89f05f45960 SHA512 b35e3e795496f9d4a56352c907bcffef14ae062b189c4e1df35f3ab08c5e9abf829fa9149db3198d60088fa9633816650011e5f7871e07324801b95549d6695b
DIST openexr-2.1.0.tar.gz 13680816 BLAKE2B 2d3cb4e0419160b07f1efe9a853f1d5deeb0499da4f79da201fc5eb1f57102891da666e161b2d8ec43a6f0b6ff6f5c7b92c2baae51a808892691182290192992 SHA512 d69924331c3392b8063229391414bb90f16ce317c76cfffe5fe0fcbb25e576f6ace8320b51c2a9987fee912cedd8e69116d4b49ba716b4a5f011131a81815403
DIST openexr-2.2.0.tar.gz 14489661 BLAKE2B fae3c5a255e8bf5121561687e9d704d7de3657eb38295ff96db6ddad240391379a6624483abbe619f80f0979fd9828992d236e55b5014916d4d39d6ff51d0815 SHA512 017abbeeb6b814508180721bc8e8940094965c4c55b135a198c6bcb109a04bf7f72e4aee81ee72cb2185fe818a41d892b383e8d2d59f40c673198948cb79279a
diff --git a/media-libs/openexr/files/openexr-1.7.0-gcc43.patch b/media-libs/openexr/files/openexr-1.7.0-gcc43.patch
deleted file mode 100644
index ab99eb9a19f..00000000000
--- a/media-libs/openexr/files/openexr-1.7.0-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- exrenvmap/blurImage.cpp
-+++ exrenvmap/blurImage.cpp
-@@ -39,6 +39,8 @@
- //
- //-----------------------------------------------------------------------------
-
-+#include <cstring>
-+
- #include <blurImage.h>
-
- #include <resizeImage.h>
diff --git a/media-libs/openexr/openexr-1.7.0.ebuild b/media-libs/openexr/openexr-1.7.0.ebuild
deleted file mode 100644
index ac9a2a1e958..00000000000
--- a/media-libs/openexr/openexr-1.7.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils libtool
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 -arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="examples static-libs"
-
-RDEPEND="sys-libs/zlib
- >=media-libs/ilmbase-1.0.2"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-src_prepare() {
- sed -i \
- -e "s:/var/tmp/:${T}:" \
- IlmImfTest/tmpDir.h || die # Fix path for testsuite
-
- epatch "${FILESDIR}"/${P}-gcc43.patch
-
- elibtoolize
-}
-
-src_configure() {
- econf \
- --disable-dependency-tracking \
- $(use_enable static-libs static) \
- $(use_enable examples imfexamples)
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- docdir="/usr/share/doc/${PF}/pdf" \
- examplesdir="/usr/share/doc/${PF}/examples" \
- install || die
-
- dodoc AUTHORS ChangeLog NEWS README
-
- if use examples; then
- dobin IlmImfExamples/imfexamples || die
- else
- rm -rf "${D}"/usr/share/doc/${PF}/examples
- fi
-
- find "${D}" -name '*.la' -delete
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/files/, media-libs/openexr/
@ 2019-06-04 2:51 Andreas K. Hüttel
0 siblings, 0 replies; 11+ messages in thread
From: Andreas K. Hüttel @ 2019-06-04 2:51 UTC (permalink / raw
To: gentoo-commits
commit: 96cd1a4085fc42499ed26cf2e4fc98c5bed3f577
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 4 02:50:51 2019 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jun 4 02:50:51 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96cd1a40
media-libs/openexr: Drop vulnerable versions, bug 620324
Bug: https://bugs.gentoo.org/620324
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
media-libs/openexr/Manifest | 2 -
....2.0-CVE-2017-9110-to-9116-security-fixes.patch | 98 ----
.../openexr-2.2.0-Fix-typo-in-C-bindings.patch | 26 -
.../files/openexr-2.2.0-fix-build-system.patch | 620 ---------------------
...openexr-2.2.0-use-ull-for-64-bit-literals.patch | 60 --
media-libs/openexr/openexr-2.1.0.ebuild | 46 --
media-libs/openexr/openexr-2.2.0-r2.ebuild | 67 ---
7 files changed, 919 deletions(-)
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 18de84406de..dc720965b72 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,3 +1 @@
-DIST openexr-2.1.0.tar.gz 13680816 BLAKE2B 2d3cb4e0419160b07f1efe9a853f1d5deeb0499da4f79da201fc5eb1f57102891da666e161b2d8ec43a6f0b6ff6f5c7b92c2baae51a808892691182290192992 SHA512 d69924331c3392b8063229391414bb90f16ce317c76cfffe5fe0fcbb25e576f6ace8320b51c2a9987fee912cedd8e69116d4b49ba716b4a5f011131a81815403
-DIST openexr-2.2.0.tar.gz 14489661 BLAKE2B fae3c5a255e8bf5121561687e9d704d7de3657eb38295ff96db6ddad240391379a6624483abbe619f80f0979fd9828992d236e55b5014916d4d39d6ff51d0815 SHA512 017abbeeb6b814508180721bc8e8940094965c4c55b135a198c6bcb109a04bf7f72e4aee81ee72cb2185fe818a41d892b383e8d2d59f40c673198948cb79279a
DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
diff --git a/media-libs/openexr/files/openexr-2.2.0-CVE-2017-9110-to-9116-security-fixes.patch b/media-libs/openexr/files/openexr-2.2.0-CVE-2017-9110-to-9116-security-fixes.patch
deleted file mode 100644
index 0a37ee9c2d9..00000000000
--- a/media-libs/openexr/files/openexr-2.2.0-CVE-2017-9110-to-9116-security-fixes.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From c2b32f21cbe2db7c7ef485d62ffe9bec8eaa5165 Mon Sep 17 00:00:00 2001
-From: Shawn Walker-Salas <shawn.walker@oracle.com>
-Date: Tue, 30 May 2017 19:07:52 -0700
-Subject: [PATCH] CVE-2017-{9110,9111,9112,9113,9114,9115,9116} fixes
-
----
- OpenEXR/IlmImf/ImfDwaCompressor.cpp | 7 ++++++-
- OpenEXR/IlmImf/ImfHuf.cpp | 10 ++++++----
- OpenEXR/IlmImf/ImfPizCompressor.cpp | 6 ++++++
- 3 files changed, 18 insertions(+), 5 deletions(-)
-
-diff --git a/IlmImf/ImfDwaCompressor.cpp b/IlmImf/ImfDwaCompressor.cpp
-index 1c1bd45..2ef8878 100644
---- a/IlmImf/ImfDwaCompressor.cpp
-+++ b/IlmImf/ImfDwaCompressor.cpp
-@@ -2377,7 +2377,12 @@ DwaCompressor::uncompress
-
- const char *dataPtr = inPtr + NUM_SIZES_SINGLE * sizeof(Int64);
-
-- if (inSize < headerSize + compressedSize)
-+ /* Both the sum and individual sizes are checked in case of overflow. */
-+ if (inSize < (headerSize + compressedSize) ||
-+ inSize < unknownCompressedSize ||
-+ inSize < acCompressedSize ||
-+ inSize < dcCompressedSize ||
-+ inSize < rleCompressedSize)
- {
- throw Iex::InputExc("Error uncompressing DWA data"
- "(truncated file).");
-diff --git a/IlmImf/ImfHuf.cpp b/IlmImf/ImfHuf.cpp
-index a375d05..97909a5 100644
---- a/IlmImf/ImfHuf.cpp
-+++ b/IlmImf/ImfHuf.cpp
-@@ -822,7 +822,7 @@ hufEncode // return: output size (in bits)
- }
-
-
--#define getCode(po, rlc, c, lc, in, out, oe) \
-+#define getCode(po, rlc, c, lc, in, out, ob, oe)\
- { \
- if (po == rlc) \
- { \
-@@ -835,6 +835,8 @@ hufEncode // return: output size (in bits)
- \
- if (out + cs > oe) \
- tooMuchData(); \
-+ else if (out - 1 < ob) \
-+ notEnoughData(); \
- \
- unsigned short s = out[-1]; \
- \
-@@ -895,7 +897,7 @@ hufDecode
- //
-
- lc -= pl.len;
-- getCode (pl.lit, rlc, c, lc, in, out, oe);
-+ getCode (pl.lit, rlc, c, lc, in, out, outb, oe);
- }
- else
- {
-@@ -925,7 +927,7 @@ hufDecode
- //
-
- lc -= l;
-- getCode (pl.p[j], rlc, c, lc, in, out, oe);
-+ getCode (pl.p[j], rlc, c, lc, in, out, outb, oe);
- break;
- }
- }
-@@ -952,7 +954,7 @@ hufDecode
- if (pl.len)
- {
- lc -= pl.len;
-- getCode (pl.lit, rlc, c, lc, in, out, oe);
-+ getCode (pl.lit, rlc, c, lc, in, out, outb, oe);
- }
- else
- {
-diff --git a/IlmImf/ImfPizCompressor.cpp b/IlmImf/ImfPizCompressor.cpp
-index 46c6fba..8b3ee38 100644
---- a/IlmImf/ImfPizCompressor.cpp
-+++ b/IlmImf/ImfPizCompressor.cpp
-@@ -573,6 +573,12 @@ PizCompressor::uncompress (const char *inPtr,
- int length;
- Xdr::read <CharPtrIO> (inPtr, length);
-
-+ if (length > inSize)
-+ {
-+ throw InputExc ("Error in header for PIZ-compressed data "
-+ "(invalid array length).");
-+ }
-+
- hufUncompress (inPtr, length, _tmpBuffer, tmpBufferEnd - _tmpBuffer);
-
- //
---
-2.14.1
-
diff --git a/media-libs/openexr/files/openexr-2.2.0-Fix-typo-in-C-bindings.patch b/media-libs/openexr/files/openexr-2.2.0-Fix-typo-in-C-bindings.patch
deleted file mode 100644
index 966e95e72c3..00000000000
--- a/media-libs/openexr/files/openexr-2.2.0-Fix-typo-in-C-bindings.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From c229dfe63380f41dfae1e977b10dfc7c49c7efc7 Mon Sep 17 00:00:00 2001
-From: Edward Kmett <ekmett@gmail.com>
-Date: Wed, 9 Dec 2015 12:15:48 -0500
-Subject: [PATCH] Fix typo in C bindings (Close #140)
-
-IMF_RAMDOM_Y should be IMF_RANDOM_Y
----
- OpenEXR/IlmImf/ImfCRgbaFile.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/IlmImf/ImfCRgbaFile.h b/IlmImf/ImfCRgbaFile.h
-index 5ac2bf8..db58247 100644
---- a/IlmImf/ImfCRgbaFile.h
-+++ b/IlmImf/ImfCRgbaFile.h
-@@ -98,7 +98,7 @@ typedef struct ImfRgba ImfRgba;
-
- #define IMF_INCREASING_Y 0
- #define IMF_DECREASING_Y 1
--#define IMF_RAMDOM_Y 2
-+#define IMF_RANDOM_Y 2
-
-
- /*
---
-2.14.1
-
diff --git a/media-libs/openexr/files/openexr-2.2.0-fix-build-system.patch b/media-libs/openexr/files/openexr-2.2.0-fix-build-system.patch
deleted file mode 100644
index 3ccfb1da7ac..00000000000
--- a/media-libs/openexr/files/openexr-2.2.0-fix-build-system.patch
+++ /dev/null
@@ -1,620 +0,0 @@
-* Fix completely broken build system
-* Change pdf+examples installation directory
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -1,6 +1,7 @@
- dnl Process this file with autoconf to produce a configure script.
-
- AC_INIT(OpenEXR, 2.2.0)
-+AC_CONFIG_MACRO_DIR([m4])
-
- AC_SUBST(OPENEXR_VERSION_MAJOR, 2)
- AC_SUBST(OPENEXR_VERSION_MINOR, 2)
-@@ -11,9 +12,8 @@
-
- AC_CANONICAL_HOST
- AC_CONFIG_SRCDIR(IlmImfTest/main.cpp)
--AC_CONFIG_HEADER(config/OpenEXRConfig.h)
--AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better
--AM_MAINTAINER_MODE
-+AC_CONFIG_HEADERS([config/OpenEXRConfig.h])
-+AM_INIT_AUTOMAKE
-
-
- LIBTOOL_CURRENT=22
-@@ -27,46 +27,21 @@
- AC_PROG_INSTALL
- AC_PROG_CC
- AC_PROG_LN_S
--AC_PROG_LIBTOOL
-+LT_INIT
- AC_PROG_MAKE_SET
-
- dnl
- dnl PKGCONFIG preparations
- dnl
--
--if test -z "${PKG_CONFIG_PATH}"; then
-- PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/pkgconfig
--fi
--
--LIB64_IF_EXISTS=""
--if [[ -e /usr/lib64 ]]; then
-- LIB64_IF_EXISTS="-L/usr/lib64"
--fi
--
--
--
--export PKG_CONFIG_PATH
--
--dnl
--dnl get ccflags and libs from openexr packages, then check
--dnl whether test programs compile
--AM_PATH_PKGCONFIG(
-- [ILMBASE_CXXFLAGS],
-- [ILMBASE_LDFLAGS],
-- [ILMBASE_LIBS],
-- [IlmBase],
-- [OpenEXR],
-- [$LIB64_IF_EXISTS -L/usr/local/lib],
-- [-lImath -lHalf -lIex -lIlmThread -lpthread],
-- [ilmbase-prefix])
-+PKG_CHECK_MODULES([ILMBASE], [IlmBase])
-
-
- dnl Define the version string
--AC_DEFINE_UNQUOTED(OPENEXR_VERSION_STRING, "${VERSION}")
--AC_DEFINE_UNQUOTED(OPENEXR_PACKAGE_STRING, "${PACKAGE_STRING}")
--AC_DEFINE_UNQUOTED(OPENEXR_VERSION_MAJOR, ${OPENEXR_VERSION_MAJOR})
--AC_DEFINE_UNQUOTED(OPENEXR_VERSION_MINOR, ${OPENEXR_VERSION_MINOR})
--AC_DEFINE_UNQUOTED(OPENEXR_VERSION_PATCH, ${OPENEXR_VERSION_PATCH})
-+AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], ["${VERSION}"], [OpenEXR version string])
-+AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], ["${PACKAGE_STRING}"], [OpenEXR version string])
-+AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MAJOR], [${OPENEXR_VERSION_MAJOR}], [OpenEXR version string])
-+AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MINOR], [${OPENEXR_VERSION_MINOR}], [OpenEXR version string])
-+AC_DEFINE_UNQUOTED([OPENEXR_VERSION_PATCH], [${OPENEXR_VERSION_PATCH}], [OpenEXR version string])
-
-
- dnl --enable-threading
-@@ -75,19 +50,16 @@
- [enable multi-threading [[default=yes]]]),
- [multithread="${enableval}"], [multithread=yes])
-
--if test x$PKG_CONFIG == xno && test "x${multithread}" != xno ; then
-- ACX_PTHREAD(
-- [
-- AC_DEFINE(OPENEXR_IMF_HAVE_PTHREAD)
-- ILMBASE_LIBS="$PTHREAD_LIBS $ILMBASE_LIBS"
-- ILMBASE_CXXFLAGS="$ILMBASE_CXXFLAGS $PTHREAD_CFLAGS"
-- CC="$PTHREAD_CC"
--
-- AM_POSIX_SEM()
-- ],
-- [AC_MSG_ERROR([POSIX thread support required])])
-- AC_MSG_NOTICE([multithread true, LIBS = $LIBS, CC = $CC, CXXFLAGS = $CXXFLAGS])
--fi
-+AS_IF([test "x${multithread}" != xno], [
-+ AX_PTHREAD
-+
-+ AC_DEFINE([OPENEXR_IMF_HAVE_PTHREAD], [1], [Define if pthreads are available])
-+
-+ CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
-+ CXXFLAGS="${CXXFLAGS} ${PTHREAD_CFLAGS}"
-+ LIBS="${LIBS} ${PTHREAD_CFLAGS}"
-+])
-+
-
- dnl --enable-large-stack
- case "$host" in
-@@ -110,21 +82,25 @@
- esac
-
- if test "x${large_stack}" != xno ; then
-- AC_DEFINE(OPENEXR_IMF_HAVE_LARGE_STACK)
-+ AC_DEFINE([OPENEXR_IMF_HAVE_LARGE_STACK], [1], [Define if large stack sizes are supported])
- fi
-
--AM_COMPILELINKRUN(
-- [IlmBase],
-- [ilmbasetest],
-- [$ILMBASE_CXXFLAGS],
-- [$ILMBASE_LDFLAGS],
-- [$ILMBASE_LIBS],[[
--#include <stdlib.h>
--#include <ImathFun.h>
--]],
-- [[double d = IMATH_NAMESPACE::succd(.23); d+= .2;]],
-- AC_MSG_RESULT([Compiled and ran IlmBase test program.]),
-- AC_MSG_ERROR([Could not compile IlmBase test program.]))
-+
-+
-+save_CXXFLAGS="${CXXFLAGS}"
-+save_LIBS="${LIBS}"
-+CXXFLAGS="${save_CXXFLAGS} ${ILMBASE_CFLAGS}"
-+LIBS="${save_LIBS} ${ILMBASE_LIBS}"
-+AC_LINK_IFELSE([
-+ AC_LANG_PROGRAM([[
-+ #include <stdlib.h>
-+ #include <ImathFun.h>
-+ ]], [[
-+ double d = IMATH_NAMESPACE::succd(.23); d+= .2;
-+ ]])
-+])
-+CXXFLAGS="${save_CXXFLAGS}"
-+LIBS="${save_LIBS}"
-
-
- dnl Checks for header files.
-@@ -137,74 +113,27 @@
- AC_TYPE_SIZE_T
-
- dnl Checks for zlib
--AC_CHECK_LIB(z, compress,
-- [:],
-- [AC_MSG_ERROR([
--*** OpenEXR requires a recent version of zlib, which you don't appear to
--*** have.
--***
--*** This could be because the run-time linker is not finding zlib, or it
--*** is finding the wrong version. In this case, you'll need to set your
--*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point
--*** to the proper version. Also, make sure you have run ldconfig if
--*** that is required on your system.
-- ])]
--)
-+PKG_CHECK_MODULES([ZLIB], [zlib])
-+
-+
-+dnl We use a modern toolchain, don't care
-+dnl about ancient broken stuff
-+AC_DEFINE([OPENEXR_IMF_HAVE_COMPLETE_IOMANIP], [1], [Define when std::right is available])
-
--dnl Checks for std::right etc. in iomanip
--AC_MSG_CHECKING(for complete iomanip support in C++ standard library)
--complete_iomanip="no"
--AC_LANG_SAVE
--AC_LANG_CPLUSPLUS
--AC_TRY_COMPILE([#include <iomanip>],[
--
-- std::right;
--],
--AC_DEFINE(OPENEXR_IMF_HAVE_COMPLETE_IOMANIP) complete_iomanip=yes)
--AC_MSG_RESULT($complete_iomanip)
--AC_LANG_RESTORE
--
--
--AC_MSG_CHECKING(for gcc optimization flags)
--old_cflags=$CFLAGS
--CFLAGS="$CFLAGS -pipe"
--AC_TRY_COMPILE([#include <stdio.h>],
--[ printf ("hello, world"); ],
--[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
--CFLAGS=$old_cflags
--AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
-
- dnl Check to see if the toolset supports AVX instructions in inline asm
--AC_MSG_CHECKING(for AVX instructions in GCC style inline asm)
--gcc_inline_asm_avx="no"
--AC_COMPILE_IFELSE(
-- [
-- AC_LANG_PROGRAM([],
-- [
-- #if defined(__GNUC__) && defined(__SSE2__)
-- int n = 0;
-- int eax = 0;
-- int edx = 0;
-- __asm__(
-- "xgetbv \n"
-- "vzeroupper "
-- : "=a"(eax), "=d"(edx) : "c"(n) : );
-- #else
-- #error No GCC style inline asm supported for AVX instructions
-- #endif
-- ])
-- ],
-- [
-- gcc_inline_asm_avx="yes"
-- ],
-- [
-- gcc_inline_asm_avx="no"
-- ]
--)
--AC_MSG_RESULT([$gcc_inline_asm_avx])
--if test "x${gcc_inline_asm_avx}" == xyes ; then
-- AC_DEFINE(OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX)
--fi
-+AC_ARG_ENABLE([avx],
-+ AS_HELP_STRING([--enable-avx], [Enable avx optimization]))
-+
-+AS_IF([test "x$enable_avx" = "xyes"], [
-+ dnl Enable AVX
-+ gcc_inline_asm_avx="yes"
-+ AC_DEFINE([OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX], [1], [Define if AVX is available])
-+], [
-+ dnl Disable AVX
-+ gcc_inline_asm_avx="no"
-+])
-+
-
- dnl Check if sysconf(_SC_NPROCESSORS_ONLN) can be used for CPU count
- AC_MSG_CHECKING([for sysconf(_SC_NPROCESSORS_ONLN)])
-@@ -221,16 +150,16 @@
- )
- AC_MSG_RESULT([$sysconf_nproc])
- if test "x${sysconf_nproc}" == xyes ; then
-- AC_DEFINE(OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN)
-+ AC_DEFINE([OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN], [1], [Define if sysconf(_SC_NPROCESSORS_ONLN) can be used for CPU count])
- fi
-
- dnl Platform-specific stuff
- case "$host" in
- *linux*)
-- AC_DEFINE(OPENEXR_IMF_HAVE_LINUX_PROCFS)
-+ AC_DEFINE([OPENEXR_IMF_HAVE_LINUX_PROCFS], [1], [Define if procfs is available])
- ;;
- *darwin*)
-- AC_DEFINE(OPENEXR_IMF_HAVE_DARWIN)
-+ AC_DEFINE([OPENEXR_IMF_HAVE_DARWIN], [1], [Define if on Darwin])
-
- dnl OS X universal binary support, requires --disable-dependency-tracking
- AC_ARG_ENABLE(osx-universal-binaries,
-@@ -245,19 +174,13 @@
- --disable-dependency-tracking --enable-osx-universal-binary
- ])
- fi
-- CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
-+ dnl CXXFLAGS="$CXXFLAGS -isysroot /Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
- dnl LDFLAGS="$LDFLAGS -Wl,-syslibroot,/Developer/SDKs/MacOSX10.4u.sdk -arch ppc -arch i386"
- fi
-
- ;;
- esac
-
--AM_CFLAGS="$EXTRA_OPT_CFLAGS"
--AM_CXXFLAGS="$EXTRA_OPT_CFLAGS"
--
--AC_SUBST(AM_CFLAGS)
--AC_SUBST(AM_CXXFLAGS)
--
- dnl build imfexamples example program?
- build_imfexamples="no"
- AC_ARG_ENABLE(imfexamples,
-@@ -286,7 +209,7 @@
- AM_CONDITIONAL(BUILD_IMFHUGETEST, test "x$build_imfhugetest" = xyes)
-
- if test "x${build_imfhugetest}" != xno ; then
-- AC_DEFINE(OPENEXR_IMF_HUGETEST)
-+ AC_DEFINE([OPENEXR_IMF_HUGETEST], [1], [Define if IlmImf huge input resilience])
- fi
-
-
-@@ -307,19 +230,19 @@
-
- lib_namespace="Imf"
- if test "x${library_namespace_versioning}" == xyes ; then
-- AC_DEFINE_UNQUOTED(OPENEXR_IMF_INTERNAL_NAMESPACE, Imf_${OPENEXR_VERSION_API})
-- AC_DEFINE(OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM)
-+ AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf_${OPENEXR_VERSION_API}], [OpenEXR])
-+ AC_DEFINE([OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM], [1], [OpenEXR])
-
- lib_namespace="Imf_${OPENEXR_VERSION_API}"
- LIB_SUFFIX="${OPENEXR_VERSION_API}"
- lib_suffix_valid="yes"
- elif test "x${library_namespace_versioning}" == xno ; then
-- AC_DEFINE_UNQUOTED(OPENEXR_IMF_INTERNAL_NAMESPACE, Imf)
-+ AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf], [OpenEXR])
-
- lib_namespace="Imf"
- else
-- AC_DEFINE_UNQUOTED(OPENEXR_IMF_INTERNAL_NAMESPACE, ${library_namespace_versioning} )
-- AC_DEFINE(OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM)
-+ AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [${library_namespace_versioning}], [OpenEXR])
-+ AC_DEFINE([OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM], [1], [OpenEXR])
-
- lib_namespace="${library_namespace_versioning}"
- LIB_SUFFIX="${library_namespace_versioning}"
-@@ -349,14 +272,14 @@
-
- if test "x${custom_usr_namespace}" == xyes ; then
- AC_MSG_WARN([Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf'])
-- AC_DEFINE_UNQUOTED(OPENEXR_IMF_NAMESPACE, Imf)
-+ AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR])
- usr_namespace="Imf"
- elif test "x${custom_usr_namespace}" == xno ; then
-- AC_DEFINE_UNQUOTED(OPENEXR_IMF_NAMESPACE, Imf)
-+ AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR])
- usr_namespace="Imf"
- else
-- AC_DEFINE_UNQUOTED(OPENEXR_IMF_NAMESPACE, ${custom_usr_namespace})
-- AC_DEFINE(OPENEXR_IMF_NAMESPACE_CUSTOM)
-+ AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [${custom_usr_namespace}], [OpenEXR])
-+ AC_DEFINE([OPENEXR_IMF_NAMESPACE_CUSTOM], [1], [OpenEXR])
-
- usr_namespace=${custom_usr_namespace}
- fi
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -6,5 +6,4 @@
- InterpretingDeepPixels.pdf \
- TheoryDeepPixels.pdf
-
--docdir=$(datadir)/doc/OpenEXR-@OPENEXR_VERSION@
- doc_DATA = $(EXTRA_DIST)
---- a/exrenvmap/Makefile.am
-+++ b/exrenvmap/Makefile.am
-@@ -4,11 +4,11 @@
-
- INCLUDES = -I$(top_builddir) \
- -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
-- @ILMBASE_CXXFLAGS@
-+ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
-
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@\
-+LDADD = $(ILMBASE_LIBS) \
- $(top_builddir)/IlmImf/libIlmImf.la \
-- -lz
-+ $(ZLIB_LIBS)
-
- exrenvmap_SOURCES = main.cpp EnvmapImage.cpp EnvmapImage.h \
- readInputImage.cpp readInputImage.h \
---- a/exrheader/Makefile.am
-+++ b/exrheader/Makefile.am
-@@ -4,11 +4,11 @@
-
- INCLUDES = -I$(top_builddir) \
- -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
-- @ILMBASE_CXXFLAGS@
-+ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
-
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
-+LDADD = $(ILMBASE_LIBS) \
- $(top_builddir)/IlmImf/libIlmImf.la \
-- -lz
-+ $(ZLIB_LIBS)
-
- exrheader_SOURCES = main.cpp
-
---- a/exrmakepreview/Makefile.am
-+++ b/exrmakepreview/Makefile.am
-@@ -4,11 +4,11 @@
-
- INCLUDES = -I$(top_builddir) \
- -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
-- @ILMBASE_CXXFLAGS@
-+ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
-
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@\
-+LDADD = $(ILMBASE_LIBS) \
- $(top_builddir)/IlmImf/libIlmImf.la \
-- -lz
-+ $(ZLIB_LIBS)
-
- exrmakepreview_SOURCES = main.cpp makePreview.cpp makePreview.h
-
---- a/exrmaketiled/Makefile.am
-+++ b/exrmaketiled/Makefile.am
-@@ -4,11 +4,11 @@
-
- INCLUDES = -I$(top_builddir) \
- -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
-- @ILMBASE_CXXFLAGS@
-+ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
-
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
-+LDADD = $(ILMBASE_LIBS) \
- $(top_builddir)/IlmImf/libIlmImf.la \
-- -lz
-+ $(ZLIB_LIBS)
-
- exrmaketiled_SOURCES = main.cpp \
- Image.h Image.cpp \
---- a/exrmultipart/Makefile.am
-+++ b/exrmultipart/Makefile.am
-@@ -4,11 +4,11 @@
-
- INCLUDES = -I$(top_builddir) \
- -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
--@ILMBASE_CXXFLAGS@
-+$(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
-
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
--$(top_builddir)/IlmImf/libIlmImf.la \
---lz
-+LDADD = $(ILMBASE_LIBS) \
-+ $(top_builddir)/IlmImf/libIlmImf.la \
-+ $(ZLIB_LIBS)
-
- exrmultipart_SOURCES = exrmultipart.cpp
-
---- a/exrmultiview/Makefile.am
-+++ b/exrmultiview/Makefile.am
-@@ -4,11 +4,11 @@
-
- INCLUDES = -I$(top_builddir) \
- -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
-- @ILMBASE_CXXFLAGS@
-+ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
-
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
-+LDADD = $(ILMBASE_LIBS) \
- $(top_builddir)/IlmImf/libIlmImf.la \
-- -lz
-+ $(ZLIB_LIBS)
-
- exrmultiview_SOURCES = main.cpp \
- Image.h Image.cpp \
---- a/exrstdattr/Makefile.am
-+++ b/exrstdattr/Makefile.am
-@@ -4,11 +4,11 @@
-
- INCLUDES = -I$(top_builddir) \
- -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
-- @ILMBASE_CXXFLAGS@
-+ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
-
--LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
-+LDADD = $(ILMBASE_LIBS) \
- $(top_builddir)/IlmImf/libIlmImf.la \
-- -lz
-+ $(ZLIB_LIBS)
-
- exrstdattr_SOURCES = main.cpp CMakeLists.txt
-
---- a/IlmImf/Makefile.am
-+++ b/IlmImf/Makefile.am
-@@ -93,7 +93,7 @@
- ImfSystemSpecific.cpp ImfZip.h ImfZip.cpp
-
-
--libIlmImf_la_LDFLAGS = @ILMBASE_LDFLAGS@ -version-info @LIBTOOL_VERSION@ \
-+libIlmImf_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ \
- -no-undefined
-
-
-@@ -102,7 +102,7 @@
- endif
-
-
--libIlmImf_la_LIBADD = -lz @ILMBASE_LIBS@
-+libIlmImf_la_LIBADD = $(ZLIB_LIBS) $(ILMBASE_LIBS)
-
- libIlmImfincludedir = $(includedir)/OpenEXR
-
-@@ -188,20 +188,21 @@
- EXTRA_DIST = $(noinst_HEADERS) b44ExpLogTable.cpp b44ExpLogTable.h dwaLookups.cpp dwaLookups.h CMakeLists.txt
-
-
--INCLUDES = @ILMBASE_CXXFLAGS@ \
-- -I$(top_builddir) \
-- -I$(top_srcdir)/config
-+INCLUDES = \
-+ -I$(top_builddir) \
-+ -I$(top_srcdir)/config \
-+ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
-
- CLEANFILES = b44ExpLogTable b44ExpLogTable.h dwaLookups dwaLookups.h
-
- b44ExpLogTable_SOURCES = b44ExpLogTable.cpp
--b44ExpLogTable_LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@
-+b44ExpLogTable_LDADD = $(ILMBASE_LIBS)
-
- b44ExpLogTable.h: b44ExpLogTable
- ./b44ExpLogTable > b44ExpLogTable.h
-
- dwaLookups_SOURCES = dwaLookups.cpp
--dwaLookups_LDADD = @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@
-+dwaLookups_LDADD = $(ILMBASE_LIBS)
-
- dwaLookups.h: dwaLookups
- ./dwaLookups > dwaLookups.h
---- a/IlmImfExamples/Makefile.am
-+++ b/IlmImfExamples/Makefile.am
-@@ -6,11 +6,11 @@
-
- INCLUDES = -I$(top_builddir) \
- -I$(top_srcdir)/IlmImf -I$(top_srcdir)/config \
-- @ILMBASE_CXXFLAGS@
-+ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
-
- LDADD = -L$(top_builddir)/IlmImf \
-- @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
-- -lIlmImf -lz
-+ $(ILMBASE_LIBS) \
-+ -lIlmImf $(ZLIB_CFLAGS)
-
- imfexamples_SOURCES = main.cpp drawImage.cpp rgbaInterfaceExamples.cpp \
- rgbaInterfaceTiledExamples.cpp \
-@@ -23,7 +23,7 @@
- lowLevelIoExamples.h previewImageExamples.h \
- namespaceAlias.h
-
--examplesdir = $(datadir)/doc/OpenEXR-@OPENEXR_VERSION@/examples
-+examplesdir = $(docdir)/examples
- examples_DATA = $(imfexamples_SOURCES)
-
- imfexamplesdir = $(examplesdir)
---- a/IlmImfFuzzTest/Makefile.am
-+++ b/IlmImfFuzzTest/Makefile.am
-@@ -14,11 +14,11 @@
- INCLUDES = -I$(top_builddir) \
- -I$(top_srcdir)/IlmImf \
- -I$(top_srcdir)/config \
-- @ILMBASE_CXXFLAGS@
-+ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
-
- LDADD = -L$(top_builddir)/IlmImf \
-- @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
-- -lIlmImf -lz
-+ $(ILMBASE_LIBS) \
-+ -lIlmImf $(ZLIB_LIBS)
-
- if BUILD_IMFFUZZTEST
- TESTS = IlmImfFuzzTest
---- a/IlmImfTest/Makefile.am
-+++ b/IlmImfTest/Makefile.am
-@@ -62,11 +62,11 @@
- INCLUDES = -I$(top_builddir) \
- -I$(top_srcdir)/IlmImf \
- -I$(top_srcdir)/config \
-- @ILMBASE_CXXFLAGS@
-+ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
-
- LDADD = -L$(top_builddir)/IlmImf \
-- @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
-- -lIlmImf -lz
-+ $(ILMBASE_LIBS) \
-+ -lIlmImf $(ZLIB_LIBS)
-
- TESTS = IlmImfTest
-
---- a/IlmImfUtil/Makefile.am
-+++ b/IlmImfUtil/Makefile.am
-@@ -20,7 +20,7 @@
- ImfImageChannelRenaming.h
-
-
--libIlmImfUtil_la_LDFLAGS = @ILMBASE_LDFLAGS@ -version-info @LIBTOOL_VERSION@ \
-+libIlmImfUtil_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ \
- -no-undefined
-
-
-@@ -29,14 +29,15 @@
- endif
-
-
--libIlmImfUtil_la_LIBADD = -L$(top_builddir)/IlmImf @ILMBASE_LIBS@ -lIlmImf
-+libIlmImfUtil_la_LIBADD = -L$(top_builddir)/IlmImf $(ILMBASE_LIBS) -lIlmImf
-
- libIlmImfUtilincludedir = $(includedir)/OpenEXR
-
- EXTRA_DIST = CMakeLists.txt
-
--INCLUDES = @ILMBASE_CXXFLAGS@ \
-- -I$(top_builddir) \
-- -I$(top_srcdir)/IlmImf \
-- -I$(top_srcdir)/config
-+INCLUDES = \
-+ -I$(top_builddir) \
-+ -I$(top_srcdir)/IlmImf \
-+ -I$(top_srcdir)/config \
-+ $(ILMBASE_CFLAGS)
-
---- a/IlmImfUtilTest/Makefile.am
-+++ b/IlmImfUtilTest/Makefile.am
-@@ -11,12 +11,12 @@
- -I$(top_srcdir)/IlmImf \
- -I$(top_srcdir)/IlmImfUtil \
- -I$(top_srcdir)/config \
-- @ILMBASE_CXXFLAGS@
-+ $(ILMBASE_CFLAGS) $(ZLIB_CFLAGS)
-
- LDADD = -L$(top_builddir)/IlmImf \
- -L$(top_builddir)/IlmImfUtil \
-- @ILMBASE_LDFLAGS@ @ILMBASE_LIBS@ \
-- -lIlmImfUtil -lIlmImf -lz
-+ $(ILMBASE_LIBS) \
-+ -lIlmImfUtil -lIlmImf $(ZLIB_LIBS)
-
- TESTS = IlmImfUtilTest
-
diff --git a/media-libs/openexr/files/openexr-2.2.0-use-ull-for-64-bit-literals.patch b/media-libs/openexr/files/openexr-2.2.0-use-ull-for-64-bit-literals.patch
deleted file mode 100644
index 6b107af2992..00000000000
--- a/media-libs/openexr/files/openexr-2.2.0-use-ull-for-64-bit-literals.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 57ecf581d053f5cacf2e8fc3c024490e0bbe536f Mon Sep 17 00:00:00 2001
-From: Brendan Bolles <brendan@fnordware.com>
-Date: Wed, 13 Aug 2014 19:54:10 -0700
-Subject: [PATCH] Use ULL for 64-bit literals
-
-On a 32-bit architecture, these literals are too big for just a long,
-they need to be ULL, since Int64 is unsigned.
----
- IlmImf/ImfFastHuf.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/IlmImf/ImfFastHuf.cpp b/IlmImf/ImfFastHuf.cpp
-index 86c84dc..01edad4 100644
---- a/IlmImf/ImfFastHuf.cpp
-+++ b/IlmImf/ImfFastHuf.cpp
-@@ -107,7 +107,7 @@ FastHufDecoder::FastHufDecoder
- for (int i = 0; i <= MAX_CODE_LEN; ++i)
- {
- codeCount[i] = 0;
-- base[i] = 0xffffffffffffffffL;
-+ base[i] = 0xffffffffffffffffULL;
- offset[i] = 0;
- }
-
-@@ -352,7 +352,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
-
- for (int i = 0; i <= MAX_CODE_LEN; ++i)
- {
-- if (base[i] != 0xffffffffffffffffL)
-+ if (base[i] != 0xffffffffffffffffULL)
- {
- _ljBase[i] = base[i] << (64 - i);
- }
-@@ -362,7 +362,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
- // Unused code length - insert dummy values
- //
-
-- _ljBase[i] = 0xffffffffffffffffL;
-+ _ljBase[i] = 0xffffffffffffffffULL;
- }
- }
-
-@@ -417,7 +417,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
-
- int minIdx = TABLE_LOOKUP_BITS;
-
-- while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffL)
-+ while (minIdx > 0 && _ljBase[minIdx] == 0xffffffffffffffffULL)
- minIdx--;
-
- if (minIdx < 0)
-@@ -427,7 +427,7 @@ FastHufDecoder::buildTables (Int64 *base, Int64 *offset)
- // Set the min value such that the table is never tested.
- //
-
-- _tableMin = 0xffffffffffffffffL;
-+ _tableMin = 0xffffffffffffffffULL;
- }
- else
- {
diff --git a/media-libs/openexr/openexr-2.1.0.ebuild b/media-libs/openexr/openexr-2.1.0.ebuild
deleted file mode 100644
index 14cc4d86d16..00000000000
--- a/media-libs/openexr/openexr-2.1.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-multilib
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/21" # 21 from SONAME
-KEYWORDS="amd64 -arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="examples static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]
- >=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_prepare() {
- # Fix path for testsuite
- sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die
- autotools-multilib_src_prepare
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable static-libs static)
- $(use_enable examples imfexamples)
- )
- autotools-multilib_src_configure
-}
-
-src_install() {
- autotools-multilib_src_install \
- docdir="${EPREFIX}"/usr/share/doc/${PF}/pdf \
- examplesdir="${EPREFIX}"/usr/share/doc/${PF}/examples
-
- docompress -x /usr/share/doc/${PF}/examples
-
- if ! use examples; then
- rm -rf "${ED}"/usr/share/doc/${PF}/examples
- fi
-}
diff --git a/media-libs/openexr/openexr-2.2.0-r2.ebuild b/media-libs/openexr/openexr-2.2.0-r2.ebuild
deleted file mode 100644
index 8f9775ff2e7..00000000000
--- a/media-libs/openexr/openexr-2.2.0-r2.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic multilib-minimal
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/22" # based on SONAME
-KEYWORDS="amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="cpu_flags_x86_avx examples static-libs"
-
-RDEPEND="
- sys-libs/zlib[${MULTILIB_USEDEP}]
- >=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- virtual/pkgconfig[${MULTILIB_USEDEP}]
- >=sys-devel/autoconf-archive-2016.09.16"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-cpuid-on-abi_x86_32.patch"
- "${FILESDIR}/${P}-use-ull-for-64-bit-literals.patch"
- "${FILESDIR}/${P}-fix-build-system.patch"
- "${FILESDIR}/${P}-fix-config.h-collision.patch"
- "${FILESDIR}/${P}-Fix-typo-in-C-bindings.patch"
- "${FILESDIR}/${P}-Install-missing-header-files.patch"
- "${FILESDIR}/${P}-CVE-2017-9110-to-9116-security-fixes.patch"
-)
-
-src_prepare() {
- default
- # Fix path for testsuite
- sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die
-
- # delete stray config files causing havoc
- rm -f config*/OpenEXRConfig.h* || die
-
- eautoreconf
-}
-
-multilib_src_configure() {
- # Fails to build with lto, https://bugs.gentoo.org/650876
- filter-flags -flto*
-
- ECONF_SOURCE="${S}" econf \
- --enable-threading \
- $(use_enable cpu_flags_x86_avx avx) \
- $(use_enable static-libs static) \
- $(use_enable examples imfexamples)
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use examples; then
- docompress -x /usr/share/doc/${PF}/examples
- else
- rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die
- fi
-
- # package provides .pc files
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/files/, media-libs/openexr/
@ 2020-07-02 6:03 Rémi Cardona
0 siblings, 0 replies; 11+ messages in thread
From: Rémi Cardona @ 2020-07-02 6:03 UTC (permalink / raw
To: gentoo-commits
commit: f2fb5c7d2eb5ec24b001e5ff04891750695f323f
Author: Rémi Cardona <remi <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 28 10:21:17 2020 +0000
Commit: Rémi Cardona <remi <AT> gentoo <DOT> org>
CommitDate: Thu Jul 2 06:02:01 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2fb5c7d
media-libs/openexr: fix bashisms in configure script
Bug: https://bugs.gentoo.org/724092
Package-Manager: Portage-2.3.102, Repoman-2.3.23
Signed-off-by: Rémi Cardona <remi <AT> gentoo.org>
.../openexr/files/openexr-2.3.0-fix-bashisms.patch | 117 +++++++++++++++++++++
media-libs/openexr/openexr-2.3.0.ebuild | 1 +
2 files changed, 118 insertions(+)
diff --git a/media-libs/openexr/files/openexr-2.3.0-fix-bashisms.patch b/media-libs/openexr/files/openexr-2.3.0-fix-bashisms.patch
new file mode 100644
index 00000000000..f633eb0e49f
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-fix-bashisms.patch
@@ -0,0 +1,117 @@
+From ba329cba788d4f320e6fc455919233222c27a0dd Mon Sep 17 00:00:00 2001
+From: Kimball Thurston <kdt3rd@gmail.com>
+Date: Sun, 21 Jul 2019 23:07:01 +1200
+Subject: [PATCH] Fixes #139
+
+Removes bash-isms from the autoconf bootstrap / configure.ac files
+
+Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
+---
+ IlmBase/bootstrap | 4 ++--
+ IlmBase/configure.ac | 22 ++++++++++------------
+ OpenEXR/bootstrap | 4 ++--
+ OpenEXR/configure.ac | 26 +++++++++++++-------------
+ OpenEXR_Viewers/bootstrap | 4 ++--
+ OpenEXR_Viewers/configure.ac | 15 +++++++--------
+ PyIlmBase/bootstrap | 4 ++--
+ PyIlmBase/configure.ac | 15 +++++++--------
+ 8 files changed, 45 insertions(+), 49 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+--- a/configure.ac
++++ b/configure.ac
+@@ -76,30 +76,30 @@ AC_ARG_ENABLE(cxxstd,
+ [enable ISO c++ standard 11/14 [[default=auto]]]),
+ [cxxstd="${enableval}"], [cxxstd=14])
+
+-if test "${cxxstd}" == 17 ; then
++if test "${cxxstd}" = 17 ; then
+ AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
+ CXXFLAGS="$CXXFLAGS -std=c++17"
+ else
+- if test "${cxxstd}" == 14 ; then
++ if test "${cxxstd}" = 14 ; then
+ AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory])
+ CXXFLAGS="$CXXFLAGS -std=c++14"
+ else
+- if test "${cxxstd}" == 11 ; then
++ if test "${cxxstd}" = 11 ; then
+ AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
+ CXXFLAGS="$CXXFLAGS -std=c++11"
+ else
+- if test "${cxxstd}" == 03 ; then
++ if test "${cxxstd}" = 03 ; then
+ CXXFLAGS="$CXXFLAGS -std=c++03"
+ else
+ dnl automatically determine...
+ AX_CXX_COMPILE_STDCXX([11], [noext], [optional])
+ AX_CXX_COMPILE_STDCXX([14], [noext], [optional])
+ AX_CXX_COMPILE_STDCXX([17], [noext], [optional])
+- if test "$HAVE_CXX14" == 1 ; then
++ if test "$HAVE_CXX14" = 1 ; then
+ CXXFLAGS="$CXXFLAGS -std=c++14"
+ cxxstd = 14
+ else
+- if test "$HAVE_CXX11" == 1 ; then
++ if test "$HAVE_CXX11" = 1 ; then
+ CXXFLAGS="$CXXFLAGS -std=c++11"
+ cxxstd = 11
+ fi
+@@ -216,7 +216,7 @@ AC_COMPILE_IFELSE(
+ [sysconf_nproc="no"]
+ )
+ AC_MSG_RESULT([$sysconf_nproc])
+-if test "x${sysconf_nproc}" == xyes ; then
++if test "x${sysconf_nproc}" = xyes ; then
+ AC_DEFINE([OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN], [1], [Define if sysconf(_SC_NPROCESSORS_ONLN) can be used for CPU count])
+ fi
+
+@@ -297,14 +297,14 @@ LIB_SUFFIX=""
+ lib_suffix_valid="no"
+
+ lib_namespace="Imf"
+-if test "x${library_namespace_versioning}" == xyes ; then
++if test "x${library_namespace_versioning}" = xyes ; then
+ AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf_${OPENEXR_VERSION_API}], [OpenEXR])
+ AC_DEFINE([OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM], [1], [OpenEXR])
+
+ lib_namespace="Imf_${OPENEXR_VERSION_API}"
+ LIB_SUFFIX="${OPENEXR_VERSION_API}"
+ lib_suffix_valid="yes"
+-elif test "x${library_namespace_versioning}" == xno ; then
++elif test "x${library_namespace_versioning}" = xno ; then
+ AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf], [OpenEXR])
+
+ lib_namespace="Imf"
+@@ -318,7 +318,7 @@ else
+ fi
+ AC_SUBST(LIB_SUFFIX)
+
+-if test "x${lib_suffix_valid}" == xyes ; then
++if test "x${lib_suffix_valid}" = xyes ; then
+ AC_SUBST(LIB_SUFFIX_DASH,"-${LIB_SUFFIX}")
+ AM_CONDITIONAL(LIB_SUFFIX_EXISTS,true)
+ else
+@@ -338,11 +338,11 @@ AC_ARG_ENABLE(customusernamespace,
+ [custom_usr_namespace="${enableval}"],
+ [custom_usr_namespace=no])
+
+-if test "x${custom_usr_namespace}" == xyes ; then
++if test "x${custom_usr_namespace}" = xyes ; then
+ AC_MSG_WARN([Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf'])
+ AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR])
+ usr_namespace="Imf"
+-elif test "x${custom_usr_namespace}" == xno ; then
++elif test "x${custom_usr_namespace}" = xno ; then
+ AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR])
+ usr_namespace="Imf"
+ else
+@@ -386,7 +386,7 @@ enable large stack optimizations $large_stack
+ internal library namespace $lib_namespace
+ user-client namespace $usr_namespace])
+
+-if test "x$build_osxuniversal" == xyes; then
++if test "x$build_osxuniversal" = xyes; then
+ AC_MSG_RESULT([
+ build OS X universal binaries $build_osxuniversal])
+ fi
diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild
index 5cb1f98b83b..69309c6d201 100644
--- a/media-libs/openexr/openexr-2.3.0.ebuild
+++ b/media-libs/openexr/openexr-2.3.0.ebuild
@@ -33,6 +33,7 @@ PATCHES=(
"${FILESDIR}/${PN}-2.2.0-fix-config.h-collision.patch"
"${FILESDIR}/${PN}-2.2.0-Install-missing-header-files.patch"
"${FILESDIR}/${P}-fix-build-system.patch"
+ "${FILESDIR}/${P}-fix-bashisms.patch"
# From Debian
"${FILESDIR}/${PN}-2.3.0-tests-32bits.patch"
"${FILESDIR}/${PN}-2.3.0-skip-bogus-tests.patch"
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/files/, media-libs/openexr/
@ 2021-03-31 6:31 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2021-03-31 6:31 UTC (permalink / raw
To: gentoo-commits
commit: 58d2ffc5446d020cde8d473c32485ad5f2e4c6f1
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Mar 26 16:46:35 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Mar 31 06:29:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58d2ffc5
media-libs/openexr: drop 2.3.0
Security cleanup
Bug: https://bugs.gentoo.org/770229
Bug: https://bugs.gentoo.org/762862
Bug: https://bugs.gentoo.org/746794
Bug: https://bugs.gentoo.org/717474
Bug: https://bugs.gentoo.org/656680
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/openexr/Manifest | 1 -
| 60 -----------
.../openexr-2.2.0-fix-config.h-collision.patch | 43 --------
.../openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch | 75 -------------
.../openexr/files/openexr-2.3.0-bigendian.patch | 71 -------------
.../openexr/files/openexr-2.3.0-bigendian2.patch | 17 ---
.../openexr/files/openexr-2.3.0-fix-bashisms.patch | 117 ---------------------
.../files/openexr-2.3.0-fix-build-system.patch | 68 ------------
.../files/openexr-2.3.0-skip-bogus-tests.patch | 31 ------
.../files/openexr-2.3.0-tests-32bits-2.patch | 17 ---
.../openexr/files/openexr-2.3.0-tests-32bits.patch | 36 -------
media-libs/openexr/openexr-2.3.0.ebuild | 79 --------------
12 files changed, 615 deletions(-)
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 44ef0c20a7c..bdbd8277f8a 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,2 +1 @@
-DIST openexr-2.3.0.tar.gz 18412067 BLAKE2B c73c4db4e414010ed8cc9f9631f3e8b17f47edf89b4ecb459aa00ff54a316b3bb1489e332bc029e0917ac4ffe7e152082244102029fd375f183da6741788dab7 SHA512 003f5bb3bd010be1ad9ff1798643ef711c683c8191625fe9b59070c9cb0c649c277cd506d890c6b239d9cbab80e83e16f1c1d1d74117c916ee3a80e061953123
DIST openexr-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
diff --git a/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch b/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch
deleted file mode 100644
index 1075cd9a30f..00000000000
--- a/media-libs/openexr/files/openexr-2.2.0-Install-missing-header-files.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From a018f82655402421a995565dd4a5192259cbc207 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Sat, 23 Sep 2017 10:36:40 +0100
-Subject: [PATCH] OpenEXR: Install missing header files
-
-Some header files are not installed via Autotools, but are with
-CMake which breaks compatibility with certain programs. This patch
-enables Autotools to install these header files.
-
-Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
----
- OpenEXR/IlmImf/Makefile.am | 3 ++-
- OpenEXR/IlmImfUtil/Makefile.am | 17 +++++++++++++++++
- 2 files changed, 19 insertions(+), 1 deletion(-)
-
-diff --git a/IlmImf/Makefile.am b/IlmImf/Makefile.am
-index a7c219c..b7b96ac 100644
---- a/IlmImf/Makefile.am
-+++ b/IlmImf/Makefile.am
-@@ -162,7 +162,8 @@ libIlmImfinclude_HEADERS = ImfForward.h ImfAttribute.h ImfBoxAttribute.h \
- ImfMisc.h \
- ImfPartHelper.h \
- ImfDeepImageState.h \
-- ImfDeepImageStateAttribute.h
-+ ImfDeepImageStateAttribute.h \
-+ ImfFloatVectorAttribute.h
-
- noinst_HEADERS = ImfCompressor.h \
- ImfRleCompressor.h \
-diff --git a/IlmImfUtil/Makefile.am b/IlmImfUtil/Makefile.am
-index 8005ee1..e1d3674 100644
---- a/IlmImfUtil/Makefile.am
-+++ b/IlmImfUtil/Makefile.am
-@@ -33,6 +33,23 @@ libIlmImfUtil_la_LIBADD = -L$(top_builddir)/IlmImf $(ILMBASE_LIBS) -lIlmImf
-
- libIlmImfUtilincludedir = $(includedir)/OpenEXR
-
-+libIlmImfUtilinclude_HEADERS = ImfFlatImage.h \
-+ ImfDeepImage.h \
-+ ImfDeepImageChannel.h \
-+ ImfImageLevel.h \
-+ ImfDeepImageLevel.h \
-+ ImfDeepImageIO.h \
-+ ImfImageChannelRenaming.h \
-+ ImfImageIO.h \
-+ ImfFlatImageChannel.h \
-+ ImfImage.h \
-+ ImfFlatImageLevel.h \
-+ ImfImageDataWindow.h \
-+ ImfSampleCountChannel.h \
-+ ImfFlatImageIO.h \
-+ ImfImageChannel.h
-+
-+
- EXTRA_DIST = CMakeLists.txt
-
- INCLUDES = \
---
-2.14.1
-
diff --git a/media-libs/openexr/files/openexr-2.2.0-fix-config.h-collision.patch b/media-libs/openexr/files/openexr-2.2.0-fix-config.h-collision.patch
deleted file mode 100644
index 53421194c2d..00000000000
--- a/media-libs/openexr/files/openexr-2.2.0-fix-config.h-collision.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Rename enum from VERSION to MYVERSION due to
-collision with VERSION from autoheader.
-
---- a/IlmImf/ImfDwaCompressor.cpp
-+++ b/IlmImf/ImfDwaCompressor.cpp
-@@ -1944,7 +1944,7 @@
-
- #define OBIDX(x) (Int64 *)&_outBuffer[x * sizeof (Int64)]
-
-- Int64 *version = OBIDX (VERSION);
-+ Int64 *version = OBIDX (MYVERSION);
- Int64 *unknownUncompressedSize = OBIDX (UNKNOWN_UNCOMPRESSED_SIZE);
- Int64 *unknownCompressedSize = OBIDX (UNKNOWN_COMPRESSED_SIZE);
- Int64 *acCompressedSize = OBIDX (AC_COMPRESSED_SIZE);
-@@ -2356,7 +2356,7 @@
-
- const Int64 *inPtr64 = (const Int64*) inPtr;
-
-- Int64 version = *(inPtr64 + VERSION);
-+ Int64 version = *(inPtr64 + MYVERSION);
- Int64 unknownUncompressedSize = *(inPtr64 + UNKNOWN_UNCOMPRESSED_SIZE);
- Int64 unknownCompressedSize = *(inPtr64 + UNKNOWN_COMPRESSED_SIZE);
- Int64 acCompressedSize = *(inPtr64 + AC_COMPRESSED_SIZE);
-@@ -3142,7 +3142,7 @@
-
-
- //
--// Setup channel classification rules when reading files with VERSION < 2
-+// Setup channel classification rules when reading files with MYVERSION < 2
- //
-
- void
---- a/IlmImf/ImfDwaCompressor.h
-+++ b/IlmImf/ImfDwaCompressor.h
-@@ -124,7 +124,7 @@
-
- enum DataSizesSingle
- {
-- VERSION = 0, // Version number:
-+ MYVERSION = 0, // Version number:
- // 0: classic
- // 1: adds "end of block" to the AC RLE
-
diff --git a/media-libs/openexr/files/openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch b/media-libs/openexr/files/openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch
deleted file mode 100644
index 1dc13c72407..00000000000
--- a/media-libs/openexr/files/openexr-2.2.0-fix-cpuid-on-abi_x86_32.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-$NetBSD: patch-IlmImf_ImfSystemSpecific.cpp,v 1.2 2014/08/19 13:34:42 joerg Exp $
-
-Rework cpuid function to use gnuc __get_cpuid (requiring at least gcc 4.3)
-This get's over issues such as encountered with PIC builds.
-Upstream issue : https://github.com/openexr/openexr/issues/128
-
-https://raw.githubusercontent.com/jsonn/pkgsrc/trunk/graphics/openexr/patches/patch-IlmImf_ImfSystemSpecific.cpp
-https://github.com/jsonn/pkgsrc/commit/5158af44e65b6d7b9f1a8aca2eb24cb87d003724
-https://bugs.gentoo.org/show_bug.cgi?id=626760
-
---- a/IlmImf/ImfSystemSpecific.cpp.orig 2014-08-10 04:23:57.000000000 +0000
-+++ b/IlmImf/ImfSystemSpecific.cpp
-@@ -40,21 +40,30 @@ OPENEXR_IMF_INTERNAL_NAMESPACE_SOURCE_EN
-
- namespace {
- #if defined(IMF_HAVE_SSE2) && defined(__GNUC__)
--
- // Helper functions for gcc + SSE enabled
-- void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx)
-+ void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx,
-+ unsigned int &ecx, unsigned int &edx)
- {
-+#ifdef __i386__
-+ __asm__ __volatile__ (
-+ "pushl %%ebx; cpuid; movl %%ebx, %0; popl %%ebx"
-+ : /* Output */ "=m"(ebx), "=a"(eax), "=c"(ecx), "=d"(edx)
-+ : /* Input */ "a"(n)
-+ : /* Clobber */);
-+#else
- __asm__ __volatile__ (
- "cpuid"
- : /* Output */ "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx)
- : /* Input */ "a"(n)
- : /* Clobber */);
-+#endif
- }
-
- #else // IMF_HAVE_SSE2 && __GNUC__
-
- // Helper functions for generic compiler - all disabled
-- void cpuid(int n, int &eax, int &ebx, int &ecx, int &edx)
-+ void cpuid(unsigned int n, unsigned int &eax, unsigned int &ebx,
-+ unsigned int &ecx, unsigned int &edx)
- {
- eax = ebx = ecx = edx = 0;
- }
-@@ -64,7 +73,7 @@ namespace {
-
- #ifdef OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX
-
-- void xgetbv(int n, int &eax, int &edx)
-+ void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx)
- {
- __asm__ __volatile__ (
- "xgetbv"
-@@ -75,7 +84,7 @@ namespace {
-
- #else // OPENEXR_IMF_HAVE_GCC_INLINE_ASM_AVX
-
-- void xgetbv(int n, int &eax, int &edx)
-+ void xgetbv(unsigned int n, unsigned int &eax, unsigned int &edx)
- {
- eax = edx = 0;
- }
-@@ -94,8 +103,8 @@ CpuId::CpuId():
- f16c(false)
- {
- bool osxsave = false;
-- int max = 0;
-- int eax, ebx, ecx, edx;
-+ unsigned int max = 0;
-+ unsigned int eax, ebx, ecx, edx;
-
- cpuid(0, max, ebx, ecx, edx);
- if (max > 0)
diff --git a/media-libs/openexr/files/openexr-2.3.0-bigendian.patch b/media-libs/openexr/files/openexr-2.3.0-bigendian.patch
deleted file mode 100644
index 0851fe95735..00000000000
--- a/media-libs/openexr/files/openexr-2.3.0-bigendian.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-Description: Fix test-suite on some big-endian archs
-Author: Dennis Gilmore <dennis@ausil.us>
-Bug-Debian: https://bugs.debian.org/793040
-Origin: vendor, https://github.com/openexr/openexr/issues/81
-Reviewed-by: Mathieu Malaterre <malat@debian.org>
-
-Index: openexr/IlmImfTest/testFutureProofing.cpp
-===================================================================
---- openexr.orig/IlmImfTest/testFutureProofing.cpp
-+++ openexr/IlmImfTest/testFutureProofing.cpp
-@@ -40,6 +40,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <assert.h>
-+#include <byteswap.h>
-
- #include "tmpDir.h"
- #include "testFutureProofing.h"
-@@ -64,6 +65,7 @@
- #include <ImfNamespace.h>
- #include <ImathNamespace.h>
- #include <IlmThreadNamespace.h>
-+#include <ImfSystemSpecific.h>
-
- namespace IMF = OPENEXR_IMF_NAMESPACE;
- using namespace IMF;
-@@ -1234,6 +1236,12 @@ modifyType (bool modify_version)
-
- //length of attribute
- fread(&length,4,1,f);
-+ if (!GLOBAL_SYSTEM_LITTLE_ENDIAN)
-+ {
-+ int tmp = bswap_32(length);
-+ length = tmp;
-+ }
-+
- if(!modify_version && attrib_name=="type")
- {
- // modify the type of part 1 to be 'X<whatevever>'
-Index: openexr/IlmImfTest/testMultiPartFileMixingBasic.cpp
-===================================================================
---- openexr.orig/IlmImfTest/testMultiPartFileMixingBasic.cpp
-+++ openexr/IlmImfTest/testMultiPartFileMixingBasic.cpp
-@@ -40,6 +40,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <assert.h>
-+#include <byteswap.h>
-
- #include "tmpDir.h"
- #include "testMultiPartFileMixingBasic.h"
-@@ -59,6 +60,7 @@
- #include <ImfDeepScanLineInputPart.h>
- #include <ImfPartType.h>
- #include <ImfMisc.h>
-+#include <ImfSystemSpecific.h>
-
- namespace IMF = OPENEXR_IMF_NAMESPACE;
- using namespace IMF;
-@@ -1383,6 +1385,11 @@ killOffsetTables (const std::string & fn
-
- //length of attribute
- fread(&length,4,1,f);
-+ if (!GLOBAL_SYSTEM_LITTLE_ENDIAN)
-+ {
-+ int tmp = bswap_32(length);
-+ length = tmp;
-+ }
-
- //value of attribute
- for(int i=0;i<length;i++)
diff --git a/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch b/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch
deleted file mode 100644
index cf1ad7b0902..00000000000
--- a/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Upstream is not interested in big endian arch
- Seems to only affect the test suite.
-Author: Mathieu Malaterre <malat@debian.org>
-
-Index: openexr/IlmImfTest/main.cpp
-===================================================================
---- openexr.orig/IlmImfTest/main.cpp
-+++ openexr/IlmImfTest/main.cpp
-@@ -153,7 +153,7 @@ main (int argc, char *argv[])
- TEST (testHuf, "core");
- TEST (testWav, "core");
- TEST (testRgba, "basic");
-- TEST (testSharedFrameBuffer, "basic");
-+ //TEST (testSharedFrameBuffer, "basic");
- TEST (testRgbaThreading, "basic");
- TEST (testChannels, "basic");
- TEST (testAttributes, "core");
diff --git a/media-libs/openexr/files/openexr-2.3.0-fix-bashisms.patch b/media-libs/openexr/files/openexr-2.3.0-fix-bashisms.patch
deleted file mode 100644
index f633eb0e49f..00000000000
--- a/media-libs/openexr/files/openexr-2.3.0-fix-bashisms.patch
+++ /dev/null
@@ -1,117 +0,0 @@
-From ba329cba788d4f320e6fc455919233222c27a0dd Mon Sep 17 00:00:00 2001
-From: Kimball Thurston <kdt3rd@gmail.com>
-Date: Sun, 21 Jul 2019 23:07:01 +1200
-Subject: [PATCH] Fixes #139
-
-Removes bash-isms from the autoconf bootstrap / configure.ac files
-
-Signed-off-by: Kimball Thurston <kdt3rd@gmail.com>
----
- IlmBase/bootstrap | 4 ++--
- IlmBase/configure.ac | 22 ++++++++++------------
- OpenEXR/bootstrap | 4 ++--
- OpenEXR/configure.ac | 26 +++++++++++++-------------
- OpenEXR_Viewers/bootstrap | 4 ++--
- OpenEXR_Viewers/configure.ac | 15 +++++++--------
- PyIlmBase/bootstrap | 4 ++--
- PyIlmBase/configure.ac | 15 +++++++--------
- 8 files changed, 45 insertions(+), 49 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
---- a/configure.ac
-+++ b/configure.ac
-@@ -76,30 +76,30 @@ AC_ARG_ENABLE(cxxstd,
- [enable ISO c++ standard 11/14 [[default=auto]]]),
- [cxxstd="${enableval}"], [cxxstd=14])
-
--if test "${cxxstd}" == 17 ; then
-+if test "${cxxstd}" = 17 ; then
- AX_CXX_COMPILE_STDCXX([17], [noext], [mandatory])
- CXXFLAGS="$CXXFLAGS -std=c++17"
- else
-- if test "${cxxstd}" == 14 ; then
-+ if test "${cxxstd}" = 14 ; then
- AX_CXX_COMPILE_STDCXX([14], [noext], [mandatory])
- CXXFLAGS="$CXXFLAGS -std=c++14"
- else
-- if test "${cxxstd}" == 11 ; then
-+ if test "${cxxstd}" = 11 ; then
- AX_CXX_COMPILE_STDCXX([11], [noext], [mandatory])
- CXXFLAGS="$CXXFLAGS -std=c++11"
- else
-- if test "${cxxstd}" == 03 ; then
-+ if test "${cxxstd}" = 03 ; then
- CXXFLAGS="$CXXFLAGS -std=c++03"
- else
- dnl automatically determine...
- AX_CXX_COMPILE_STDCXX([11], [noext], [optional])
- AX_CXX_COMPILE_STDCXX([14], [noext], [optional])
- AX_CXX_COMPILE_STDCXX([17], [noext], [optional])
-- if test "$HAVE_CXX14" == 1 ; then
-+ if test "$HAVE_CXX14" = 1 ; then
- CXXFLAGS="$CXXFLAGS -std=c++14"
- cxxstd = 14
- else
-- if test "$HAVE_CXX11" == 1 ; then
-+ if test "$HAVE_CXX11" = 1 ; then
- CXXFLAGS="$CXXFLAGS -std=c++11"
- cxxstd = 11
- fi
-@@ -216,7 +216,7 @@ AC_COMPILE_IFELSE(
- [sysconf_nproc="no"]
- )
- AC_MSG_RESULT([$sysconf_nproc])
--if test "x${sysconf_nproc}" == xyes ; then
-+if test "x${sysconf_nproc}" = xyes ; then
- AC_DEFINE([OPENEXR_IMF_HAVE_SYSCONF_NPROCESSORS_ONLN], [1], [Define if sysconf(_SC_NPROCESSORS_ONLN) can be used for CPU count])
- fi
-
-@@ -297,14 +297,14 @@ LIB_SUFFIX=""
- lib_suffix_valid="no"
-
- lib_namespace="Imf"
--if test "x${library_namespace_versioning}" == xyes ; then
-+if test "x${library_namespace_versioning}" = xyes ; then
- AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf_${OPENEXR_VERSION_API}], [OpenEXR])
- AC_DEFINE([OPENEXR_IMF_INTERNAL_NAMESPACE_CUSTOM], [1], [OpenEXR])
-
- lib_namespace="Imf_${OPENEXR_VERSION_API}"
- LIB_SUFFIX="${OPENEXR_VERSION_API}"
- lib_suffix_valid="yes"
--elif test "x${library_namespace_versioning}" == xno ; then
-+elif test "x${library_namespace_versioning}" = xno ; then
- AC_DEFINE_UNQUOTED([OPENEXR_IMF_INTERNAL_NAMESPACE], [Imf], [OpenEXR])
-
- lib_namespace="Imf"
-@@ -318,7 +318,7 @@ else
- fi
- AC_SUBST(LIB_SUFFIX)
-
--if test "x${lib_suffix_valid}" == xyes ; then
-+if test "x${lib_suffix_valid}" = xyes ; then
- AC_SUBST(LIB_SUFFIX_DASH,"-${LIB_SUFFIX}")
- AM_CONDITIONAL(LIB_SUFFIX_EXISTS,true)
- else
-@@ -338,11 +338,11 @@ AC_ARG_ENABLE(customusernamespace,
- [custom_usr_namespace="${enableval}"],
- [custom_usr_namespace=no])
-
--if test "x${custom_usr_namespace}" == xyes ; then
-+if test "x${custom_usr_namespace}" = xyes ; then
- AC_MSG_WARN([Enabling 'custom user namespace' requires an additional argument, reverting to 'Imf'])
- AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR])
- usr_namespace="Imf"
--elif test "x${custom_usr_namespace}" == xno ; then
-+elif test "x${custom_usr_namespace}" = xno ; then
- AC_DEFINE_UNQUOTED([OPENEXR_IMF_NAMESPACE], [Imf], [OpenEXR])
- usr_namespace="Imf"
- else
-@@ -386,7 +386,7 @@ enable large stack optimizations $large_stack
- internal library namespace $lib_namespace
- user-client namespace $usr_namespace])
-
--if test "x$build_osxuniversal" == xyes; then
-+if test "x$build_osxuniversal" = xyes; then
- AC_MSG_RESULT([
- build OS X universal binaries $build_osxuniversal])
- fi
diff --git a/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch b/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch
deleted file mode 100644
index 811a7af3875..00000000000
--- a/media-libs/openexr/files/openexr-2.3.0-fix-build-system.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 067f9d0..fdbe2f8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -13,8 +13,7 @@ AC_SUBST(OPENEXR_VERSION_API, ${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
- AC_CANONICAL_HOST
- AC_CONFIG_SRCDIR(IlmImfTest/main.cpp)
- AC_CONFIG_HEADERS([config/OpenEXRConfig.h])
--AM_INIT_AUTOMAKE(1.6.3) dnl Require automake 1.6.3 or better
--AM_MAINTAINER_MODE
-+AM_INIT_AUTOMAKE
-
-
- LIBTOOL_CURRENT=24
-@@ -28,7 +27,7 @@ AC_PROG_CXX
- AC_PROG_INSTALL
- AC_PROG_CC
- AC_PROG_LN_S
--AC_PROG_LIBTOOL
-+LT_INIT
- AC_PROG_MAKE_SET
-
- dnl
-@@ -58,8 +57,8 @@ AM_PATH_PKGCONFIG(
- [ILMBASE])
-
- dnl Define the version string
--AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], "${VERSION}", [OpenEXR version string])
--AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], "${PACKAGE_STRING}", [OpenEXR version string])
-+AC_DEFINE_UNQUOTED([OPENEXR_VERSION_STRING], ["${VERSION}"], [OpenEXR version string])
-+AC_DEFINE_UNQUOTED([OPENEXR_PACKAGE_STRING], ["${PACKAGE_STRING}"], [OpenEXR version string])
- AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MAJOR], [${OPENEXR_VERSION_MAJOR}], [OpenEXR version string])
- AC_DEFINE_UNQUOTED([OPENEXR_VERSION_MINOR], [${OPENEXR_VERSION_MINOR}], [OpenEXR version string])
- AC_DEFINE_UNQUOTED([OPENEXR_VERSION_PATCH], [${OPENEXR_VERSION_PATCH}], [OpenEXR version string])
-@@ -110,16 +109,7 @@ AC_ARG_ENABLE(threading,
- [multithread="${enableval}"], [multithread=yes])
-
- AS_IF([test "x${multithread}" != xno], [
-- ACX_PTHREAD(
-- [
-- AC_DEFINE(OPENEXR_IMF_HAVE_PTHREAD)
-- ILMBASE_LIBS="$PTHREAD_LIBS $ILMBASE_LIBS"
-- ILMBASE_CXXFLAGS="$ILMBASE_CXXFLAGS $PTHREAD_CFLAGS"
-- CC="$PTHREAD_CC"
--
-- AM_POSIX_SEM()
-- ],
-- [AC_MSG_ERROR([POSIX thread support required])])
-+ AX_PTHREAD
-
- AC_DEFINE([OPENEXR_IMF_HAVE_PTHREAD], [1], [Define if pthreads are available])
-
-@@ -195,15 +185,6 @@ dnl AC_MSG_RESULT($complete_iomanip)
- dnl AC_LANG_RESTORE
- AC_DEFINE([OPENEXR_IMF_HAVE_COMPLETE_IOMANIP], [1], [Define when std::right is available])
-
--AC_MSG_CHECKING(for gcc optimization flags)
--old_cflags=$CFLAGS
--CFLAGS="$CFLAGS -pipe"
--AC_TRY_COMPILE([#include <stdio.h>],
--[ printf ("hello, world"); ],
--[ EXTRA_OPT_CFLAGS="-pipe"],[ EXTRA_OPT_CFLAGS=""])
--CFLAGS=$old_cflags
--AC_MSG_RESULT([$EXTRA_OPT_CFLAGS])
--
-
- dnl Check to see if the toolset supports AVX instructions in inline asm
- AC_ARG_ENABLE([avx],
diff --git a/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch b/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch
deleted file mode 100644
index 360b9609b2d..00000000000
--- a/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-Description: Remove bogus test from suite
-Author: Mathieu Malaterre <malat@debian.org>
-Bug-Debian: https://bugs.debian.org/790495
-Forwarded: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790495#15
-
---- openexr-2.2.0.orig/IlmImfTest/testSampleImages.cpp
-+++ openexr-2.2.0/IlmImfTest/testSampleImages.cpp
-@@ -162,15 +162,15 @@ testSampleImages (const std::string&)
- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_b44.exr",
- ILM_IMF_TEST_IMAGEDIR "comp_b44_piz.exr");
-
-- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v1.exr",
-- ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
-- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v2.exr",
-- ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
-+// compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v1.exr",
-+// ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
-+// compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwaa_v2.exr",
-+// ILM_IMF_TEST_IMAGEDIR "comp_dwaa_piz.exr");
-
-- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v1.exr",
-- ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
-- compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v2.exr",
-- ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
-+// compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v1.exr",
-+// ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
-+// compareImages (ILM_IMF_TEST_IMAGEDIR "comp_dwab_v2.exr",
-+// ILM_IMF_TEST_IMAGEDIR "comp_dwab_piz.exr");
-
-
- cout << "ok\n" << endl;
diff --git a/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch b/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch
deleted file mode 100644
index bb3917d7996..00000000000
--- a/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Usual double rounding issue with x87
-Author: Mathieu Malaterre <malat@debian.org>
-Bug-Debian: https://bugs.debian.org/909865
-Forwarded: https://github.com/openexr/openexr/issues/346
-Last-Update: 2018-12-19
-
---- openexr-2.3.0.orig/IlmImfTest/Makefile.am
-+++ openexr-2.3.0/IlmImfTest/Makefile.am
-@@ -54,6 +54,8 @@ IlmImfTest_SOURCES = main.cpp tmpDir.h t
-
- AM_CPPFLAGS = -DILM_IMF_TEST_IMAGEDIR=\"$(srcdir)/\"
-
-+AM_CPPFLAGS += -ffloat-store
-+
- if BUILD_IMFHUGETEST
- IlmImfTest_SOURCES += testDeepScanLineHuge.cpp testDeepScanLineHuge.h
- AM_CPPFLAGS += -DENABLE_IMFHUGETEST
diff --git a/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch b/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch
deleted file mode 100644
index 430bb20bcfa..00000000000
--- a/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-Description: Fix test-suite on some 32bits archs
-Author: Mathieu Malaterre <malat@debian.org>
-Bug-Debian: https://bugs.debian.org/791478
-
-Index: openexr/IlmImfTest/Makefile.am
-===================================================================
---- openexr.orig/IlmImfTest/Makefile.am
-+++ openexr/IlmImfTest/Makefile.am
-@@ -44,7 +44,6 @@ IlmImfTest_SOURCES = main.cpp tmpDir.h t
- testDeepScanLineMultipleRead.h testDeepScanLineMultipleRead.cpp \
- testPartHelper.h testPartHelper.cpp \
- testOptimized.cpp testOptimized.h \
-- testOptimizedInterleavePatterns.cpp testOptimizedInterleavePatterns.h \
- testBadTypeAttributes.cpp testBadTypeAttributes.h \
- testFutureProofing.cpp testFutureProofing.h \
- compareDwa.cpp compareDwa.h \
-Index: openexr/IlmImfTest/main.cpp
-===================================================================
---- openexr.orig/IlmImfTest/main.cpp
-+++ openexr/IlmImfTest/main.cpp
-@@ -82,7 +82,6 @@
- #include "testCopyMultiPartFile.h"
- #include "testPartHelper.h"
- #include "testOptimized.h"
--#include "testOptimizedInterleavePatterns.h"
- #include "testBadTypeAttributes.h"
- #include "testFutureProofing.h"
- #include "testPartHelper.h"
-@@ -174,7 +173,6 @@ main (int argc, char *argv[])
- TEST (testExistingStreams, "core");
- TEST (testStandardAttributes, "core");
- TEST (testOptimized, "basic");
-- TEST (testOptimizedInterleavePatterns, "basic");
- TEST (testYca, "basic");
- TEST (testTiledYa, "basic");
- TEST (testNativeFormat, "basic");
diff --git a/media-libs/openexr/openexr-2.3.0.ebuild b/media-libs/openexr/openexr-2.3.0.ebuild
deleted file mode 100644
index 69309c6d201..00000000000
--- a/media-libs/openexr/openexr-2.3.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic toolchain-funcs multilib-minimal
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/openexr/openexr/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/24" # based on SONAME
-KEYWORDS="amd64 -arm arm64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="cpu_flags_x86_avx examples static-libs"
-
-RDEPEND="
- >=media-libs/ilmbase-${PV}:=[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- >=sys-devel/autoconf-archive-2016.09.16
- virtual/pkgconfig
-"
-
-RESTRICT="test" # Tests broken upstream doesn't really care about them, bug #656680
-
-DOCS=( AUTHORS ChangeLog NEWS README.md )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/OpenEXRConfig.h )
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.2.0-fix-cpuid-on-abi_x86_32.patch"
- "${FILESDIR}/${PN}-2.2.0-fix-config.h-collision.patch"
- "${FILESDIR}/${PN}-2.2.0-Install-missing-header-files.patch"
- "${FILESDIR}/${P}-fix-build-system.patch"
- "${FILESDIR}/${P}-fix-bashisms.patch"
- # From Debian
- "${FILESDIR}/${PN}-2.3.0-tests-32bits.patch"
- "${FILESDIR}/${PN}-2.3.0-skip-bogus-tests.patch"
- "${FILESDIR}/${PN}-2.3.0-bigendian.patch"
- "${FILESDIR}/${PN}-2.3.0-bigendian2.patch"
- "${FILESDIR}/${PN}-2.3.0-tests-32bits-2.patch"
-)
-
-src_prepare() {
- default
- # Fix path for testsuite
- sed -i -e "s:/var/tmp/:${T}:" IlmImfTest/tmpDir.h || die
- eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --disable-imffuzztest
- --disable-imfhugetest
- --enable-threading
- $(use_enable cpu_flags_x86_avx avx)
- $(use_enable examples imfexamples)
- $(use_enable static-libs static)
- )
-
- # TODO: check if this still applies on updates!
- # internal tool dwaLookup fails to run when linked with gold linker
- tc-ld-disable-gold
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use examples; then
- docompress -x /usr/share/doc/${PF}/examples
- else
- rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die
- fi
-
- find "${D}" -name '*.la' -type f -delete || die
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/files/, media-libs/openexr/
@ 2021-07-21 21:57 Marek Szuba
0 siblings, 0 replies; 11+ messages in thread
From: Marek Szuba @ 2021-07-21 21:57 UTC (permalink / raw
To: gentoo-commits
commit: c92b3342d9a7cd0d2c90f81244a02f23b249db46
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri May 21 23:12:34 2021 +0000
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Wed Jul 21 21:57:28 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c92b3342
media-libs/openexr: bump to 3.0.5
Improves slotting, so that openexr-2 and openexr-3
can be installed in parallel.
Drop multilib support. Only multilib-aware consumer was
media-libs/opencv. Using multilib would require it on
dev-libs/imath as well which is not possible.
Closes: https://bugs.gentoo.org/788286
Bug: https://bugs.gentoo.org/788310
Bug: https://bugs.gentoo.org/801373
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>
media-libs/openexr/Manifest | 1 +
...5-0001-changes-needed-for-proper-slotting.patch | 119 +++++++++++
...0002-add-version-to-binaries-for-slotting.patch | 229 +++++++++++++++++++++
media-libs/openexr/openexr-3.0.5.ebuild | 77 +++++++
4 files changed, 426 insertions(+)
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 7f2f02e9d3c..dac7103a63a 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,3 +1,4 @@
DIST openexr-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
DIST openexr-3.0.1.tar.gz 25059445 BLAKE2B 76bce1ff830b5e32362bfaf91d39945add171c5c1f453968b2fa8ba41e0996064d3a104eb7759cea87477e96e8a52d548743c7d83f5c6131dd38aecdd47bd6dd SHA512 e450c55d150e4c0a8a9147f78fe1c73ea9134976444f8c77c832d0671d4c3796f96fee74d23f26cdb9383e658a33d6d57c989e9207d1edfc8556ad688ff25a5b
+DIST openexr-3.0.5.tar.gz 25060148 BLAKE2B 24b5601e27342eeff831219f75416797c30afb1ca28ae0a0692d97169297584da503d016c6dda80f63bd5bb9c9a31dc7f91d7713e6fc217a2760af2c662406f0 SHA512 7a0f83320ad5e1d8f8414b5175a64eef3c6b06a7ccd7d66d0aa21472ea22146e2617ff10c20e04203fc2a3326d8bac2d95023bec315badb03e6a006596b64595
diff --git a/media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch b/media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch
new file mode 100644
index 00000000000..30991f423b0
--- /dev/null
+++ b/media-libs/openexr/files/openexr-3.0.5-0001-changes-needed-for-proper-slotting.patch
@@ -0,0 +1,119 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Fri, 2 Jul 2021 17:46:33 +0200
+Subject: [PATCH] changes needed for proper slotting
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ cmake/CMakeLists.txt | 8 ++++----
+ cmake/LibraryDefine.cmake | 8 ++++----
+ cmake/OpenEXR.pc.in | 4 ++--
+ cmake/OpenEXRLibraryDefine.cmake | 8 ++++----
+ 4 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
+index 2014d27..7dfb2f2 100644
+--- a/cmake/CMakeLists.txt
++++ b/cmake/CMakeLists.txt
+@@ -200,7 +200,7 @@ if(OPENEXR_INSTALL_PKG_CONFIG)
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+ )
+ endfunction()
+- openexr_pkg_config_help(OpenEXR.pc.in)
++ openexr_pkg_config_help(OpenEXR-${OpenEXR_VERSION_MAJOR}.pc.in)
+ else()
+ message(STATUS "-- pkg-config generation disabled")
+ endif()
+@@ -220,7 +220,7 @@ include(CMakePackageConfigHelpers)
+ if(OPENEXR_INSTALL)
+ configure_package_config_file(${PROJECT_NAME}Config.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR}
+ )
+ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+ VERSION ${PROJECT_VERSION}
+@@ -229,11 +229,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR}
+ )
+
+ install(EXPORT ${PROJECT_NAME}
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR}
+ FILE ${PROJECT_NAME}Targets.cmake
+ NAMESPACE ${PROJECT_NAME}::
+ EXPORT_LINK_INTERFACE_LIBRARIES
+diff --git a/cmake/LibraryDefine.cmake b/cmake/LibraryDefine.cmake
+index aa5bb46..2767420 100644
+--- a/cmake/LibraryDefine.cmake
++++ b/cmake/LibraryDefine.cmake
+@@ -79,8 +79,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
+ install(TARGETS ${libname}
+ EXPORT ${PROJECT_NAME}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ PUBLIC_HEADER
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR}
+@@ -90,8 +90,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
+ set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
+- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR} ${baselibname} -> ${verlibname}\")")
++ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
++ install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR} ${baselibname} -> ${verlibname}\")")
+ set(verlibname)
+ set(baselibname)
+ endif()
+diff --git a/cmake/OpenEXR.pc.in b/cmake/OpenEXR.pc.in
+index 7d9bb7c..c7e1dd6 100644
+--- a/cmake/OpenEXR.pc.in
++++ b/cmake/OpenEXR.pc.in
+@@ -5,9 +5,9 @@
+
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++libdir=@libdir@/@OPENEXR_OUTPUT_SUBDIR@
+ includedir=@includedir@
+-OpenEXR_includedir=@includedir@/OpenEXR
++OpenEXR_includedir=@includedir@/@OPENEXR_OUTPUT_SUBDIR@
+ libsuffix=@LIB_SUFFIX_DASH@
+
+ Name: OpenEXR
+diff --git a/cmake/OpenEXRLibraryDefine.cmake b/cmake/OpenEXRLibraryDefine.cmake
+index 8022e2e..9f919c8 100644
+--- a/cmake/OpenEXRLibraryDefine.cmake
++++ b/cmake/OpenEXRLibraryDefine.cmake
+@@ -54,8 +54,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
+ install(TARGETS ${libname}
+ EXPORT ${PROJECT_NAME}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ PUBLIC_HEADER
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR}
+@@ -65,8 +65,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
+ set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
+- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+- install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_DIR} ${baselibname} -> ${verlibname}\")")
++ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
++ install(CODE "message(\"-- Creating symlink in ${CMAKE_INSTALL_FULL_DIR}/${OPENEXR_OUTPUT_SUBDIR} ${baselibname} -> ${verlibname}\")")
+ set(verlibname)
+ set(baselibname)
+ endif()
+--
+2.32.0
+
diff --git a/media-libs/openexr/files/openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch b/media-libs/openexr/files/openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch
new file mode 100644
index 00000000000..d6c6b532c87
--- /dev/null
+++ b/media-libs/openexr/files/openexr-3.0.5-0002-add-version-to-binaries-for-slotting.patch
@@ -0,0 +1,229 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sat, 22 May 2021 17:04:12 +0200
+Subject: [PATCH] add version to binaries for slotting
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ src/bin/exr2aces/CMakeLists.txt | 10 +++++-----
+ src/bin/exrenvmap/CMakeLists.txt | 10 +++++-----
+ src/bin/exrheader/CMakeLists.txt | 10 +++++-----
+ src/bin/exrmakepreview/CMakeLists.txt | 10 +++++-----
+ src/bin/exrmaketiled/CMakeLists.txt | 10 +++++-----
+ src/bin/exrmultipart/CMakeLists.txt | 10 +++++-----
+ src/bin/exrmultiview/CMakeLists.txt | 10 +++++-----
+ src/bin/exrstdattr/CMakeLists.txt | 10 +++++-----
+ 8 files changed, 40 insertions(+), 40 deletions(-)
+
+diff --git a/src/bin/exr2aces/CMakeLists.txt b/src/bin/exr2aces/CMakeLists.txt
+index 72c4e1c..ede5973 100644
+--- a/src/bin/exr2aces/CMakeLists.txt
++++ b/src/bin/exr2aces/CMakeLists.txt
+@@ -1,14 +1,14 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+
+-add_executable(exr2aces main.cpp)
+-target_link_libraries(exr2aces OpenEXR::OpenEXR)
+-set_target_properties(exr2aces PROPERTIES
++add_executable(exr2aces-${OpenEXR_VERSION_MAJOR} main.cpp)
++target_link_libraries(exr2aces-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exr2aces-${OpenEXR_VERSION_MAJOR} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+- install(TARGETS exr2aces DESTINATION ${CMAKE_INSTALL_BINDIR})
++ install(TARGETS exr2aces-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+- target_compile_definitions(exr2aces PRIVATE OPENEXR_DLL)
++ target_compile_definitions(exr2aces-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrenvmap/CMakeLists.txt b/src/bin/exrenvmap/CMakeLists.txt
+index bbd26c0..cbe8401 100644
+--- a/src/bin/exrenvmap/CMakeLists.txt
++++ b/src/bin/exrenvmap/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+
+-add_executable( exrenvmap
++add_executable( exrenvmap-${OpenEXR_VERSION_MAJOR}
+ makeLatLongMap.cpp
+ readInputImage.cpp
+ resizeImage.cpp
+@@ -11,13 +11,13 @@ add_executable( exrenvmap
+ EnvmapImage.cpp
+ )
+
+-target_link_libraries(exrenvmap OpenEXR::OpenEXR)
+-set_target_properties(exrenvmap PROPERTIES
++target_link_libraries(exrenvmap-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrenvmap-${OpenEXR_VERSION_MAJOR} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+- install(TARGETS exrenvmap DESTINATION ${CMAKE_INSTALL_BINDIR})
++ install(TARGETS exrenvmap-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+- target_compile_definitions(exrenvmap PRIVATE OPENEXR_DLL)
++ target_compile_definitions(exrenvmap-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrheader/CMakeLists.txt b/src/bin/exrheader/CMakeLists.txt
+index c427445..b8b0e9a 100644
+--- a/src/bin/exrheader/CMakeLists.txt
++++ b/src/bin/exrheader/CMakeLists.txt
+@@ -1,14 +1,14 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+
+-add_executable(exrheader main.cpp)
+-target_link_libraries(exrheader OpenEXR::OpenEXR)
+-set_target_properties(exrheader PROPERTIES
++add_executable(exrheader-${OpenEXR_VERSION_MAJOR} main.cpp)
++target_link_libraries(exrheader-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrheader-${OpenEXR_VERSION_MAJOR} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+- install(TARGETS exrheader DESTINATION ${CMAKE_INSTALL_BINDIR})
++ install(TARGETS exrheader-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+- target_compile_definitions(exrheader PRIVATE OPENEXR_DLL)
++ target_compile_definitions(exrheader-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrmakepreview/CMakeLists.txt b/src/bin/exrmakepreview/CMakeLists.txt
+index bb8b548..03c0687 100644
+--- a/src/bin/exrmakepreview/CMakeLists.txt
++++ b/src/bin/exrmakepreview/CMakeLists.txt
+@@ -1,17 +1,17 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+
+-add_executable(exrmakepreview
++add_executable(exrmakepreview-${OpenEXR_VERSION_MAJOR}
+ main.cpp
+ makePreview.cpp
+ )
+-target_link_libraries(exrmakepreview OpenEXR::OpenEXR)
+-set_target_properties(exrmakepreview PROPERTIES
++target_link_libraries(exrmakepreview-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrmakepreview-${OpenEXR_VERSION_MAJOR} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+- install(TARGETS exrmakepreview DESTINATION ${CMAKE_INSTALL_BINDIR})
++ install(TARGETS exrmakepreview-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+- target_compile_definitions(exrmakepreview PRIVATE OPENEXR_DLL)
++ target_compile_definitions(exrmakepreview-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrmaketiled/CMakeLists.txt b/src/bin/exrmaketiled/CMakeLists.txt
+index 6c8dfa5..7116b54 100644
+--- a/src/bin/exrmaketiled/CMakeLists.txt
++++ b/src/bin/exrmaketiled/CMakeLists.txt
+@@ -1,18 +1,18 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors (c) to the OpenEXR Project.
+
+-add_executable(exrmaketiled
++add_executable(exrmaketiled-${OpenEXR_VERSION_MAJOR}
+ makeTiled.cpp
+ main.cpp
+ Image.cpp
+ )
+-target_link_libraries(exrmaketiled OpenEXR::OpenEXR)
+-set_target_properties(exrmaketiled PROPERTIES
++target_link_libraries(exrmaketiled-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrmaketiled-${OpenEXR_VERSION_MAJOR} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+- install(TARGETS exrmaketiled DESTINATION ${CMAKE_INSTALL_BINDIR})
++ install(TARGETS exrmaketiled-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+- target_compile_definitions(exrmaketiled PRIVATE OPENEXR_DLL)
++ target_compile_definitions(exrmaketiled-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrmultipart/CMakeLists.txt b/src/bin/exrmultipart/CMakeLists.txt
+index 7f8fc1b..dad8c8d 100644
+--- a/src/bin/exrmultipart/CMakeLists.txt
++++ b/src/bin/exrmultipart/CMakeLists.txt
+@@ -1,14 +1,14 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+
+-add_executable(exrmultipart exrmultipart.cpp)
+-target_link_libraries(exrmultipart OpenEXR::OpenEXR)
+-set_target_properties(exrmultipart PROPERTIES
++add_executable(exrmultipart-${OpenEXR_VERSION_MAJOR} exrmultipart.cpp)
++target_link_libraries(exrmultipart-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrmultipart-${OpenEXR_VERSION_MAJOR} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+- install(TARGETS exrmultipart DESTINATION ${CMAKE_INSTALL_BINDIR})
++ install(TARGETS exrmultipart-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+- target_compile_definitions(exrmultipart PRIVATE OPENEXR_DLL)
++ target_compile_definitions(exrmultipart-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrmultiview/CMakeLists.txt b/src/bin/exrmultiview/CMakeLists.txt
+index bbac3a6..eba48c1 100644
+--- a/src/bin/exrmultiview/CMakeLists.txt
++++ b/src/bin/exrmultiview/CMakeLists.txt
+@@ -1,18 +1,18 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+
+-add_executable(exrmultiview
++add_executable(exrmultiview-${OpenEXR_VERSION_MAJOR}
+ makeMultiView.cpp
+ main.cpp
+ Image.cpp
+ )
+-target_link_libraries(exrmultiview OpenEXR::OpenEXR)
+-set_target_properties(exrmultiview PROPERTIES
++target_link_libraries(exrmultiview-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrmultiview-${OpenEXR_VERSION_MAJOR} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+- install(TARGETS exrmultiview DESTINATION ${CMAKE_INSTALL_BINDIR})
++ install(TARGETS exrmultiview-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+- target_compile_definitions(exrmultiview PRIVATE OPENEXR_DLL)
++ target_compile_definitions(exrmultiview-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrstdattr/CMakeLists.txt b/src/bin/exrstdattr/CMakeLists.txt
+index 79205fc..35ac580 100644
+--- a/src/bin/exrstdattr/CMakeLists.txt
++++ b/src/bin/exrstdattr/CMakeLists.txt
+@@ -1,14 +1,14 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+
+-add_executable(exrstdattr main.cpp)
+-target_link_libraries(exrstdattr OpenEXR::OpenEXR)
+-set_target_properties(exrstdattr PROPERTIES
++add_executable(exrstdattr-${OpenEXR_VERSION_MAJOR} main.cpp)
++target_link_libraries(exrstdattr-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrstdattr-${OpenEXR_VERSION_MAJOR} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+- install(TARGETS exrstdattr DESTINATION ${CMAKE_INSTALL_BINDIR})
++ install(TARGETS exrstdattr-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+- target_compile_definitions(exrstdattr PRIVATE OPENEXR_DLL)
++ target_compile_definitions(exrstdattr-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+--
+2.31.1
+
diff --git a/media-libs/openexr/openexr-3.0.5.ebuild b/media-libs/openexr/openexr-3.0.5.ebuild
new file mode 100644
index 00000000000..242e04c9541
--- /dev/null
+++ b/media-libs/openexr/openexr-3.0.5.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic toolchain-funcs
+
+MY_PN=OpenEXR
+MY_PV=$(ver_cut 1)
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3/29" # based on SONAME
+# imath needs keywording: arm{,64}, hppa, ia64, ppc{,64}, sparc, x64-macos, x86-solaris
+KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ ~dev-libs/imath-${PV}:=
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-0001-changes-needed-for-proper-slotting.patch
+ "${FILESDIR}"/${P}-0002-add-version-to-binaries-for-slotting.patch
+)
+
+DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
+
+src_prepare() {
+ # Fix path for testsuite
+ sed -e "s:/var/tmp/:${T}:" \
+ -i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests"
+
+ cmake_src_prepare
+
+ mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=$(usex !static-libs)
+ -DBUILD_TESTING=$(usex test)
+ -DOPENEXR_BUILD_UTILS=$(usex utils)
+ -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
+ -DOPENEXR_ENABLE_THREADING=$(usex threads)
+ -DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
+ -DOPENEXR_INSTALL_PKG_CONFIG=ON
+ -DOPENEXR_INSTALL_TOOLS=$(usex utils)
+ -DOPENEXR_OUTPUT_SUBDIR="${MY_P}"
+ -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
+ )
+
+ use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
+
+ cmake_src_configure
+}
+
+src_install() {
+ if use doc; then
+ DOCS+=( docs/*.pdf )
+ fi
+ use examples && docompress -x /usr/share/doc/${PF}/examples
+ cmake_src_install
+
+ cat > "${T}"/99${PN}3 <<-EOF || die
+ LDPATH=/usr/$(get_libdir)/${MY_P}
+ EOF
+ doenvd "${T}"/99${PN}3
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/files/, media-libs/openexr/
@ 2021-08-12 6:45 Joonas Niilola
0 siblings, 0 replies; 11+ messages in thread
From: Joonas Niilola @ 2021-08-12 6:45 UTC (permalink / raw
To: gentoo-commits
commit: 0a334f4d89111d8b4e1f4ee7ee72ebcfc97f6cf8
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Wed Aug 4 18:54:18 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Aug 12 06:45:09 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0a334f4d
media-libs/openexr: bump to 3.1.1
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/21884
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-libs/openexr/Manifest | 1 +
...1-0001-changes-needed-for-proper-slotting.patch | 119 ++++++++++
...0002-add-version-to-binaries-for-slotting.patch | 252 +++++++++++++++++++++
.../openexr-3.1.1-0003-disable-failing-test.patch | 37 +++
media-libs/openexr/openexr-3.1.1.ebuild | 78 +++++++
5 files changed, 487 insertions(+)
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index f629276e8aa..741a982337e 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,3 +1,4 @@
DIST openexr-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
DIST openexr-2.5.7.tar.gz 27539574 BLAKE2B 58fd81be52e13d2815b6aa8cea6793359379f5ebf866fd45b31ce30cf5f72aa4699625e7cec51189d62fe76f53418c3e0938f9b827d54ad18342e7aa67c8a3d2 SHA512 e44edfa2dcfff2fe372ed2ba07b39a472e549025978de178eff26be641767d22d1a3b543fb7672d9b7b2e9f4c308667f785829ed6d9032a2b42f2ffa0163de40
DIST openexr-3.0.5.tar.gz 25060148 BLAKE2B 24b5601e27342eeff831219f75416797c30afb1ca28ae0a0692d97169297584da503d016c6dda80f63bd5bb9c9a31dc7f91d7713e6fc217a2760af2c662406f0 SHA512 7a0f83320ad5e1d8f8414b5175a64eef3c6b06a7ccd7d66d0aa21472ea22146e2617ff10c20e04203fc2a3326d8bac2d95023bec315badb03e6a006596b64595
+DIST openexr-3.1.1.tar.gz 25588029 BLAKE2B c2ce9622ad7b8a328ce556b6120a868cddb86e908917e001f543e70501b6d31ce549fc10d65806dd9d63e63872b273ad3a1d4f6813b5d23ea238c238f5815304 SHA512 430becbb214cedec5a57e9ff2363badd8a2d94e8a00edffbc75fbcf30d26d887a6eb3f4ff96e371cb26f9d44e63bf0fe2dc511493a0951171ddc64bba7aed735
diff --git a/media-libs/openexr/files/openexr-3.1.1-0001-changes-needed-for-proper-slotting.patch b/media-libs/openexr/files/openexr-3.1.1-0001-changes-needed-for-proper-slotting.patch
new file mode 100644
index 00000000000..29aef05acf5
--- /dev/null
+++ b/media-libs/openexr/files/openexr-3.1.1-0001-changes-needed-for-proper-slotting.patch
@@ -0,0 +1,119 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 3 Aug 2021 19:50:40 +0200
+Subject: [PATCH 1/2] changes needed for proper slotting
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ cmake/CMakeLists.txt | 8 ++++----
+ cmake/LibraryDefine.cmake | 8 ++++----
+ cmake/OpenEXR.pc.in | 4 ++--
+ cmake/OpenEXRLibraryDefine.cmake | 8 ++++----
+ 4 files changed, 14 insertions(+), 14 deletions(-)
+
+diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
+index 79497d9..a22afd1 100644
+--- a/cmake/CMakeLists.txt
++++ b/cmake/CMakeLists.txt
+@@ -205,7 +205,7 @@ if(OPENEXR_INSTALL_PKG_CONFIG)
+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+ )
+ endfunction()
+- openexr_pkg_config_help(OpenEXR.pc.in)
++ openexr_pkg_config_help(OpenEXR-${OpenEXR_VERSION_MAJOR}.pc.in)
+ else()
+ message(STATUS "-- pkg-config generation disabled")
+ endif()
+@@ -225,7 +225,7 @@ include(CMakePackageConfigHelpers)
+ if(OPENEXR_INSTALL)
+ configure_package_config_file(${PROJECT_NAME}Config.cmake.in
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+- INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR}
+ )
+ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+ VERSION ${PROJECT_VERSION}
+@@ -234,11 +234,11 @@ write_basic_package_version_file("${PROJECT_NAME}ConfigVersion.cmake"
+
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR}
+ )
+
+ install(EXPORT ${PROJECT_NAME}
+- DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}
++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}-${OpenEXR_VERSION_MAJOR}
+ FILE ${PROJECT_NAME}Targets.cmake
+ NAMESPACE ${PROJECT_NAME}::
+ EXPORT_LINK_INTERFACE_LIBRARIES
+diff --git a/cmake/LibraryDefine.cmake b/cmake/LibraryDefine.cmake
+index 5696f3f..b4787b1 100644
+--- a/cmake/LibraryDefine.cmake
++++ b/cmake/LibraryDefine.cmake
+@@ -79,8 +79,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
+ install(TARGETS ${libname}
+ EXPORT ${PROJECT_NAME}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ PUBLIC_HEADER
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR}
+@@ -90,8 +90,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
+ set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
+- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+- install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_LIBDIR}/${baselibname} -> ${verlibname}\")")
++ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
++ install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}/${baselibname} -> ${verlibname}\")")
+ set(verlibname)
+ set(baselibname)
+ endif()
+diff --git a/cmake/OpenEXR.pc.in b/cmake/OpenEXR.pc.in
+index a74979b..e124b8f 100644
+--- a/cmake/OpenEXR.pc.in
++++ b/cmake/OpenEXR.pc.in
+@@ -5,9 +5,9 @@
+
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+-libdir=@libdir@
++libdir=@libdir@/@OPENEXR_OUTPUT_SUBDIR@
+ includedir=@includedir@
+-OpenEXR_includedir=@includedir@/OpenEXR
++OpenEXR_includedir=@includedir@/@OPENEXR_OUTPUT_SUBDIR@
+ libsuffix=@LIB_SUFFIX_DASH@
+
+ Name: OpenEXR
+diff --git a/cmake/OpenEXRLibraryDefine.cmake b/cmake/OpenEXRLibraryDefine.cmake
+index c6ddd2e..0dc3663 100644
+--- a/cmake/OpenEXRLibraryDefine.cmake
++++ b/cmake/OpenEXRLibraryDefine.cmake
+@@ -54,8 +54,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
+ install(TARGETS ${libname}
+ EXPORT ${PROJECT_NAME}
+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+- LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}
+ INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ PUBLIC_HEADER
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${OPENEXR_OUTPUT_SUBDIR}
+@@ -65,8 +65,8 @@ function(OPENEXR_DEFINE_LIBRARY libname)
+ string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
+ set(verlibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${OPENEXR_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
+ set(baselibname ${CMAKE_SHARED_LIBRARY_PREFIX}${libname}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX}${CMAKE_SHARED_LIBRARY_SUFFIX})
+- install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
+- install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_DIR}/${baselibname} -> ${verlibname}\")")
++ install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} -E chdir \"\$ENV\{DESTDIR\}${CMAKE_INSTALL_FULL_LIBDIR}/${OPENEXR_OUTPUT_SUBDIR}\" ${CMAKE_COMMAND} -E create_symlink ${verlibname} ${baselibname})")
++ install(CODE "message(STATUS \"Creating symlink ${CMAKE_INSTALL_FULL_DIR}/${OPENEXR_OUTPUT_SUBDIR}/${baselibname} -> ${verlibname}\")")
+ set(verlibname)
+ set(baselibname)
+ endif()
+--
+2.32.0
+
diff --git a/media-libs/openexr/files/openexr-3.1.1-0002-add-version-to-binaries-for-slotting.patch b/media-libs/openexr/files/openexr-3.1.1-0002-add-version-to-binaries-for-slotting.patch
new file mode 100644
index 00000000000..d2f6dcd4bc3
--- /dev/null
+++ b/media-libs/openexr/files/openexr-3.1.1-0002-add-version-to-binaries-for-slotting.patch
@@ -0,0 +1,252 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Tue, 3 Aug 2021 20:00:34 +0200
+Subject: [PATCH 2/2] add version to binaries for slotting
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ src/bin/exr2aces/CMakeLists.txt | 10 +++++-----
+ src/bin/exrenvmap/CMakeLists.txt | 10 +++++-----
+ src/bin/exrheader/CMakeLists.txt | 10 +++++-----
+ src/bin/exrinfo/CMakeLists.txt | 10 +++++-----
+ src/bin/exrmakepreview/CMakeLists.txt | 10 +++++-----
+ src/bin/exrmaketiled/CMakeLists.txt | 10 +++++-----
+ src/bin/exrmultipart/CMakeLists.txt | 10 +++++-----
+ src/bin/exrmultiview/CMakeLists.txt | 10 +++++-----
+ src/bin/exrstdattr/CMakeLists.txt | 10 +++++-----
+ 9 files changed, 45 insertions(+), 45 deletions(-)
+
+diff --git a/src/bin/exr2aces/CMakeLists.txt b/src/bin/exr2aces/CMakeLists.txt
+index 72c4e1c..01b806f 100644
+--- a/src/bin/exr2aces/CMakeLists.txt
++++ b/src/bin/exr2aces/CMakeLists.txt
+@@ -1,14 +1,14 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+
+-add_executable(exr2aces main.cpp)
+-target_link_libraries(exr2aces OpenEXR::OpenEXR)
+-set_target_properties(exr2aces PROPERTIES
++add_executable(exr2aces-${OpenEXR_VERSION_MAJOR} main.cpp)
++target_link_libraries(exr2aces-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exr2aces-${OpenEXR_VERSION_MAJOR} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+- install(TARGETS exr2aces DESTINATION ${CMAKE_INSTALL_BINDIR})
++ install(TARGETS exr2aces-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+- target_compile_definitions(exr2aces PRIVATE OPENEXR_DLL)
++ target_compile_definitions(exr2aces-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrenvmap/CMakeLists.txt b/src/bin/exrenvmap/CMakeLists.txt
+index c798a65..3d35a19 100644
+--- a/src/bin/exrenvmap/CMakeLists.txt
++++ b/src/bin/exrenvmap/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+
+-add_executable( exrenvmap
++add_executable( exrenvmap-${OpenEXR_VERSION_MAJOR}
+ blurImage.cpp
+ EnvmapImage.cpp
+ main.cpp
+@@ -11,13 +11,13 @@ add_executable( exrenvmap
+ resizeImage.cpp
+ )
+
+-target_link_libraries(exrenvmap OpenEXR::OpenEXR)
+-set_target_properties(exrenvmap PROPERTIES
++target_link_libraries(exrenvmap-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrenvmap-${OpenEXR_VERSION_MAJOR} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+- install(TARGETS exrenvmap DESTINATION ${CMAKE_INSTALL_BINDIR})
++ install(TARGETS exrenvmap-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+- target_compile_definitions(exrenvmap PRIVATE OPENEXR_DLL)
++ target_compile_definitions(exrenvmap-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrheader/CMakeLists.txt b/src/bin/exrheader/CMakeLists.txt
+index c427445..8cdbb8e 100644
+--- a/src/bin/exrheader/CMakeLists.txt
++++ b/src/bin/exrheader/CMakeLists.txt
+@@ -1,14 +1,14 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+
+-add_executable(exrheader main.cpp)
+-target_link_libraries(exrheader OpenEXR::OpenEXR)
+-set_target_properties(exrheader PROPERTIES
++add_executable(exrheader-${OpenEXR_VERSION_MAJOR} main.cpp)
++target_link_libraries(exrheader-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrheader-${OpenEXR_VERSION_MAJOR} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+- install(TARGETS exrheader DESTINATION ${CMAKE_INSTALL_BINDIR})
++ install(TARGETS exrheader-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+- target_compile_definitions(exrheader PRIVATE OPENEXR_DLL)
++ target_compile_definitions(exrheader-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrinfo/CMakeLists.txt b/src/bin/exrinfo/CMakeLists.txt
+index 19ace5f..07aee1a 100644
+--- a/src/bin/exrinfo/CMakeLists.txt
++++ b/src/bin/exrinfo/CMakeLists.txt
+@@ -1,12 +1,12 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright Contributors to the OpenEXR Project.
+
+-add_executable(exrinfo main.c)
+-target_link_libraries(exrinfo OpenEXR::OpenEXRCore)
+-set_target_properties(exrinfo PROPERTIES
++add_executable(exrinfo-${OpenEXR_VERSION_MAJOR} main.c)
++target_link_libraries(exrinfo-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXRCore)
++set_target_properties(exrinfo-${OpenEXR_VERSION_MAJOR} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+-install(TARGETS exrinfo DESTINATION ${CMAKE_INSTALL_BINDIR})
++install(TARGETS exrinfo-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ if(WIN32 AND (BUILD_SHARED_LIBS OR OPENEXR_BUILD_BOTH_STATIC_SHARED))
+- target_compile_definitions(exrinfo PRIVATE OPENEXR_DLL)
++ target_compile_definitions(exrinfo-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrmakepreview/CMakeLists.txt b/src/bin/exrmakepreview/CMakeLists.txt
+index bb8b548..8b5e441 100644
+--- a/src/bin/exrmakepreview/CMakeLists.txt
++++ b/src/bin/exrmakepreview/CMakeLists.txt
+@@ -1,17 +1,17 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+
+-add_executable(exrmakepreview
++add_executable(exrmakepreview-${OpenEXR_VERSION_MAJOR}
+ main.cpp
+ makePreview.cpp
+ )
+-target_link_libraries(exrmakepreview OpenEXR::OpenEXR)
+-set_target_properties(exrmakepreview PROPERTIES
++target_link_libraries(exrmakepreview-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrmakepreview-${OpenEXR_VERSION_MAJOR} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+- install(TARGETS exrmakepreview DESTINATION ${CMAKE_INSTALL_BINDIR})
++ install(TARGETS exrmakepreview-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+- target_compile_definitions(exrmakepreview PRIVATE OPENEXR_DLL)
++ target_compile_definitions(exrmakepreview-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrmaketiled/CMakeLists.txt b/src/bin/exrmaketiled/CMakeLists.txt
+index 1bc6cf4..6e70cf6 100644
+--- a/src/bin/exrmaketiled/CMakeLists.txt
++++ b/src/bin/exrmaketiled/CMakeLists.txt
+@@ -1,18 +1,18 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors (c) to the OpenEXR Project.
+
+-add_executable(exrmaketiled
++add_executable(exrmaketiled-${OpenEXR_VERSION_MAJOR}
+ Image.cpp
+ main.cpp
+ makeTiled.cpp
+ )
+-target_link_libraries(exrmaketiled OpenEXR::OpenEXR)
+-set_target_properties(exrmaketiled PROPERTIES
++target_link_libraries(exrmaketiled-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrmaketiled-${OpenEXR_VERSION_MAJOR} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+- install(TARGETS exrmaketiled DESTINATION ${CMAKE_INSTALL_BINDIR})
++ install(TARGETS exrmaketiled-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+- target_compile_definitions(exrmaketiled PRIVATE OPENEXR_DLL)
++ target_compile_definitions(exrmaketiled-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrmultipart/CMakeLists.txt b/src/bin/exrmultipart/CMakeLists.txt
+index 7f8fc1b..3770506 100644
+--- a/src/bin/exrmultipart/CMakeLists.txt
++++ b/src/bin/exrmultipart/CMakeLists.txt
+@@ -1,14 +1,14 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+
+-add_executable(exrmultipart exrmultipart.cpp)
+-target_link_libraries(exrmultipart OpenEXR::OpenEXR)
+-set_target_properties(exrmultipart PROPERTIES
++add_executable(exrmultipart-${OpenEXR_VERSION_MAJOR} exrmultipart.cpp)
++target_link_libraries(exrmultipart-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrmultipart-${OpenEXR_VERSION_MAJOR} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+- install(TARGETS exrmultipart DESTINATION ${CMAKE_INSTALL_BINDIR})
++ install(TARGETS exrmultipart-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+- target_compile_definitions(exrmultipart PRIVATE OPENEXR_DLL)
++ target_compile_definitions(exrmultipart-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrmultiview/CMakeLists.txt b/src/bin/exrmultiview/CMakeLists.txt
+index 05ad081..9e535ad 100644
+--- a/src/bin/exrmultiview/CMakeLists.txt
++++ b/src/bin/exrmultiview/CMakeLists.txt
+@@ -1,18 +1,18 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+
+-add_executable(exrmultiview
++add_executable(exrmultiview-${OpenEXR_VERSION_MAJOR}
+ Image.cpp
+ main.cpp
+ makeMultiView.cpp
+ )
+-target_link_libraries(exrmultiview OpenEXR::OpenEXR)
+-set_target_properties(exrmultiview PROPERTIES
++target_link_libraries(exrmultiview-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrmultiview-${OpenEXR_VERSION_MAJOR} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+- install(TARGETS exrmultiview DESTINATION ${CMAKE_INSTALL_BINDIR})
++ install(TARGETS exrmultiview-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+- target_compile_definitions(exrmultiview PRIVATE OPENEXR_DLL)
++ target_compile_definitions(exrmultiview-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+diff --git a/src/bin/exrstdattr/CMakeLists.txt b/src/bin/exrstdattr/CMakeLists.txt
+index 79205fc..3ad0ffe 100644
+--- a/src/bin/exrstdattr/CMakeLists.txt
++++ b/src/bin/exrstdattr/CMakeLists.txt
+@@ -1,14 +1,14 @@
+ # SPDX-License-Identifier: BSD-3-Clause
+ # Copyright (c) Contributors to the OpenEXR Project.
+
+-add_executable(exrstdattr main.cpp)
+-target_link_libraries(exrstdattr OpenEXR::OpenEXR)
+-set_target_properties(exrstdattr PROPERTIES
++add_executable(exrstdattr-${OpenEXR_VERSION_MAJOR} main.cpp)
++target_link_libraries(exrstdattr-${OpenEXR_VERSION_MAJOR} OpenEXR::OpenEXR)
++set_target_properties(exrstdattr-${OpenEXR_VERSION_MAJOR} PROPERTIES
+ RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin"
+ )
+ if(OPENEXR_INSTALL_TOOLS)
+- install(TARGETS exrstdattr DESTINATION ${CMAKE_INSTALL_BINDIR})
++ install(TARGETS exrstdattr-${OpenEXR_VERSION_MAJOR} DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif()
+ if(WIN32 AND BUILD_SHARED_LIBS)
+- target_compile_definitions(exrstdattr PRIVATE OPENEXR_DLL)
++ target_compile_definitions(exrstdattr-${OpenEXR_VERSION_MAJOR} PRIVATE OPENEXR_DLL)
+ endif()
+--
+2.32.0
+
diff --git a/media-libs/openexr/files/openexr-3.1.1-0003-disable-failing-test.patch b/media-libs/openexr/files/openexr-3.1.1-0003-disable-failing-test.patch
new file mode 100644
index 00000000000..e2f0d6e5962
--- /dev/null
+++ b/media-libs/openexr/files/openexr-3.1.1-0003-disable-failing-test.patch
@@ -0,0 +1,37 @@
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Wed, 4 Aug 2021 08:33:52 +0200
+Subject: [PATCH] disable failing test
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ src/test/OpenEXRTest/CMakeLists.txt | 1 -
+ src/test/OpenEXRTest/main.cpp | 1 -
+ 2 files changed, 2 deletions(-)
+
+diff --git a/src/test/OpenEXRTest/CMakeLists.txt b/src/test/OpenEXRTest/CMakeLists.txt
+index 9dd74d1..2a1a2bd 100644
+--- a/src/test/OpenEXRTest/CMakeLists.txt
++++ b/src/test/OpenEXRTest/CMakeLists.txt
+@@ -118,7 +118,6 @@ define_openexr_tests(
+ testMultiView
+ testNativeFormat
+ testOptimized
+- testOptimizedInterleavePatterns
+ testPartHelper
+ testPreviewImage
+ testRgba
+diff --git a/src/test/OpenEXRTest/main.cpp b/src/test/OpenEXRTest/main.cpp
+index 4eaecc9..0c0caed 100644
+--- a/src/test/OpenEXRTest/main.cpp
++++ b/src/test/OpenEXRTest/main.cpp
+@@ -202,7 +202,6 @@ main (int argc, char *argv[])
+ TEST (testExistingStreams, "core");
+ TEST (testStandardAttributes, "core");
+ TEST (testOptimized, "basic");
+- TEST (testOptimizedInterleavePatterns, "basic");
+ TEST (testYca, "basic");
+ TEST (testTiledYa, "basic");
+ TEST (testNativeFormat, "basic");
+--
+2.32.0
+
diff --git a/media-libs/openexr/openexr-3.1.1.ebuild b/media-libs/openexr/openexr-3.1.1.ebuild
new file mode 100644
index 00000000000..41ba22b004d
--- /dev/null
+++ b/media-libs/openexr/openexr-3.1.1.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic toolchain-funcs
+
+MY_PN=OpenEXR
+MY_PV=$(ver_cut 1)
+MY_P=${MY_PN}-${MY_PV}
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="3/30" # based on SONAME
+# imath needs keywording: x64-macos, x86-solaris
+KEYWORDS="~amd64 ~ia64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="cpu_flags_x86_avx doc examples large-stack static-libs utils test threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/imath-3.1.0:=
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-0001-changes-needed-for-proper-slotting.patch
+ "${FILESDIR}"/${P}-0002-add-version-to-binaries-for-slotting.patch
+ "${FILESDIR}"/${P}-0003-disable-failing-test.patch
+)
+
+DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
+
+src_prepare() {
+ # Fix path for testsuite
+ sed -e "s:/var/tmp/:${T}:" \
+ -i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests"
+
+ cmake_src_prepare
+
+ mv "${S}"/cmake/${MY_PN}.pc.in "${S}"/cmake/${MY_P}.pc.in || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DBUILD_SHARED_LIBS=$(usex !static-libs)
+ -DBUILD_TESTING=$(usex test)
+ -DOPENEXR_BUILD_TOOLS=$(usex utils)
+ -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
+ -DOPENEXR_ENABLE_THREADING=$(usex threads)
+ -DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
+ -DOPENEXR_INSTALL_PKG_CONFIG=ON
+ -DOPENEXR_INSTALL_TOOLS=$(usex utils)
+ -DOPENEXR_OUTPUT_SUBDIR="${MY_P}"
+ -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
+ )
+
+ use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
+
+ cmake_src_configure
+}
+
+src_install() {
+ if use doc; then
+ DOCS+=( docs/*.pdf )
+ fi
+ use examples && docompress -x /usr/share/doc/${PF}/examples
+ cmake_src_install
+
+ cat > "${T}"/99${PN}3 <<-EOF || die
+ LDPATH=/usr/$(get_libdir)/${MY_P}
+ EOF
+ doenvd "${T}"/99${PN}3
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/files/, media-libs/openexr/
@ 2022-09-15 18:39 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2022-09-15 18:39 UTC (permalink / raw
To: gentoo-commits
commit: 2d8c8e2eec7b620ee7cd388512618073e2bde528
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Tue Sep 6 17:55:48 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Sep 15 18:39:13 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d8c8e2e
media-libs/openexr: fix build for gcc-13
Additional patch has been provided to upstream at
https://github.com/AcademySoftwareFoundation/openexr/pull/1276
Closes: https://bugs.gentoo.org/868693
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/27169
Signed-off-by: Sam James <sam <AT> gentoo.org>
...g-include-cstdint-required-by-gcc-13-1264.patch | 44 ++++++++++++++++++++++
....1.5-add-missed-include-cstdint-statement.patch | 21 +++++++++++
media-libs/openexr/openexr-3.1.5.ebuild | 6 ++-
3 files changed, 70 insertions(+), 1 deletion(-)
diff --git a/media-libs/openexr/files/openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch b/media-libs/openexr/files/openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch
new file mode 100644
index 000000000000..3b104089350e
--- /dev/null
+++ b/media-libs/openexr/files/openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch
@@ -0,0 +1,44 @@
+From https://github.com/AcademySoftwareFoundation/openexr/commit/c5763cfdf59ef4880dacdb11664782822a0976cd
+From: Cary Phillips <cary@ilm.com>
+Date: Sun, 31 Jul 2022 13:36:03 -0700
+Subject: [PATCH 1/4] Add missing #include <cstdint> required by gcc-13 (#1264)
+
+Originally submitted as #1262, thanks.
+
+Signed-off-by: Cary Phillips <cary@ilm.com>
+
+Adapted changes in exrcheck/main.cpp for 3.1.5 code base on Gentoo (different
+ordering of #included header files compared to current HEAD).
+--- a/src/bin/exrcheck/main.cpp
++++ b/src/bin/exrcheck/main.cpp
+@@ -4,6 +4,7 @@
+ #include <ImfCheckFile.h>
+ #include <ImathConfig.h>
+
++#include <cstdint>
+ #include <iostream>
+ #include <fstream>
+ #include <string.h>
+--- a/src/lib/OpenEXR/ImfDeepTiledInputFile.h
++++ b/src/lib/OpenEXR/ImfDeepTiledInputFile.h
+@@ -19,6 +19,7 @@
+
+ #include "ImfTileDescription.h"
+
++#include <cstdint>
+ #include <ImathBox.h>
+
+ OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER
+--- a/src/lib/OpenEXR/ImfDeepTiledInputPart.h
++++ b/src/lib/OpenEXR/ImfDeepTiledInputPart.h
+@@ -10,6 +10,7 @@
+
+ #include "ImfTileDescription.h"
+
++#include <cstdint>
+ #include <ImathBox.h>
+
+ OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER
+--
+2.37.3
+
diff --git a/media-libs/openexr/files/openexr-3.1.5-add-missed-include-cstdint-statement.patch b/media-libs/openexr/files/openexr-3.1.5-add-missed-include-cstdint-statement.patch
new file mode 100644
index 000000000000..77ca274703cc
--- /dev/null
+++ b/media-libs/openexr/files/openexr-3.1.5-add-missed-include-cstdint-statement.patch
@@ -0,0 +1,21 @@
+https://github.com/AcademySoftwareFoundation/openexr/pull/1276
+
+From 974b14f67e89dddb6710364034116b3f7b9e0247 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Thu, 15 Sep 2022 18:58:01 +0200
+Subject: [PATCH] add missed #include <cstdint> statement
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- a/src/lib/OpenEXR/ImfTiledMisc.h
++++ b/src/lib/OpenEXR/ImfTiledMisc.h
+@@ -19,6 +19,7 @@
+
+ #include <stdio.h>
+ #include <vector>
++#include <cstdint>
+
+ OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER
+
+--
+2.37.3
+
diff --git a/media-libs/openexr/openexr-3.1.5.ebuild b/media-libs/openexr/openexr-3.1.5.ebuild
index 920a0755bd8a..b13e0484bc86 100644
--- a/media-libs/openexr/openexr-3.1.5.ebuild
+++ b/media-libs/openexr/openexr-3.1.5.ebuild
@@ -30,7 +30,11 @@ BDEPEND="
virtual/pkgconfig
"
-PATCHES=( "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch )
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch
+ "${FILESDIR}"/${P}-Add-missing-include-cstdint-required-by-gcc-13-1264.patch
+ "${FILESDIR}"/${P}-add-missed-include-cstdint-statement.patch
+)
DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/files/, media-libs/openexr/
@ 2023-01-28 11:27 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2023-01-28 11:27 UTC (permalink / raw
To: gentoo-commits
commit: cb815ca5634fd66f398d1e58cfd35a61688114cd
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Jan 28 10:24:52 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Jan 28 11:26:42 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb815ca5
media-libs/openexr: drop 2.5.8
Bug: https://bugs.gentoo.org/817431
Bug: https://bugs.gentoo.org/830384
Bug: https://bugs.gentoo.org/838079
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/29317
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/openexr/Manifest | 1 -
....2-0001-IlmImfTest-main.cpp-disable-tests.patch | 40 -------------
...xr-2.5.7-0002-increase-IlmImfTest-timeout.patch | 13 ----
media-libs/openexr/openexr-2.5.8.ebuild | 70 ----------------------
4 files changed, 124 deletions(-)
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index bd6854bc0ea7..3a13467779b7 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,2 +1 @@
-DIST openexr-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f
DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c
diff --git a/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch b/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch
deleted file mode 100644
index a77705cb5a7d..000000000000
--- a/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 866442b28b53f773efbb3690b6252d2e75bee137 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 3 Jul 2020 15:34:47 +0200
-Subject: [PATCH] IlmImfTest/main.cpp: disable tests
-
-Disable testOptimizedInterleavePatterns and testDwaLookup, which
-are not working on x86.
-For testOptimizedInterleavePatterns, see
-https://github.com/AcademySoftwareFoundation/openexr/issues/67#issuecomment-21169748
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- IlmImfTest/main.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/IlmImfTest/main.cpp b/IlmImfTest/main.cpp
-index 3245fc4..4ab45b1 100644
---- a/IlmImfTest/main.cpp
-+++ b/IlmImfTest/main.cpp
-@@ -228,7 +228,7 @@ main (int argc, char *argv[])
- TEST (testExistingStreams, "core");
- TEST (testStandardAttributes, "core");
- TEST (testOptimized, "basic");
-- TEST (testOptimizedInterleavePatterns, "basic");
-+// TEST (testOptimizedInterleavePatterns, "basic");
- TEST (testYca, "basic");
- TEST (testTiledYa, "basic");
- TEST (testNativeFormat, "basic");
-@@ -255,7 +255,7 @@ main (int argc, char *argv[])
- TEST (testDwaCompressorSimd, "basic");
- TEST (testRle, "core");
- TEST (testB44ExpLogTable, "core");
-- TEST (testDwaLookups, "core");
-+// TEST (testDwaLookups, "core");
-
-
- //#ifdef ENABLE_IMFHUGETEST
---
-2.27.0
-
diff --git a/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch b/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch
deleted file mode 100644
index ef71bc0e6871..000000000000
--- a/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-This consists of A LOT of individual tests and on some hardware
-(e.g. the RISC-V board BeagleV Starlight) the default test time-out
-of 1500 seconds is greatly insufficient. On said BeagleV OpenEXR.IlmImf
-takes almost 4800 s even on an otherwise idle system so let's add a bit
-of margin and set the time-out of this test to 1.5 hours.
-
---- a/IlmImfTest/CMakeLists.txt 2021-06-15 00:15:14.000000000 +0000
-+++ b/IlmImfTest/CMakeLists.txt 2021-07-16 16:51:20.600435829 +0000
-@@ -73,3 +73,4 @@
- target_compile_definitions(IlmImfTest PRIVATE OPENEXR_DLL)
- endif()
- add_test(NAME OpenEXR.IlmImf COMMAND $<TARGET_FILE:IlmImfTest>)
-+set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 5400)
diff --git a/media-libs/openexr/openexr-2.5.8.ebuild b/media-libs/openexr/openexr-2.5.8.ebuild
deleted file mode 100644
index fbe8a897d4ff..000000000000
--- a/media-libs/openexr/openexr-2.5.8.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://www.openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${P}/OpenEXR"
-
-LICENSE="BSD"
-SLOT="0/25" # based on SONAME
-# -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- ~media-libs/ilmbase-${PV}:=[static-libs?,${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-DOCS=( PATENTS README.md )
-
-src_prepare() {
- # Fix path for testsuite
- sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
-
- # disable failing tests on various arches
- if use test; then
- if use abi_x86_32; then
- eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch"
- fi
-
- # Technically this doesn't disable anything, it just gives this test time to complete.
- # Could probably be applied unconditionally but will leave this to the maintainers.
- if use riscv; then
- eapply "${FILESDIR}/${PN}-2.5.7-0002-increase-IlmImfTest-timeout.patch"
- fi
- fi
-
- multilib_foreach_abi cmake_src_prepare
-}
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test)
- -DINSTALL_OPENEXR_DOCS=$(usex doc)
- -DINSTALL_OPENEXR_EXAMPLES=$(usex examples)
- -DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
- -DOPENEXR_BUILD_UTILS=$(usex utils)
- -DOPENEXR_INSTALL_PKG_CONFIG=ON
- -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
- )
-
- cmake_src_configure
-}
-
-multilib_src_install_all() {
- if use doc; then
- DOCS+=( doc/*.pdf )
- fi
- einstalldocs
-
- use examples && docompress -x /usr/share/doc/${PF}/examples
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/files/, media-libs/openexr/
@ 2024-02-21 1:45 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2024-02-21 1:45 UTC (permalink / raw
To: gentoo-commits
commit: b98534f3604d967cd45877e8c1752cd7116563ca
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Thu Oct 26 08:07:14 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Feb 21 01:44:49 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b98534f3
media-libs/openexr: add 3.1.12, 3.2.2
Closes: https://bugs.gentoo.org/920528
Closes: https://bugs.gentoo.org/916514
Closes: https://bugs.gentoo.org/908257
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34218
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/openexr/Manifest | 3 +
.../files/openexr-3.2.1-bintests-iff-utils.patch | 14 +++
media-libs/openexr/openexr-3.1.12.ebuild | 69 +++++++++++
media-libs/openexr/openexr-3.2.2.ebuild | 130 +++++++++++++++++++++
4 files changed, 216 insertions(+)
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index ea41489d2b92..56482c59e738 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,3 +1,6 @@
DIST openexr-3.1.11.tar.gz 20539852 BLAKE2B 9d57362c656a646a5b909063ff57eccfacbc70929a802561c2be71b050e97e7087221f78110f2686fcc1ea960d87880ccdbcb57b474f635a3392f3fa169ef3c5 SHA512 ebbad4b22315522f43cafefca77cf92ce38cac87f024c8dc6429aed04a6dad1f0a3d717faaab39c4c3605e440442952acc4630c5393754ea138929be4ad8a0d4
DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c
DIST openexr-3.1.7.tar.gz 20494812 BLAKE2B 2cc03ed8da77f4a9523b7a0f55c78e78ab55f8f6de67cb68f1b2b4ad4b512448d80f39d60a0cc9eab451da35539027a573a0c6d6900e7f81b39f90703909b5af SHA512 f72f5e728f10c06fca0172c9b4c1df752225c3aed7384b4eaa502f92f8547bb1df93fe96d4d132a81eb32b729cb9fd615be825aa6c5de78481d3038c0d47c4d5
+DIST openexr-3.1.12.tar.gz 20540857 BLAKE2B 94a78e4e45f892b56f9a05cabad5cea999ff1844ff8569995f1f301e8599e0be1c214477f501f351c248eea141db22508eb764c1c91508399e69932026361c04 SHA512 0fce6a1322d74354a29ece9f9afeca1c4874c4d55079ec720f3ef21ab2ab950ec333f793f1ffad6634f57b40c4276af578b31ac8bc3e11856d7b903d5475e5eb
+DIST openexr-3.2.2.tar.gz 18825996 BLAKE2B 535d7798263ee63cbb79981bfd5b8edf4805acd672b7f98457876b7017840263bd6f1491dc63afcd3a66751a73fbb8463764c85ba06c18d59839d9f25a6769db SHA512 b6537a8218686bfad7e6d29ae087d0548624cce81308d31581d99b4b741de3223b22fb8748fe9223e4e3609761815bef5e1bcc55e06302aeaf25d9d9a6134bab
+DIST openexr-images-1.0.tar.gz 252222962 BLAKE2B d57c458dfbd1b08c964429022b6e08a3309bf11cbd43c64e271ebc620dae6dbe70636e5221f47dabd7fe2aa0806f2cf3f3c9b3f55fd7f45b0a34f3e62b6029e7 SHA512 c1c83a26cd326d0fcda824daccb0044abad46f29e1bd2ceb1c38bc62b3e71f0aeef126dddc4517eb1cb9f7c9d0fe234276a48a754bdb7c7823e9aee459d8670a
diff --git a/media-libs/openexr/files/openexr-3.2.1-bintests-iff-utils.patch b/media-libs/openexr/files/openexr-3.2.1-bintests-iff-utils.patch
new file mode 100644
index 000000000000..c5c699b489fe
--- /dev/null
+++ b/media-libs/openexr/files/openexr-3.2.1-bintests-iff-utils.patch
@@ -0,0 +1,14 @@
+diff --git a/src/test/bin/CMakeLists.txt b/src/test/bin/CMakeLists.txt
+index e53b879..ad0190d 100644
+--- a/src/test/bin/CMakeLists.txt
++++ b/src/test/bin/CMakeLists.txt
+@@ -3,6 +3,9 @@
+
+ if(BUILD_TESTING)
+
++ if(NOT OPENEXR_BUILD_TOOLS)
++ return()
++ endif()
+ find_package(Python3 COMPONENTS Interpreter)
+ if (NOT Python3_FOUND)
+ message(STATUS "Python3 not found: skipping bin tests")
diff --git a/media-libs/openexr/openexr-3.1.12.ebuild b/media-libs/openexr/openexr-3.1.12.ebuild
new file mode 100644
index 000000000000..71969a113652
--- /dev/null
+++ b/media-libs/openexr/openexr-3.1.12.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+MY_PN=OpenEXR
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/30" # based on SONAME
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="cpu_flags_x86_avx examples large-stack utils test threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=dev-libs/imath-3.1.6:=
+ sys-libs/zlib
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch )
+DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md )
+
+src_prepare() {
+ # Fix path for testsuite
+ sed -e "s:/var/tmp/:${T}:" \
+ -i "${S}"/src/test/${MY_PN}Test/tmpDir.h || die "failed to set temp path for tests"
+
+ if use x86; then
+ eapply "${FILESDIR}"/${PN}-3.1.5-drop-failing-testDwaLookups.patch
+ fi
+
+ cmake_src_prepare
+}
+
+src_configure() {
+ if use x86; then
+ replace-cpu-flags native i686
+ fi
+
+ local mycmakeargs=(
+ -DBUILD_DOCS=OFF # needs sphinx_press_theme which we don't have in ::gentoo
+ -DBUILD_TESTING=$(usex test)
+ -DOPENEXR_BUILD_TOOLS=$(usex utils)
+ -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
+ -DOPENEXR_ENABLE_THREADING=$(usex threads)
+ -DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
+ -DOPENEXR_INSTALL_PKG_CONFIG=ON
+ -DOPENEXR_INSTALL_TOOLS=$(usex utils)
+ -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
+ )
+
+ use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
+
+ cmake_src_configure
+}
+
+src_install() {
+ use examples && docompress -x /usr/share/doc/${PF}/examples
+
+ cmake_src_install
+}
diff --git a/media-libs/openexr/openexr-3.2.2.ebuild b/media-libs/openexr/openexr-3.2.2.ebuild
new file mode 100644
index 000000000000..71b9a4937dcb
--- /dev/null
+++ b/media-libs/openexr/openexr-3.2.2.ebuild
@@ -0,0 +1,130 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+MY_PN=OpenEXR
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://openexr.com/"
+SRC_URI="
+ https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+ test? (
+ utils? (
+ https://github.com/AcademySoftwareFoundation/openexr-images/archive/refs/tags/v1.0.tar.gz
+ -> openexr-images-1.0.tar.gz
+ )
+ )
+"
+
+LICENSE="BSD"
+SLOT="0/31" # based on SONAME
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="~amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ app-arch/libdeflate
+ >=dev-libs/imath-3.1.6:=
+ doc? (
+ sys-apps/help2man
+ dev-python/sphinx-press-theme
+ )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-3.2.1-bintests-iff-utils.patch"
+)
+
+DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md )
+
+src_prepare() {
+ # Fix path for testsuite
+ sed -e "s:/var/tmp/:${T}:" \
+ -i "${S}"/src/test/${MY_PN}Test/tmpDir.h || die "failed to set temp path for tests"
+
+ sed -e "s:if(INSTALL_DOCS):if(OPENEXR_INSTALL_DOCS):" \
+ -i docs/CMakeLists.txt || die
+
+ if use x86; then
+ eapply "${FILESDIR}/${PN}-3.1.5-drop-failing-testDwaLookups.patch"
+ fi
+
+ cmake_src_prepare
+
+ if use test; then
+ if use utils; then
+ IMAGES=(
+ Beachball/multipart.0001.exr
+ Beachball/singlepart.0001.exr
+ Chromaticities/Rec709.exr
+ Chromaticities/Rec709_YC.exr
+ Chromaticities/XYZ.exr
+ Chromaticities/XYZ_YC.exr
+ LuminanceChroma/Flowers.exr
+ LuminanceChroma/Garden.exr
+ MultiResolution/ColorCodedLevels.exr
+ MultiResolution/WavyLinesCube.exr
+ MultiResolution/WavyLinesLatLong.exr
+ MultiView/Adjuster.exr
+ TestImages/GammaChart.exr
+ TestImages/GrayRampsHorizontal.exr
+ v2/LeftView/Balls.exr
+ v2/Stereo/Trunks.exr
+ )
+
+ mkdir -p "${BUILD_DIR}/src/test/bin" || die
+
+ for image in "${IMAGES[@]}"; do
+ mkdir -p "${BUILD_DIR}/src/test/bin/$(dirname "${image}")" || die
+ cp -a "${WORKDIR}/openexr-images-1.0/${image}" "${BUILD_DIR}/src/test/bin/$(dirname "${image}")/" || die
+ done
+ fi
+ fi
+
+}
+
+src_configure() {
+ if use x86; then
+ replace-cpu-flags native i686
+ fi
+
+ local mycmakeargs=(
+ -DOPENEXR_CXX_STANDARD="17"
+
+ -DBUILD_SHARED_LIBS="yes"
+ -DBUILD_TESTING="$(usex test)"
+ -DBUILD_WEBSITE="no"
+
+ -DOPENEXR_BUILD_PYTHON="no"
+ -DOPENEXR_BUILD_TOOLS="$(usex utils)"
+ -DOPENEXR_ENABLE_LARGE_STACK="$(usex large-stack)"
+ -DOPENEXR_ENABLE_THREADING="$(usex threads)"
+
+ -DOPENEXR_INSTALL="yes"
+ -DOPENEXR_INSTALL_DOCS="$(usex doc "$(usex utils)")"
+ -DOPENEXR_INSTALL_EXAMPLES="$(usex examples)"
+ -DOPENEXR_INSTALL_PKG_CONFIG="yes"
+ -DOPENEXR_INSTALL_TOOLS="$(usex utils)"
+
+ -DOPENEXR_USE_CLANG_TIDY="no" # don't look for clang-tidy
+
+ -DOPENEXR_FORCE_INTERNAL_DEFLATE="no"
+ -DOPENEXR_FORCE_INTERNAL_IMATH="no"
+ -DOPENEXR_RUN_FUZZ_TESTS="$(usex test)" # NOTE expensive
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ use examples && docompress -x "/usr/share/doc/${PF}/examples"
+
+ cmake_src_install
+}
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/files/, media-libs/openexr/
@ 2024-10-04 17:37 Andreas Sturmlechner
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Sturmlechner @ 2024-10-04 17:37 UTC (permalink / raw
To: gentoo-commits
commit: c783c43f8fca08da13b3681b262e5b526a3696dc
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 4 12:10:38 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Oct 4 17:36:58 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c783c43f
media-libs/openexr: drop 3.1.5-r1, 3.1.7, 3.1.11, 3.1.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/openexr/Manifest | 4 --
.../openexr-3.1.1-0003-disable-failing-test.patch | 37 ----------
...g-include-cstdint-required-by-gcc-13-1264.patch | 44 ------------
....1.5-add-missed-include-cstdint-statement.patch | 21 ------
...openexr-3.1.5-drop-failing-testDwaLookups.patch | 29 --------
.../openexr/files/openexr-3.1.5-musl-i386.patch | 19 -----
.../openexr/files/openexr-3.1.7-musl-i386.patch | 19 -----
media-libs/openexr/openexr-3.1.11.ebuild | 81 ----------------------
media-libs/openexr/openexr-3.1.12.ebuild | 81 ----------------------
media-libs/openexr/openexr-3.1.5-r1.ebuild | 78 ---------------------
media-libs/openexr/openexr-3.1.7.ebuild | 73 -------------------
11 files changed, 486 deletions(-)
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 3e7335cd43f1..39bd53e6edb4 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,7 +1,3 @@
-DIST openexr-3.1.11.tar.gz 20539852 BLAKE2B 9d57362c656a646a5b909063ff57eccfacbc70929a802561c2be71b050e97e7087221f78110f2686fcc1ea960d87880ccdbcb57b474f635a3392f3fa169ef3c5 SHA512 ebbad4b22315522f43cafefca77cf92ce38cac87f024c8dc6429aed04a6dad1f0a3d717faaab39c4c3605e440442952acc4630c5393754ea138929be4ad8a0d4
-DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c
-DIST openexr-3.1.7.tar.gz 20494812 BLAKE2B 2cc03ed8da77f4a9523b7a0f55c78e78ab55f8f6de67cb68f1b2b4ad4b512448d80f39d60a0cc9eab451da35539027a573a0c6d6900e7f81b39f90703909b5af SHA512 f72f5e728f10c06fca0172c9b4c1df752225c3aed7384b4eaa502f92f8547bb1df93fe96d4d132a81eb32b729cb9fd615be825aa6c5de78481d3038c0d47c4d5
-DIST openexr-3.1.12.tar.gz 20540857 BLAKE2B 94a78e4e45f892b56f9a05cabad5cea999ff1844ff8569995f1f301e8599e0be1c214477f501f351c248eea141db22508eb764c1c91508399e69932026361c04 SHA512 0fce6a1322d74354a29ece9f9afeca1c4874c4d55079ec720f3ef21ab2ab950ec333f793f1ffad6634f57b40c4276af578b31ac8bc3e11856d7b903d5475e5eb
DIST openexr-3.2.3.tar.gz 18855303 BLAKE2B 4f5dbd9033031e988e973ef039b67632ac92e1272cc1d3e4540992f09f6b275c3ecb4c8f690cd98620519993099d132b43bb4bb40bb0d11caa06db868404015a SHA512 6e0a6fdcfae57c6e8b060d9aeed57140d96d39bffe5e40edd6ea5beb06e569323833d07906316ffca05f48e8409d0ea4174e2cd84d554404a4ee432e07d7b5e6
DIST openexr-3.2.4.tar.gz 18856440 BLAKE2B f29910b2e36808b741860bf603571f607ca929672b3c5b9de7c7c16242f2a38d02627614c10e7b01a8cfd8804923636eb0dfe2c798ec3ff63252dd20e3f8e535 SHA512 ecc3d8b206bda5e5897ac9cd797a8432b76981de10d49cbb107af2b4108c22186de0dda25a9a43b07e18d641ef71508445d95f659a4ca932e029d48ee029a492
DIST openexr-images-1.0.tar.gz 252222962 BLAKE2B d57c458dfbd1b08c964429022b6e08a3309bf11cbd43c64e271ebc620dae6dbe70636e5221f47dabd7fe2aa0806f2cf3f3c9b3f55fd7f45b0a34f3e62b6029e7 SHA512 c1c83a26cd326d0fcda824daccb0044abad46f29e1bd2ceb1c38bc62b3e71f0aeef126dddc4517eb1cb9f7c9d0fe234276a48a754bdb7c7823e9aee459d8670a
diff --git a/media-libs/openexr/files/openexr-3.1.1-0003-disable-failing-test.patch b/media-libs/openexr/files/openexr-3.1.1-0003-disable-failing-test.patch
deleted file mode 100644
index e2f0d6e59621..000000000000
--- a/media-libs/openexr/files/openexr-3.1.1-0003-disable-failing-test.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Wed, 4 Aug 2021 08:33:52 +0200
-Subject: [PATCH] disable failing test
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- src/test/OpenEXRTest/CMakeLists.txt | 1 -
- src/test/OpenEXRTest/main.cpp | 1 -
- 2 files changed, 2 deletions(-)
-
-diff --git a/src/test/OpenEXRTest/CMakeLists.txt b/src/test/OpenEXRTest/CMakeLists.txt
-index 9dd74d1..2a1a2bd 100644
---- a/src/test/OpenEXRTest/CMakeLists.txt
-+++ b/src/test/OpenEXRTest/CMakeLists.txt
-@@ -118,7 +118,6 @@ define_openexr_tests(
- testMultiView
- testNativeFormat
- testOptimized
-- testOptimizedInterleavePatterns
- testPartHelper
- testPreviewImage
- testRgba
-diff --git a/src/test/OpenEXRTest/main.cpp b/src/test/OpenEXRTest/main.cpp
-index 4eaecc9..0c0caed 100644
---- a/src/test/OpenEXRTest/main.cpp
-+++ b/src/test/OpenEXRTest/main.cpp
-@@ -202,7 +202,6 @@ main (int argc, char *argv[])
- TEST (testExistingStreams, "core");
- TEST (testStandardAttributes, "core");
- TEST (testOptimized, "basic");
-- TEST (testOptimizedInterleavePatterns, "basic");
- TEST (testYca, "basic");
- TEST (testTiledYa, "basic");
- TEST (testNativeFormat, "basic");
---
-2.32.0
-
diff --git a/media-libs/openexr/files/openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch b/media-libs/openexr/files/openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch
deleted file mode 100644
index 3b104089350e..000000000000
--- a/media-libs/openexr/files/openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From https://github.com/AcademySoftwareFoundation/openexr/commit/c5763cfdf59ef4880dacdb11664782822a0976cd
-From: Cary Phillips <cary@ilm.com>
-Date: Sun, 31 Jul 2022 13:36:03 -0700
-Subject: [PATCH 1/4] Add missing #include <cstdint> required by gcc-13 (#1264)
-
-Originally submitted as #1262, thanks.
-
-Signed-off-by: Cary Phillips <cary@ilm.com>
-
-Adapted changes in exrcheck/main.cpp for 3.1.5 code base on Gentoo (different
-ordering of #included header files compared to current HEAD).
---- a/src/bin/exrcheck/main.cpp
-+++ b/src/bin/exrcheck/main.cpp
-@@ -4,6 +4,7 @@
- #include <ImfCheckFile.h>
- #include <ImathConfig.h>
-
-+#include <cstdint>
- #include <iostream>
- #include <fstream>
- #include <string.h>
---- a/src/lib/OpenEXR/ImfDeepTiledInputFile.h
-+++ b/src/lib/OpenEXR/ImfDeepTiledInputFile.h
-@@ -19,6 +19,7 @@
-
- #include "ImfTileDescription.h"
-
-+#include <cstdint>
- #include <ImathBox.h>
-
- OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER
---- a/src/lib/OpenEXR/ImfDeepTiledInputPart.h
-+++ b/src/lib/OpenEXR/ImfDeepTiledInputPart.h
-@@ -10,6 +10,7 @@
-
- #include "ImfTileDescription.h"
-
-+#include <cstdint>
- #include <ImathBox.h>
-
- OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER
---
-2.37.3
-
diff --git a/media-libs/openexr/files/openexr-3.1.5-add-missed-include-cstdint-statement.patch b/media-libs/openexr/files/openexr-3.1.5-add-missed-include-cstdint-statement.patch
deleted file mode 100644
index 77ca274703cc..000000000000
--- a/media-libs/openexr/files/openexr-3.1.5-add-missed-include-cstdint-statement.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/AcademySoftwareFoundation/openexr/pull/1276
-
-From 974b14f67e89dddb6710364034116b3f7b9e0247 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Thu, 15 Sep 2022 18:58:01 +0200
-Subject: [PATCH] add missed #include <cstdint> statement
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/src/lib/OpenEXR/ImfTiledMisc.h
-+++ b/src/lib/OpenEXR/ImfTiledMisc.h
-@@ -19,6 +19,7 @@
-
- #include <stdio.h>
- #include <vector>
-+#include <cstdint>
-
- OPENEXR_IMF_INTERNAL_NAMESPACE_HEADER_ENTER
-
---
-2.37.3
-
diff --git a/media-libs/openexr/files/openexr-3.1.5-drop-failing-testDwaLookups.patch b/media-libs/openexr/files/openexr-3.1.5-drop-failing-testDwaLookups.patch
deleted file mode 100644
index 7579ddd23156..000000000000
--- a/media-libs/openexr/files/openexr-3.1.5-drop-failing-testDwaLookups.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6f3c61b994e9a503fcc9649cba439d81f40901d0 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Tue, 27 Sep 2022 07:29:11 +0200
-Subject: [PATCH] drop failing testDwaLookups
-
-On x86_32 testDwaLookups fails
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
---- a/src/test/OpenEXRTest/main.cpp
-+++ b/src/test/OpenEXRTest/main.cpp
-@@ -65,7 +65,6 @@
- #include "testDwaCompressorSimd.h"
- #include "testRle.h"
- #include "testB44ExpLogTable.h"
--#include "testDwaLookups.h"
- #include "testIDManifest.h"
-
- #include "tmpDir.h"
-@@ -229,7 +228,6 @@ main (int argc, char *argv[])
- TEST (testDwaCompressorSimd, "basic");
- TEST (testRle, "core");
- TEST (testB44ExpLogTable, "core");
-- TEST (testDwaLookups, "core");
- TEST (testIDManifest, "core");
-
- // NB: If you add a test here, make sure to enumerate it in the
---
-2.37.3
-
diff --git a/media-libs/openexr/files/openexr-3.1.5-musl-i386.patch b/media-libs/openexr/files/openexr-3.1.5-musl-i386.patch
deleted file mode 100644
index 2b7a31ac694d..000000000000
--- a/media-libs/openexr/files/openexr-3.1.5-musl-i386.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/lib/Iex/IexMathFpu.cpp
-+++ b/src/lib/Iex/IexMathFpu.cpp
-@@ -251,14 +251,14 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
--# if defined(__GLIBC__) && defined(__i386__)
-+# if defined(__linux__) && defined(__i386__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
- #else
- setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
- # endif
-
- _fpstate* kfp = reinterpret_cast<_fpstate*> (ucon.uc_mcontext.fpregs);
--# if defined(__GLIBC__) && defined(__i386__)
-+# if defined(__linux__) && defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
- #else
- setMxcsr (kfp->mxcsr, clearExceptions);
diff --git a/media-libs/openexr/files/openexr-3.1.7-musl-i386.patch b/media-libs/openexr/files/openexr-3.1.7-musl-i386.patch
deleted file mode 100644
index e2bedf6e7a12..000000000000
--- a/media-libs/openexr/files/openexr-3.1.7-musl-i386.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/src/lib/Iex/IexMathFpu.cpp
-+++ b/src/lib/Iex/IexMathFpu.cpp
-@@ -251,14 +251,14 @@
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
--# if (defined(__GLIBC__) && defined(__i386__)) || defined(__ANDROID_API__)
-+# if (defined(__linux__) && defined(__i386__)) || defined(__ANDROID_API__)
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
- #else
- setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
- # endif
-
- _fpstate* kfp = reinterpret_cast<_fpstate*> (ucon.uc_mcontext.fpregs);
--# if defined(__GLIBC__) && defined(__i386__)
-+# if defined(__linux__) && defined(__i386__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
- #else
- setMxcsr (kfp->mxcsr, clearExceptions);
diff --git a/media-libs/openexr/openexr-3.1.11.ebuild b/media-libs/openexr/openexr-3.1.11.ebuild
deleted file mode 100644
index 4b0af468a73a..000000000000
--- a/media-libs/openexr/openexr-3.1.11.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-MY_PN=OpenEXR
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/30" # based on SONAME
-# -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="cpu_flags_x86_avx examples large-stack utils test threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/imath-3.1.6:=
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch )
-DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md )
-
-src_prepare() {
- # Fix path for testsuite
- sed -e "s:/var/tmp/:${T}:" \
- -i "${S}"/src/test/${MY_PN}Test/tmpDir.h || die "failed to set temp path for tests"
-
- if use x86; then
- eapply "${FILESDIR}"/${PN}-3.1.5-drop-failing-testDwaLookups.patch
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- if use x86; then
- replace-cpu-flags native i686
- fi
-
- local mycmakeargs=(
- -DBUILD_DOCS=OFF # needs sphinx_press_theme which we don't have in ::gentoo
- -DBUILD_TESTING=$(usex test)
- -DOPENEXR_BUILD_TOOLS=$(usex utils)
- -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
- -DOPENEXR_ENABLE_THREADING=$(usex threads)
- -DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
- -DOPENEXR_INSTALL_PKG_CONFIG=ON
- -DOPENEXR_INSTALL_TOOLS=$(usex utils)
- -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
- )
-
- use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
-
- cmake_src_configure
-}
-
-src_test() {
- local CMAKE_SKIP_TESTS=()
-
- use arm64 && CMAKE_SKIP_TESTS+=(
- # bug #922247
- 'OpenEXRCore.testDWAACompression'
- 'OpenEXRCore.testDWABCompression'
- )
-
- cmake_src_test
-}
-
-src_install() {
- use examples && docompress -x /usr/share/doc/${PF}/examples
-
- cmake_src_install
-}
diff --git a/media-libs/openexr/openexr-3.1.12.ebuild b/media-libs/openexr/openexr-3.1.12.ebuild
deleted file mode 100644
index de6cba52a4ee..000000000000
--- a/media-libs/openexr/openexr-3.1.12.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-MY_PN=OpenEXR
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/30" # based on SONAME
-# -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="~amd64 ~arm ~arm64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="cpu_flags_x86_avx examples large-stack utils test threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/imath-3.1.6:=
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch )
-DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md )
-
-src_prepare() {
- # Fix path for testsuite
- sed -e "s:/var/tmp/:${T}:" \
- -i "${S}"/src/test/${MY_PN}Test/tmpDir.h || die "failed to set temp path for tests"
-
- if use x86; then
- eapply "${FILESDIR}"/${PN}-3.1.5-drop-failing-testDwaLookups.patch
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- if use x86; then
- replace-cpu-flags native i686
- fi
-
- local mycmakeargs=(
- -DBUILD_DOCS=OFF # needs sphinx_press_theme which we don't have in ::gentoo
- -DBUILD_TESTING=$(usex test)
- -DOPENEXR_BUILD_TOOLS=$(usex utils)
- -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
- -DOPENEXR_ENABLE_THREADING=$(usex threads)
- -DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
- -DOPENEXR_INSTALL_PKG_CONFIG=ON
- -DOPENEXR_INSTALL_TOOLS=$(usex utils)
- -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
- )
-
- use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
-
- cmake_src_configure
-}
-
-src_test() {
- local CMAKE_SKIP_TESTS=()
-
- use arm64 && CMAKE_SKIP_TESTS+=(
- # bug #922247
- 'OpenEXRCore.testDWAACompression'
- 'OpenEXRCore.testDWABCompression'
- )
-
- cmake_src_test
-}
-
-src_install() {
- use examples && docompress -x /usr/share/doc/${PF}/examples
-
- cmake_src_install
-}
diff --git a/media-libs/openexr/openexr-3.1.5-r1.ebuild b/media-libs/openexr/openexr-3.1.5-r1.ebuild
deleted file mode 100644
index 8ec80d3071e3..000000000000
--- a/media-libs/openexr/openexr-3.1.5-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-MY_PN=OpenEXR
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/30" # based on SONAME
-# -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="cpu_flags_x86_avx doc examples large-stack utils test threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/imath-${PV}:=
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? ( dev-python/breathe )
- virtual/pkgconfig
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch
- "${FILESDIR}"/${P}-Add-missing-include-cstdint-required-by-gcc-13-1264.patch
- "${FILESDIR}"/${P}-add-missed-include-cstdint-statement.patch
- "${FILESDIR}"/${P}-musl-i386.patch
-)
-
-DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md docs/SymbolVisibility.md )
-
-src_prepare() {
- # Fix path for testsuite
- sed -e "s:/var/tmp/:${T}:" \
- -i "${S}"/src/test/${MY_PN}{,Fuzz,Util}Test/tmpDir.h || die "failed to set temp path for tests"
-
- if use x86; then
- eapply "${FILESDIR}"/${P}-drop-failing-testDwaLookups.patch
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- if use x86; then
- replace-cpu-flags native i686
- fi
-
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test)
- -DDOCS=$(usex doc)
- -DOPENEXR_BUILD_TOOLS=$(usex utils)
- -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
- -DOPENEXR_ENABLE_THREADING=$(usex threads)
- -DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
- -DOPENEXR_INSTALL_PKG_CONFIG=ON
- -DOPENEXR_INSTALL_TOOLS=$(usex utils)
- -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
- )
-
- use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
-
- cmake_src_configure
-}
-
-src_install() {
- use examples && docompress -x /usr/share/doc/${PF}/examples
-
- cmake_src_install
-}
diff --git a/media-libs/openexr/openexr-3.1.7.ebuild b/media-libs/openexr/openexr-3.1.7.ebuild
deleted file mode 100644
index cedfef02a75b..000000000000
--- a/media-libs/openexr/openexr-3.1.7.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-MY_PN=OpenEXR
-
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
-HOMEPAGE="https://openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/30" # based on SONAME
-# -ppc -sparc because broken on big endian, bug #818424
-KEYWORDS="amd64 ~arm arm64 ~loong -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="cpu_flags_x86_avx examples large-stack utils test threads"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=dev-libs/imath-3.1.6:=
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch
- "${FILESDIR}"/${PN}-3.1.7-musl-i386.patch
-)
-
-DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md )
-
-src_prepare() {
- # Fix path for testsuite
- sed -e "s:/var/tmp/:${T}:" \
- -i "${S}"/src/test/${MY_PN}Test/tmpDir.h || die "failed to set temp path for tests"
-
- if use x86; then
- eapply "${FILESDIR}"/${PN}-3.1.5-drop-failing-testDwaLookups.patch
- fi
-
- cmake_src_prepare
-}
-
-src_configure() {
- if use x86; then
- replace-cpu-flags native i686
- fi
-
- local mycmakeargs=(
- -DBUILD_DOCS=OFF # needs sphinx_press_theme which we don't have in ::gentoo
- -DBUILD_TESTING=$(usex test)
- -DOPENEXR_BUILD_TOOLS=$(usex utils)
- -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack)
- -DOPENEXR_ENABLE_THREADING=$(usex threads)
- -DOPENEXR_INSTALL_EXAMPLES=$(usex examples)
- -DOPENEXR_INSTALL_PKG_CONFIG=ON
- -DOPENEXR_INSTALL_TOOLS=$(usex utils)
- -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
- )
-
- use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON )
-
- cmake_src_configure
-}
-
-src_install() {
- use examples && docompress -x /usr/share/doc/${PF}/examples
-
- cmake_src_install
-}
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-10-04 17:37 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-04 17:37 [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/files/, media-libs/openexr/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-02-21 1:45 Sam James
2023-01-28 11:27 Andreas Sturmlechner
2022-09-15 18:39 Sam James
2021-08-12 6:45 Joonas Niilola
2021-07-21 21:57 Marek Szuba
2021-03-31 6:31 Joonas Niilola
2020-07-02 6:03 Rémi Cardona
2019-06-04 2:51 Andreas K. Hüttel
2018-10-13 9:05 Mikle Kolyada
2017-09-28 12:50 Alexis Ballier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox