* [gentoo-commits] repo/gentoo:master commit in: media-libs/ilmbase/, media-libs/ilmbase/files/
@ 2017-09-28 12:50 Alexis Ballier
0 siblings, 0 replies; 8+ messages in thread
From: Alexis Ballier @ 2017-09-28 12:50 UTC (permalink / raw
To: gentoo-commits
commit: 24675bd3c2c26e2a612932e0471af99c34a4f1b0
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com>
AuthorDate: Sat Sep 23 13:01:19 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=24675bd3
media-libs/ilmbase: Revision bump to 2.2.0-r1
* Changed ebuild to EAPI 6
* Changed ebuild to use multilib-minimal
* Added patch to remove register keyword for GCC7 Compat
* Added tabs in the metadata.xml file
.../ilmbase-2.2.0-Remove-register-keyword.patch | 79 ++++++++++++++++++++++
media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild | 30 ++++++++
media-libs/ilmbase/metadata.xml | 9 ++-
3 files changed, 115 insertions(+), 3 deletions(-)
diff --git a/media-libs/ilmbase/files/ilmbase-2.2.0-Remove-register-keyword.patch b/media-libs/ilmbase/files/ilmbase-2.2.0-Remove-register-keyword.patch
new file mode 100644
index 00000000000..3fd95aceda9
--- /dev/null
+++ b/media-libs/ilmbase/files/ilmbase-2.2.0-Remove-register-keyword.patch
@@ -0,0 +1,79 @@
+From 6d297f35c5dbfacc8a5e94f33b986db7ab468db9 Mon Sep 17 00:00:00 2001
+From: Larry Gritz <lg@larrygritz.com>
+Date: Fri, 30 Sep 2016 15:58:27 -0700
+Subject: [PATCH] Remove 'register' keyword.
+
+'register' is a relic of K&R-era C, it's utterly useless in modern
+compilers. It's been deprecated in C++11, and therefore will generate
+warnings when encountered -- and many packages that use OpenEXR's public
+headers use -Werr to turn warnings into errors. Starting in C++17, the
+keyword is removed entirely, and thus will certainly be a build break
+for that version of the standard. So it's time for it to go.
+---
+ IlmBase/Half/half.cpp | 6 +++---
+ IlmBase/Half/half.h | 4 ++--
+ IlmBase/Imath/ImathMatrix.h | 8 ++++----
+ 3 files changed, 9 insertions(+), 9 deletions(-)
+
+diff --git a/Half/half.cpp b/Half/half.cpp
+index 609aaa1..09a50aa 100644
+--- a/Half/half.cpp
++++ b/Half/half.cpp
+@@ -94,9 +94,9 @@ half::convert (int i)
+ // of float and half (127 versus 15).
+ //
+
+- register int s = (i >> 16) & 0x00008000;
+- register int e = ((i >> 23) & 0x000000ff) - (127 - 15);
+- register int m = i & 0x007fffff;
++ int s = (i >> 16) & 0x00008000;
++ int e = ((i >> 23) & 0x000000ff) - (127 - 15);
++ int m = i & 0x007fffff;
+
+ //
+ // Now reassemble s, e and m into a half:
+diff --git a/Half/half.h b/Half/half.h
+index f78e4f6..da418d6 100644
+--- a/Half/half.h
++++ b/Half/half.h
+@@ -459,7 +459,7 @@ half::half (float f)
+ // to do the float-to-half conversion.
+ //
+
+- register int e = (x.i >> 23) & 0x000001ff;
++ int e = (x.i >> 23) & 0x000001ff;
+
+ e = _eLut[e];
+
+@@ -470,7 +470,7 @@ half::half (float f)
+ // bits and combine it with the sign and exponent.
+ //
+
+- register int m = x.i & 0x007fffff;
++ int m = x.i & 0x007fffff;
+ _h = e + ((m + 0x00000fff + ((m >> 13) & 1)) >> 13);
+ }
+ else
+diff --git a/Imath/ImathMatrix.h b/Imath/ImathMatrix.h
+index 3e96c2f..1d7f8dc 100644
+--- a/Imath/ImathMatrix.h
++++ b/Imath/ImathMatrix.h
+@@ -2527,11 +2527,11 @@ Matrix44<T>::multiply (const Matrix44<T> &a,
+ const Matrix44<T> &b,
+ Matrix44<T> &c)
+ {
+- register const T * IMATH_RESTRICT ap = &a.x[0][0];
+- register const T * IMATH_RESTRICT bp = &b.x[0][0];
+- register T * IMATH_RESTRICT cp = &c.x[0][0];
++ const T * IMATH_RESTRICT ap = &a.x[0][0];
++ const T * IMATH_RESTRICT bp = &b.x[0][0];
++ T * IMATH_RESTRICT cp = &c.x[0][0];
+
+- register T a0, a1, a2, a3;
++ T a0, a1, a2, a3;
+
+ a0 = ap[0];
+ a1 = ap[1];
+--
+2.14.1
+
diff --git a/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild b/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild
new file mode 100644
index 00000000000..0fbeb31e701
--- /dev/null
+++ b/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit multilib-minimal
+
+DESCRIPTION="OpenEXR ILM Base libraries"
+HOMEPAGE="http://openexr.com/"
+SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/12" # based on SONAME
+KEYWORDS="~amd64 -arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="static-libs"
+
+DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
+
+PATCHES=( "${FILESDIR}/${P}-Remove-register-keyword.patch" )
+
+multilib_src_configure() {
+ # Disable use of ucontext.h wrt #482890
+ if use hppa || use ppc || use ppc64; then
+ export ac_cv_header_ucontext_h=no
+ fi
+
+ ECONF_SOURCE=${S} econf "$(use_enable static-libs static)"
+}
diff --git a/media-libs/ilmbase/metadata.xml b/media-libs/ilmbase/metadata.xml
index 0427ec20bfd..fc9e500d69e 100644
--- a/media-libs/ilmbase/metadata.xml
+++ b/media-libs/ilmbase/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>
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/ilmbase/, media-libs/ilmbase/files/
@ 2018-05-29 20:10 Aaron Bauman
0 siblings, 0 replies; 8+ messages in thread
From: Aaron Bauman @ 2018-05-29 20:10 UTC (permalink / raw
To: gentoo-commits
commit: 7b674cdd0997d2106b62d3ef41dbf6db479ea07f
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Tue May 29 15:43:18 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Tue May 29 20:10:15 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7b674cdd
media-libs/ilmbase: bump EAPI and drop eutils
Package-Manager: Portage-2.3.40, Repoman-2.3.9
.../ilmbase/files/ilmbase-1.0.0-asneeded.patch | 4 ++--
media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch | 4 ++--
media-libs/ilmbase/ilmbase-1.0.2.ebuild | 20 +++++++++++---------
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch b/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch
index dc69fb98363..a3953efd351 100644
--- a/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch
+++ b/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch
@@ -1,5 +1,5 @@
---- IlmThread/Makefile.in
-+++ IlmThread/Makefile.in
+--- a/IlmThread/Makefile.in
++++ b/IlmThread/Makefile.in
@@ -209,7 +209,7 @@
IlmThreadMutexPosix.cpp
diff --git a/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch b/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch
index d822092254d..a4e186058fe 100644
--- a/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch
+++ b/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch
@@ -1,5 +1,5 @@
---- Imath/ImathMatrix.h
-+++ Imath/ImathMatrix.h
+--- a/Imath/ImathMatrix.h
++++ b/Imath/ImathMatrix.h
@@ -37,6 +37,8 @@
#ifndef INCLUDED_IMATHMATRIX_H
#define INCLUDED_IMATHMATRIX_H
diff --git a/media-libs/ilmbase/ilmbase-1.0.2.ebuild b/media-libs/ilmbase/ilmbase-1.0.2.ebuild
index eb979ea8ca4..b92d275e1df 100644
--- a/media-libs/ilmbase/ilmbase-1.0.2.ebuild
+++ b/media-libs/ilmbase/ilmbase-1.0.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=2
-inherit eutils libtool
+EAPI=6
+inherit libtool
DESCRIPTION="OpenEXR ILM Base libraries"
HOMEPAGE="http://openexr.com/"
@@ -16,20 +16,22 @@ IUSE="static-libs"
RDEPEND="!<media-libs/openexr-1.5.0"
DEPEND="${RDEPEND}"
+PATCHES=(
+ "${FILESDIR}/${PN}-1.0.0-asneeded.patch"
+ "${FILESDIR}/${P}-gcc43.patch"
+)
+
src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.0.0-asneeded.patch \
- "${FILESDIR}"/${P}-gcc43.patch
+ default
elibtoolize
}
src_configure() {
econf \
- --disable-dependency-tracking \
$(use_enable static-libs static)
}
src_install() {
- emake DESTDIR="${D}" install || die
- dodoc AUTHORS ChangeLog NEWS README
- find "${D}" -name '*.la' -delete
+ default
+ find "${D}" -name '*.la' -delete || die "Pruning failed"
}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/ilmbase/, media-libs/ilmbase/files/
@ 2019-04-24 10:05 Thomas Deutschmann
0 siblings, 0 replies; 8+ messages in thread
From: Thomas Deutschmann @ 2019-04-24 10:05 UTC (permalink / raw
To: gentoo-commits
commit: a8636649d3a2386dfbf4f5229db196f52248eea6
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 24 10:05:12 2019 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Wed Apr 24 10:05:12 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a8636649
media-libs/ilmbase: fix test failure on x86
Package-Manager: Portage-2.3.64, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
.../ilmbase/files/ilmbase-2.3.0-testBox.patch | 104 +++++++++++++++++++++
media-libs/ilmbase/ilmbase-2.3.0.ebuild | 2 +
2 files changed, 106 insertions(+)
diff --git a/media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch b/media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch
new file mode 100644
index 00000000000..8211846b09b
--- /dev/null
+++ b/media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch
@@ -0,0 +1,104 @@
+Subject: testBox: allow fuzzy comparison of floats, doubles
+From: Steven Chamberlain <steven@pyro.eu.org>
+Date: Wed, 24 Feb 2016 01:10:11 +0000
+
+Allow for inexact values, as long as the error is smaller than the
+epsilon of the data type.
+
+On 32-bit x86, allow even greater discrepency at double
+precision, due to possible double-rounding. See
+https://lists.nongnu.org/archive/html/openexr-devel/2015-12/msg00001.html
+
+Index: ilmbase/ImathTest/testBox.cpp
+===================================================================
+--- ilmbase.orig/ImathTest/testBox.cpp
++++ ilmbase/ImathTest/testBox.cpp
+@@ -47,6 +47,58 @@ using namespace IMATH_INTERNAL_NAMESPACE
+
+ namespace {
+
++template <class T>
++bool
++approximatelyEqual (const T &p1, const T &p2)
++{
++ /* int and short should be exact */
++ return (p1 == p2);
++}
++
++bool
++approximatelyEqual (const Vec2<float> &p1, const Vec2<float> &p2)
++{
++ float e = limits<float>::epsilon();
++ float m = 0;
++
++ for (int i = 0; i < 2; ++i)
++ {
++ m = max (m, abs (p1[i]));
++ m = max (m, abs (p2[i]));
++ }
++
++ for (int i = 0; i < 2; ++i)
++ if (!equalWithAbsError (p1[i], p2[i], m * e))
++ return false;
++
++ return true;
++}
++
++bool
++approximatelyEqual (const Vec2<double> &p1, const Vec2<double> &p2)
++{
++#if defined(__i386__) || defined(_M_IX86)
++ /* double-rounding on 32-bit x86 may cause larger error:
++ use epsilon of float rather than double */
++ double e = limits<float>::epsilon();
++#else
++ double e = limits<double>::epsilon();
++#endif
++ double m = 0;
++
++ for (int i = 0; i < 2; ++i)
++ {
++ m = max (m, abs (p1[i]));
++ m = max (m, abs (p2[i]));
++ }
++
++ for (int i = 0; i < 2; ++i)
++ if (!equalWithAbsError (p1[i], p2[i], m * e))
++ return false;
++
++ return true;
++}
++
+ //
+ // Test case generation utility - create a vector of IMATH_INTERNAL_NAMESPACE::Vec{2,3,4}
+ // with all permutations of integers 1..T::dimensions().
+@@ -250,7 +302,8 @@ testExtendByPoint(const char *type)
+
+ IMATH_INTERNAL_NAMESPACE::Box<T> b;
+ b.extendBy(p);
+- assert(b.min == p && b.max == p);
++ assert (approximatelyEqual (b.min, p));
++ assert (approximatelyEqual (b.max, p));
+ }
+
+ //
+@@ -283,7 +336,8 @@ testExtendByPoint(const char *type)
+
+ b.extendBy(p);
+
+- assert(b.min == min && b.max == max);
++ assert (approximatelyEqual (b.min, min));
++ assert (approximatelyEqual (b.max, max));
+ }
+ }
+ }
+@@ -358,7 +412,8 @@ testExtendByBox(const char *type)
+ }
+ b.extendBy(IMATH_INTERNAL_NAMESPACE::Box<T>(p0, p1));
+
+- assert(b.min == min && b.max == max);
++ assert (approximatelyEqual (b.min, min));
++ assert (approximatelyEqual (b.max, max));
+ }
+ }
+ }
diff --git a/media-libs/ilmbase/ilmbase-2.3.0.ebuild b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
index 98490276a1d..bc9937e3b17 100644
--- a/media-libs/ilmbase/ilmbase-2.3.0.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
@@ -15,6 +15,8 @@ IUSE="static-libs"
DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]"
+PATCHES=( "${FILESDIR}"/${PN}-2.3.0-testBox.patch )
+
DOCS=( AUTHORS ChangeLog NEWS README.md )
MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/ilmbase/, media-libs/ilmbase/files/
@ 2019-06-04 2:51 Andreas K. Hüttel
0 siblings, 0 replies; 8+ messages in thread
From: Andreas K. Hüttel @ 2019-06-04 2:51 UTC (permalink / raw
To: gentoo-commits
commit: fc1ce929dcdaa63179c68c5c83e74fdb5a6e227a
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 4 02:48:24 2019 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jun 4 02:48:24 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc1ce929
media-libs/ilmbase: 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/ilmbase/Manifest | 4 --
.../ilmbase/files/ilmbase-1.0.0-asneeded.patch | 11 ---
media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch | 11 ---
.../ilmbase-2.2.0-Remove-register-keyword.patch | 79 ----------------------
media-libs/ilmbase/ilmbase-1.0.2.ebuild | 37 ----------
media-libs/ilmbase/ilmbase-2.0.1-r1.ebuild | 17 -----
media-libs/ilmbase/ilmbase-2.1.0.ebuild | 26 -------
media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild | 33 ---------
media-libs/ilmbase/ilmbase-2.2.0.ebuild | 26 -------
9 files changed, 244 deletions(-)
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index cb8ef67725d..b89e75e8259 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,5 +1 @@
-DIST ilmbase-1.0.2.tar.gz 496540 BLAKE2B 1727be15753102f56d7b23bb88c68897006cdba546000653f7028c511e6cd208bcbf23b27478db25f41890bb362e687e10fc9342785d25a92df6a3d7b0b77d90 SHA512 5a1a0011ef43132f33832d2e322320abb81a0f495e921de52af8f6e9ee50e0bed63897a0054de228f4081cc2f6591cb99a686f908620e87bf86c9d2d689923cd
-DIST ilmbase-2.0.1.tar.gz 555828 BLAKE2B 95cf3019c74c1efd95e1b7ddf2df224f4bcc93bafb9936c408f94ddaa2fa243161c91f8527ec9e67d7d48fb9d41dc84c42a2745d8e75d3a648f66bf0331d41e7 SHA512 0f2341fefd7c661b62bfd42590c9f29e5b58fbf303a4418e17d3bb831c40ebe23848250f360bc755113b84882665eb8c90497ee2f8d77bc5ed8e1fd43182c712
-DIST ilmbase-2.1.0.tar.gz 557552 BLAKE2B f210d47ab886cf9d2d76ca6ef6cc86123f887a0a3971e4063b5451293827861f10a6cc94bbe2399a9fcbacf48492e8d739b216b4baef72cc167bec1f2ed5fd6f SHA512 2d168accc4f4fb8256fa7a4488c1a930bf1f088bda93f6d8272d3ce15219716d3e85dfa1e85dc2766bce10438e8fb38607a232a145c00d5d742cbde6604df342
-DIST ilmbase-2.2.0.tar.gz 525289 BLAKE2B 951f6601075098b5f38e26d47f28a83f923d2689d306c02c855a0e8c846a339dfa589f574c6ffcb70e56ed8d7ff0202fea0709939c65aeaff3978ab9e2d58f4a SHA512 0bbad14ed2bd286dff3987b16ef8631470211da54f822cb3e29b7931807216845ded81c9bf41fd2d22a8b362e8b9904a5450f61f5a242e460083e86b846513f1
DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
diff --git a/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch b/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch
deleted file mode 100644
index a3953efd351..00000000000
--- a/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/IlmThread/Makefile.in
-+++ b/IlmThread/Makefile.in
-@@ -209,7 +209,7 @@
- IlmThreadMutexPosix.cpp
-
- libIlmThread_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ -no-undefined
--libIlmThread_la_LIBADD = ../Iex/libIex.la
-+libIlmThread_la_LIBADD = ../Iex/libIex.la -lpthread
- libIlmThreadincludedir = $(includedir)/OpenEXR
- libIlmThreadinclude_HEADERS = IlmThreadPool.h IlmThread.h \
- IlmThreadSemaphore.h IlmThreadMutex.h
diff --git a/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch b/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch
deleted file mode 100644
index a4e186058fe..00000000000
--- a/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Imath/ImathMatrix.h
-+++ b/Imath/ImathMatrix.h
-@@ -37,6 +37,8 @@
- #ifndef INCLUDED_IMATHMATRIX_H
- #define INCLUDED_IMATHMATRIX_H
-
-+#include <cstring>
-+
- //----------------------------------------------------------------
- //
- // 2D (3x3) and 3D (4x4) transformation matrix templates.
diff --git a/media-libs/ilmbase/files/ilmbase-2.2.0-Remove-register-keyword.patch b/media-libs/ilmbase/files/ilmbase-2.2.0-Remove-register-keyword.patch
deleted file mode 100644
index 3fd95aceda9..00000000000
--- a/media-libs/ilmbase/files/ilmbase-2.2.0-Remove-register-keyword.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 6d297f35c5dbfacc8a5e94f33b986db7ab468db9 Mon Sep 17 00:00:00 2001
-From: Larry Gritz <lg@larrygritz.com>
-Date: Fri, 30 Sep 2016 15:58:27 -0700
-Subject: [PATCH] Remove 'register' keyword.
-
-'register' is a relic of K&R-era C, it's utterly useless in modern
-compilers. It's been deprecated in C++11, and therefore will generate
-warnings when encountered -- and many packages that use OpenEXR's public
-headers use -Werr to turn warnings into errors. Starting in C++17, the
-keyword is removed entirely, and thus will certainly be a build break
-for that version of the standard. So it's time for it to go.
----
- IlmBase/Half/half.cpp | 6 +++---
- IlmBase/Half/half.h | 4 ++--
- IlmBase/Imath/ImathMatrix.h | 8 ++++----
- 3 files changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/Half/half.cpp b/Half/half.cpp
-index 609aaa1..09a50aa 100644
---- a/Half/half.cpp
-+++ b/Half/half.cpp
-@@ -94,9 +94,9 @@ half::convert (int i)
- // of float and half (127 versus 15).
- //
-
-- register int s = (i >> 16) & 0x00008000;
-- register int e = ((i >> 23) & 0x000000ff) - (127 - 15);
-- register int m = i & 0x007fffff;
-+ int s = (i >> 16) & 0x00008000;
-+ int e = ((i >> 23) & 0x000000ff) - (127 - 15);
-+ int m = i & 0x007fffff;
-
- //
- // Now reassemble s, e and m into a half:
-diff --git a/Half/half.h b/Half/half.h
-index f78e4f6..da418d6 100644
---- a/Half/half.h
-+++ b/Half/half.h
-@@ -459,7 +459,7 @@ half::half (float f)
- // to do the float-to-half conversion.
- //
-
-- register int e = (x.i >> 23) & 0x000001ff;
-+ int e = (x.i >> 23) & 0x000001ff;
-
- e = _eLut[e];
-
-@@ -470,7 +470,7 @@ half::half (float f)
- // bits and combine it with the sign and exponent.
- //
-
-- register int m = x.i & 0x007fffff;
-+ int m = x.i & 0x007fffff;
- _h = e + ((m + 0x00000fff + ((m >> 13) & 1)) >> 13);
- }
- else
-diff --git a/Imath/ImathMatrix.h b/Imath/ImathMatrix.h
-index 3e96c2f..1d7f8dc 100644
---- a/Imath/ImathMatrix.h
-+++ b/Imath/ImathMatrix.h
-@@ -2527,11 +2527,11 @@ Matrix44<T>::multiply (const Matrix44<T> &a,
- const Matrix44<T> &b,
- Matrix44<T> &c)
- {
-- register const T * IMATH_RESTRICT ap = &a.x[0][0];
-- register const T * IMATH_RESTRICT bp = &b.x[0][0];
-- register T * IMATH_RESTRICT cp = &c.x[0][0];
-+ const T * IMATH_RESTRICT ap = &a.x[0][0];
-+ const T * IMATH_RESTRICT bp = &b.x[0][0];
-+ T * IMATH_RESTRICT cp = &c.x[0][0];
-
-- register T a0, a1, a2, a3;
-+ T a0, a1, a2, a3;
-
- a0 = ap[0];
- a1 = ap[1];
---
-2.14.1
-
diff --git a/media-libs/ilmbase/ilmbase-1.0.2.ebuild b/media-libs/ilmbase/ilmbase-1.0.2.ebuild
deleted file mode 100644
index b92d275e1df..00000000000
--- a/media-libs/ilmbase/ilmbase-1.0.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit libtool
-
-DESCRIPTION="OpenEXR ILM Base 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="static-libs"
-
-RDEPEND="!<media-libs/openexr-1.5.0"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.0.0-asneeded.patch"
- "${FILESDIR}/${P}-gcc43.patch"
-)
-
-src_prepare() {
- default
- elibtoolize
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die "Pruning failed"
-}
diff --git a/media-libs/ilmbase/ilmbase-2.0.1-r1.ebuild b/media-libs/ilmbase/ilmbase-2.0.1-r1.ebuild
deleted file mode 100644
index e9d83ade3ac..00000000000
--- a/media-libs/ilmbase/ilmbase-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-multilib
-
-DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/2.0.1" # 2.0.1 for the namespace off -> on switch, caused library renaming
-KEYWORDS="~amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="static-libs"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
diff --git a/media-libs/ilmbase/ilmbase-2.1.0.ebuild b/media-libs/ilmbase/ilmbase-2.1.0.ebuild
deleted file mode 100644
index bdbfe9d413f..00000000000
--- a/media-libs/ilmbase/ilmbase-2.1.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-multilib
-
-DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/11" # 11 from SONAME
-KEYWORDS="amd64 -arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="static-libs"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
-
-src_configure() {
- # Disable use of ucontext.h wrt #482890
- if use hppa || use ppc || use ppc64; then
- export ac_cv_header_ucontext_h=no
- fi
-
- autotools-multilib_src_configure
-}
diff --git a/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild b/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild
deleted file mode 100644
index db5418878b6..00000000000
--- a/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/12" # based on SONAME
-KEYWORDS="amd64 -arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
-
-# https://bugs.gentoo.org/632259
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${P}-Remove-register-keyword.patch" )
-
-multilib_src_configure() {
- # Disable use of ucontext.h wrt #482890
- if use hppa || use ppc || use ppc64; then
- export ac_cv_header_ucontext_h=no
- fi
-
- ECONF_SOURCE=${S} econf "$(use_enable static-libs static)"
-}
diff --git a/media-libs/ilmbase/ilmbase-2.2.0.ebuild b/media-libs/ilmbase/ilmbase-2.2.0.ebuild
deleted file mode 100644
index ed86d10473a..00000000000
--- a/media-libs/ilmbase/ilmbase-2.2.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools-multilib
-
-DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/12" # based on SONAME
-KEYWORDS="~amd64 -arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="static-libs"
-
-DOCS=( AUTHORS ChangeLog NEWS README )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
-
-src_configure() {
- # Disable use of ucontext.h wrt #482890
- if use hppa || use ppc || use ppc64; then
- export ac_cv_header_ucontext_h=no
- fi
-
- autotools-multilib_src_configure
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/ilmbase/, media-libs/ilmbase/files/
@ 2020-08-18 10:13 Andreas Sturmlechner
0 siblings, 0 replies; 8+ messages in thread
From: Andreas Sturmlechner @ 2020-08-18 10:13 UTC (permalink / raw
To: gentoo-commits
commit: b91a3525b936c1510e18570acb34edac890e7cff
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Mon Aug 17 20:16:16 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug 18 10:13:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b91a3525
media-libs/ilmbase: fix build against musl
Reported-by: tonemgub <AT> cool.fr.nf <tonemgub@cool.fr.nf>
Closes: https://bugs.gentoo.org/737474
Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17152
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch | 50 +++++++++++++++++++++++
media-libs/ilmbase/ilmbase-2.5.2.ebuild | 2 +
2 files changed, 52 insertions(+)
diff --git a/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch b/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch
new file mode 100644
index 00000000000..80f11e44c12
--- /dev/null
+++ b/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch
@@ -0,0 +1,50 @@
+From c7af102e6bce6638add2f38576ffe9c6741ba768 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
+Date: Thu, 30 Jul 2020 02:21:07 +0200
+Subject: [PATCH] IexMathFpu.cpp: Fix build on non-glibc (e.g. musl libc).
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Originally from:
+https://github.com/void-linux/void-packages/blob/80bbc168faa25448bd3399f4df331b836e74b85c/srcpkgs/ilmbase/patches/musl-_fpstate.patch
+
+Fixes error:
+
+ IlmBase/IexMath/IexMathFpu.cpp: In function ‘void Iex_2_4::FpuControl::restoreControlRegs(const ucontext_t&, bool)’:
+ IlmBase/IexMath/IexMathFpu.cpp:284:38: error: ‘struct _fpstate’ has no member named ‘cw’; did you mean ‘cwd’?
+ 284 | setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
+ | ^~
+ | cwd
+ IlmBase/IexMath/IexMathFpu.cpp:287:20: error: ‘struct Iex_2_4::FpuControl::_fpstate_64’ has no member named ‘magic’
+ 287 | setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
+ | ^~~~~
+
+Signed-off-by: Niklas Hambüchen <mail@nh2.me>
+---
+ IlmBase/IexMath/IexMathFpu.cpp | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/IlmBase/IexMath/IexMathFpu.cpp b/IlmBase/IexMath/IexMathFpu.cpp
+index ceed658e0..439329e50 100644
+--- a/IexMath/IexMathFpu.cpp
++++ b/IexMath/IexMathFpu.cpp
+@@ -281,10 +281,18 @@ restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
+ inline void
+ restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
+ {
++#if defined(__GLIBC__) || 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__)
+ setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
++#else
++ setMxcsr (kfp->mxcsr, clearExceptions);
++#endif
+ }
+
+ #endif
diff --git a/media-libs/ilmbase/ilmbase-2.5.2.ebuild b/media-libs/ilmbase/ilmbase-2.5.2.ebuild
index 47154bbc258..3e9e28c4411 100644
--- a/media-libs/ilmbase/ilmbase-2.5.2.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.5.2.ebuild
@@ -22,6 +22,8 @@ S="${WORKDIR}/openexr-${PV}/IlmBase"
MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfigInternal.h )
+PATCHES=( "${FILESDIR}"/${P}-musl.patch )
+
multilib_src_configure() {
local mycmakeargs=(
-DBUILD_TESTING=$(usex test)
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/ilmbase/, media-libs/ilmbase/files/
@ 2021-01-24 1:48 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-01-24 1:48 UTC (permalink / raw
To: gentoo-commits
commit: 3879f7d07fd0e99b3dc26e63f1134ac202a6dd1a
Author: Bernd Waibel <waebbl <AT> gmail <DOT> com>
AuthorDate: Sat Jan 2 22:26:42 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 01:48:04 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3879f7d0
media-libs/ilmbase: bump to 2.5.4
Bug: https://bugs.gentoo.org/746794
Bug: https://bugs.gentoo.org/762862
Bug: https://bugs.gentoo.org/762901
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/ilmbase/Manifest | 1 +
...2.5.4-0001-disable-failing-test-on-x86_32.patch | 24 +++++++++++++
media-libs/ilmbase/ilmbase-2.5.4.ebuild | 42 ++++++++++++++++++++++
3 files changed, 67 insertions(+)
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 2418671100a..c6dd7455c33 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,3 +1,4 @@
DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
DIST ilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
DIST ilmbase-2.5.3.tar.gz 27534825 BLAKE2B 4647b4aac074b10c0d1fb35ddb6b5acefca81c0f2debde04987b5df4e290b14b6406fc922949449aaeea7cf4be371a25c93f8fcb9f67c63d65276340bd586a21 SHA512 6da03193d4fea1e97e35008f59304ab408c521ead8495ba411cde5c172cf953be97999971f57398b813d14f1af1d722539a6b74d5ee54b9e74769ea8258d36ba
+DIST ilmbase-2.5.4.tar.gz 27535491 BLAKE2B 8951383d31ceea49202e3b77999d71c261bc9a17433fb65debd446aefd62cc1f6776a4b37fb1161196135a8883a397a94496a2295a2e0d22bc43c59e2ad0eaa5 SHA512 f0fe305987981e0c7e5a854367702585e4935ad37b0e8c10dcbc7468ae3a6d34bf963ec9ec75cc3abe4cf00e359644476b643978d0289dca46c9785a25d3f7f1
diff --git a/media-libs/ilmbase/files/ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch b/media-libs/ilmbase/files/ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch
new file mode 100644
index 00000000000..e22ae13c4bb
--- /dev/null
+++ b/media-libs/ilmbase/files/ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch
@@ -0,0 +1,24 @@
+From a5e853655daf9e6a8ca8d8b7b5040809d4d9fded Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl@gmail.com>
+Date: Sat, 2 Jan 2021 22:07:05 +0100
+Subject: [PATCH] disable failing test on x86_32
+
+Signed-off-by: Bernd Waibel <waebbl@gmail.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 759f359..6fab418 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -56,5 +56,5 @@ if(BUILD_TESTING)
+
+ add_subdirectory( HalfTest )
+ add_subdirectory( IexTest )
+- add_subdirectory( ImathTest )
++# add_subdirectory( ImathTest )
+ endif()
+--
+2.30.0
+
diff --git a/media-libs/ilmbase/ilmbase-2.5.4.ebuild b/media-libs/ilmbase/ilmbase-2.5.4.ebuild
new file mode 100644
index 00000000000..f7961017b7a
--- /dev/null
+++ b/media-libs/ilmbase/ilmbase-2.5.4.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="OpenEXR ILM Base libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/25" # based on SONAME
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="large-stack static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/openexr-${PV}/IlmBase"
+
+DOCS=( README.md )
+
+src_prepare() {
+ if use abi_x86_32; then
+ eapply "${FILESDIR}"/${P}-0001-disable-failing-test-on-x86_32.patch
+ fi
+
+ multilib_foreach_abi cmake_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ -DILMBASE_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
+ -DILMBASE_ENABLE_LARGE_STACK=$(usex large-stack)
+ -DILMBASE_INSTALL_PKG_CONFIG=ON
+ )
+
+ cmake_src_configure
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/ilmbase/, media-libs/ilmbase/files/
@ 2021-02-27 16:38 Sam James
0 siblings, 0 replies; 8+ messages in thread
From: Sam James @ 2021-02-27 16:38 UTC (permalink / raw
To: gentoo-commits
commit: c8da0332de0b4be07edec88ce91e51a57708fe40
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Feb 27 14:15:47 2021 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 16:37:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8da0332
media-libs/ilmbase: drop 2.5.2
Security cleanup. See #770229
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/ilmbase/Manifest | 1 -
media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch | 50 -----------------------
media-libs/ilmbase/ilmbase-2.5.2.ebuild | 49 ----------------------
3 files changed, 100 deletions(-)
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 192407c9432..823211ab083 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,4 +1,3 @@
DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
-DIST ilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
DIST ilmbase-2.5.4.tar.gz 27535491 BLAKE2B 8951383d31ceea49202e3b77999d71c261bc9a17433fb65debd446aefd62cc1f6776a4b37fb1161196135a8883a397a94496a2295a2e0d22bc43c59e2ad0eaa5 SHA512 f0fe305987981e0c7e5a854367702585e4935ad37b0e8c10dcbc7468ae3a6d34bf963ec9ec75cc3abe4cf00e359644476b643978d0289dca46c9785a25d3f7f1
DIST ilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
diff --git a/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch b/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch
deleted file mode 100644
index 80f11e44c12..00000000000
--- a/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c7af102e6bce6638add2f38576ffe9c6741ba768 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
-Date: Thu, 30 Jul 2020 02:21:07 +0200
-Subject: [PATCH] IexMathFpu.cpp: Fix build on non-glibc (e.g. musl libc).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Originally from:
-https://github.com/void-linux/void-packages/blob/80bbc168faa25448bd3399f4df331b836e74b85c/srcpkgs/ilmbase/patches/musl-_fpstate.patch
-
-Fixes error:
-
- IlmBase/IexMath/IexMathFpu.cpp: In function ‘void Iex_2_4::FpuControl::restoreControlRegs(const ucontext_t&, bool)’:
- IlmBase/IexMath/IexMathFpu.cpp:284:38: error: ‘struct _fpstate’ has no member named ‘cw’; did you mean ‘cwd’?
- 284 | setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
- | ^~
- | cwd
- IlmBase/IexMath/IexMathFpu.cpp:287:20: error: ‘struct Iex_2_4::FpuControl::_fpstate_64’ has no member named ‘magic’
- 287 | setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
- | ^~~~~
-
-Signed-off-by: Niklas Hambüchen <mail@nh2.me>
----
- IlmBase/IexMath/IexMathFpu.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/IlmBase/IexMath/IexMathFpu.cpp b/IlmBase/IexMath/IexMathFpu.cpp
-index ceed658e0..439329e50 100644
---- a/IexMath/IexMathFpu.cpp
-+++ b/IexMath/IexMathFpu.cpp
-@@ -281,10 +281,18 @@ restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || 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__)
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+ setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
-
- #endif
diff --git a/media-libs/ilmbase/ilmbase-2.5.2.ebuild b/media-libs/ilmbase/ilmbase-2.5.2.ebuild
deleted file mode 100644
index f2e75387717..00000000000
--- a/media-libs/ilmbase/ilmbase-2.5.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="large-stack static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/openexr-${PV}/IlmBase"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfigInternal.h )
-
-PATCHES=( "${FILESDIR}"/${P}-musl.patch )
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DBUILD_TESTING=$(usex test)
- -DILMBASE_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
- -DILMBASE_ENABLE_LARGE_STACK=$(usex large-stack)
- -DILMBASE_INSTALL_PKG_CONFIG=ON
- )
-
- # Disable use of ucontext.h wrt #482890
- if use hppa || use ppc || use ppc64; then
- mycmakeargs+=(
- -DILMBASE_HAVE_UCONTEXT_H=OFF
- )
- fi
-
- # needed for running tests with x86_32
- # see https://github.com/AcademySoftwareFoundation/openexr/issues/346
- if use abi_x86_32 && use test; then
- append-cppflags -ffloat-store
- fi
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/ilmbase/, media-libs/ilmbase/files/
@ 2021-03-31 6:31 Joonas Niilola
0 siblings, 0 replies; 8+ messages in thread
From: Joonas Niilola @ 2021-03-31 6:31 UTC (permalink / raw
To: gentoo-commits
commit: 792f139668feb8c2e395be745ac7e436ad5d396d
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Fri Mar 26 16:49:03 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=792f1396
media-libs/ilmbase: drop 2.3.0
Security cleanup
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/ilmbase/Manifest | 1 -
.../ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch | 214 ---------------------
.../ilmbase/files/ilmbase-2.3.0-testBox.patch | 104 ----------
media-libs/ilmbase/ilmbase-2.3.0.ebuild | 40 ----
4 files changed, 359 deletions(-)
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index ea176ee0222..a14cb246858 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,2 +1 @@
-DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
DIST ilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
diff --git a/media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch b/media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch
deleted file mode 100644
index 21428529391..00000000000
--- a/media-libs/ilmbase/files/ilmbase-2.3.0-fix-bashisms.patch
+++ /dev/null
@@ -1,214 +0,0 @@
---- a/configure
-+++ b/configure
-@@ -15253,7 +15253,7 @@ else
- fi
-
-
--if test "${cxxstd}" == 17 ; then
-+if test "${cxxstd}" = 17 ; then
- ax_cxx_compile_alternatives="17 1z" ax_cxx_compile_cxx17_required=true
- ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -16966,7 +16966,7 @@ $as_echo "$as_me: WARNING: C++17 is not
-
- CXXFLAGS="$CXXFLAGS -std=c++17"
- else
-- if test "${cxxstd}" == 14 ; then
-+ if test "${cxxstd}" = 14 ; then
- ax_cxx_compile_alternatives="14 1y" ax_cxx_compile_cxx14_required=true
- ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -17874,7 +17874,7 @@ $as_echo "#define HAVE_CXX14 1" >>confde
-
- CXXFLAGS="$CXXFLAGS -std=c++14"
- else
-- if test "${cxxstd}" == 11 ; then
-+ if test "${cxxstd}" = 11 ; then
- ax_cxx_compile_alternatives="11 0x" ax_cxx_compile_cxx11_required=true
- ac_ext=cpp
- ac_cpp='$CXXCPP $CPPFLAGS'
-@@ -18542,7 +18542,7 @@ $as_echo "#define HAVE_CXX11 1" >>confde
-
- CXXFLAGS="$CXXFLAGS -std=c++11"
- else
-- if test "${cxxstd}" == 03 ; then
-+ if test "${cxxstd}" = 03 ; then
- $as_echo "#define ILMBASE_FORCE_CXX03 1" >>confdefs.h
-
- CXXFLAGS="$CXXFLAGS -std=c++03"
-@@ -21827,11 +21827,11 @@ $as_echo "#define HAVE_CXX17 1" >>confde
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C++17 is not yet standardized, so the checks may change in incompatible ways anytime" >&5
- $as_echo "$as_me: WARNING: C++17 is not yet standardized, so the checks may change in incompatible ways anytime" >&2;}
-
-- 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
-@@ -22768,7 +22768,7 @@ LIB_SUFFIX=""
- lib_suffix_valid="no"
-
- lib_namespace=""
--if test "x${library_namespace_versioning}" == xyes ; then
-+if test "x${library_namespace_versioning}" = xyes ; then
- cat >>confdefs.h <<_ACEOF
- #define IMATH_INTERNAL_NAMESPACE Imath_${ILMBASE_VERSION_API}
- _ACEOF
-@@ -22787,7 +22787,7 @@ _ACEOF
- lib_namespace="${ILMBASE_VERSION_API}"
- LIB_SUFFIX="${ILMBASE_VERSION_API}"
- lib_suffix_valid="yes"
--elif test "x${library_namespace_versioning}" == xno ; then
-+elif test "x${library_namespace_versioning}" = xno ; then
- cat >>confdefs.h <<_ACEOF
- #define IMATH_INTERNAL_NAMESPACE Imath
- _ACEOF
-@@ -22823,7 +22823,7 @@ _ACEOF
- fi
-
-
--if test "x${lib_suffix_valid}" == xyes ; then
-+if test "x${lib_suffix_valid}" = xyes ; then
- LIB_SUFFIX_DASH="-${LIB_SUFFIX}"
-
- if true; then
-@@ -22858,7 +22858,7 @@ else
- fi
-
-
--if test "x${custom_public_namespace}" == xyes ; then
-+if test "x${custom_public_namespace}" = xyes ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&5
- $as_echo "$as_me: WARNING: Enabling 'custom user namespace' requires an additional argument, reverting to default" >&2;}
- $as_echo "#define IMATH_NAMESPACE Imath" >>confdefs.h
-@@ -22870,7 +22870,7 @@ $as_echo "$as_me: WARNING: Enabling 'cus
-
- public_namespace=""
- custom_public_namespace=no
--elif test "x${custom_public_namespace}" == xno ; then
-+elif test "x${custom_public_namespace}" = xno ; then
- $as_echo "#define IMATH_NAMESPACE Imath" >>confdefs.h
-
- $as_echo "#define IEX_NAMESPACE Iex" >>confdefs.h
-@@ -22912,12 +22912,11 @@ fi
-
-
- if test "${osx_arch}" != default ; then
-- osx_arch_flags="-arch ${osx_arch// / -arch }"
-+ osx_arch_flags=$(printf ' -arch %s' ${osx_arch})
- CXXFLAGS="$CXXFLAGS $osx_arch_flags"
-
- if test "$enable_dependency_tracking" != no ; then
-- osx_arch_array=( ${osx_arch} )
-- if test ${#osx_arch_array[@]} -gt 1 ; then
-+ if echo "$osx_arch" | grep >/dev/null " " ; then
- as_fn_error $? "building multiple OS X architectures requires --disable-dependency-tracking.
- Please re-run configure with these options:
- --enable-osx-arch=\"${osx_arch}\" --disable-dependency-tracking
---- a/configure.ac
-+++ b/configure.ac
-@@ -45,19 +45,19 @@ 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
- AC_DEFINE(ILMBASE_FORCE_CXX03)
- CXXFLAGS="$CXXFLAGS -std=c++03"
- else
-@@ -65,11 +65,11 @@ else
- 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
-@@ -212,7 +212,7 @@ lib_suffix_valid="no"
- dnl Internal library namespace
- dnl
- lib_namespace=""
--if test "x${library_namespace_versioning}" == xyes ; then
-+if test "x${library_namespace_versioning}" = xyes ; then
- AC_DEFINE_UNQUOTED(IMATH_INTERNAL_NAMESPACE, Imath_${ILMBASE_VERSION_API})
- AC_DEFINE_UNQUOTED(IEX_INTERNAL_NAMESPACE, Iex_${ILMBASE_VERSION_API})
- AC_DEFINE_UNQUOTED(ILMTHREAD_INTERNAL_NAMESPACE, IlmThread_${ILMBASE_VERSION_API})
-@@ -221,7 +221,7 @@ if test "x${library_namespace_versioning
- lib_namespace="${ILMBASE_VERSION_API}"
- LIB_SUFFIX="${ILMBASE_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(IMATH_INTERNAL_NAMESPACE, Imath)
- AC_DEFINE_UNQUOTED(IEX_INTERNAL_NAMESPACE, Iex)
- AC_DEFINE_UNQUOTED(ILMTHREAD_INTERNAL_NAMESPACE, IlmThread)
-@@ -238,7 +238,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
-@@ -257,7 +257,7 @@ AC_ARG_ENABLE(customusernamespace,
- [custom_public_namespace="${enableval}"],
- [custom_public_namespace=no])
-
--if test "x${custom_public_namespace}" == xyes ; then
-+if test "x${custom_public_namespace}" = xyes ; then
- AC_MSG_WARN([Enabling 'custom user namespace' requires an additional argument, reverting to default])
- AC_DEFINE(IMATH_NAMESPACE, Imath)
- AC_DEFINE(IEX_NAMESPACE, Iex)
-@@ -265,7 +265,7 @@ if test "x${custom_public_namespace}" ==
-
- public_namespace=""
- custom_public_namespace=no
--elif test "x${custom_public_namespace}" == xno ; then
-+elif test "x${custom_public_namespace}" = xno ; then
- AC_DEFINE(IMATH_NAMESPACE, Imath)
- AC_DEFINE(IEX_NAMESPACE, Iex)
- AC_DEFINE(ILMTHREAD_NAMESPACE, IlmThread)
-@@ -296,14 +296,12 @@ case "$host" in
- [osx_arch="${enableval}"], [osx_arch=default])
-
- if test "${osx_arch}" != default ; then
-- dnl Replace "a b c" with "-arch a -arch b -arch c". Should probably use an all-whitespace regexp rather than a single character for the search string.
-- osx_arch_flags="-arch ${osx_arch// / -arch }"
-+ osx_arch_flags=$(printf ' -arch %s' ${osx_arch})
- CXXFLAGS="$CXXFLAGS $osx_arch_flags"
-
- dnl If multiple archs specified, make sure that --disable-dependency-tracking was also specified
- if test "$enable_dependency_tracking" != no ; then
-- osx_arch_array=( ${osx_arch} )
-- if test ${#osx_arch_array[@]} -gt 1 ; then
-+ if echo "$osx_arch" | grep >/dev/null " " ; then
- AC_MSG_ERROR([building multiple OS X architectures requires --disable-dependency-tracking.
- Please re-run configure with these options:
- --enable-osx-arch="${osx_arch}" --disable-dependency-tracking
diff --git a/media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch b/media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch
deleted file mode 100644
index 8211846b09b..00000000000
--- a/media-libs/ilmbase/files/ilmbase-2.3.0-testBox.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-Subject: testBox: allow fuzzy comparison of floats, doubles
-From: Steven Chamberlain <steven@pyro.eu.org>
-Date: Wed, 24 Feb 2016 01:10:11 +0000
-
-Allow for inexact values, as long as the error is smaller than the
-epsilon of the data type.
-
-On 32-bit x86, allow even greater discrepency at double
-precision, due to possible double-rounding. See
-https://lists.nongnu.org/archive/html/openexr-devel/2015-12/msg00001.html
-
-Index: ilmbase/ImathTest/testBox.cpp
-===================================================================
---- ilmbase.orig/ImathTest/testBox.cpp
-+++ ilmbase/ImathTest/testBox.cpp
-@@ -47,6 +47,58 @@ using namespace IMATH_INTERNAL_NAMESPACE
-
- namespace {
-
-+template <class T>
-+bool
-+approximatelyEqual (const T &p1, const T &p2)
-+{
-+ /* int and short should be exact */
-+ return (p1 == p2);
-+}
-+
-+bool
-+approximatelyEqual (const Vec2<float> &p1, const Vec2<float> &p2)
-+{
-+ float e = limits<float>::epsilon();
-+ float m = 0;
-+
-+ for (int i = 0; i < 2; ++i)
-+ {
-+ m = max (m, abs (p1[i]));
-+ m = max (m, abs (p2[i]));
-+ }
-+
-+ for (int i = 0; i < 2; ++i)
-+ if (!equalWithAbsError (p1[i], p2[i], m * e))
-+ return false;
-+
-+ return true;
-+}
-+
-+bool
-+approximatelyEqual (const Vec2<double> &p1, const Vec2<double> &p2)
-+{
-+#if defined(__i386__) || defined(_M_IX86)
-+ /* double-rounding on 32-bit x86 may cause larger error:
-+ use epsilon of float rather than double */
-+ double e = limits<float>::epsilon();
-+#else
-+ double e = limits<double>::epsilon();
-+#endif
-+ double m = 0;
-+
-+ for (int i = 0; i < 2; ++i)
-+ {
-+ m = max (m, abs (p1[i]));
-+ m = max (m, abs (p2[i]));
-+ }
-+
-+ for (int i = 0; i < 2; ++i)
-+ if (!equalWithAbsError (p1[i], p2[i], m * e))
-+ return false;
-+
-+ return true;
-+}
-+
- //
- // Test case generation utility - create a vector of IMATH_INTERNAL_NAMESPACE::Vec{2,3,4}
- // with all permutations of integers 1..T::dimensions().
-@@ -250,7 +302,8 @@ testExtendByPoint(const char *type)
-
- IMATH_INTERNAL_NAMESPACE::Box<T> b;
- b.extendBy(p);
-- assert(b.min == p && b.max == p);
-+ assert (approximatelyEqual (b.min, p));
-+ assert (approximatelyEqual (b.max, p));
- }
-
- //
-@@ -283,7 +336,8 @@ testExtendByPoint(const char *type)
-
- b.extendBy(p);
-
-- assert(b.min == min && b.max == max);
-+ assert (approximatelyEqual (b.min, min));
-+ assert (approximatelyEqual (b.max, max));
- }
- }
- }
-@@ -358,7 +412,8 @@ testExtendByBox(const char *type)
- }
- b.extendBy(IMATH_INTERNAL_NAMESPACE::Box<T>(p0, p1));
-
-- assert(b.min == min && b.max == max);
-+ assert (approximatelyEqual (b.min, min));
-+ assert (approximatelyEqual (b.max, max));
- }
- }
- }
diff --git a/media-libs/ilmbase/ilmbase-2.3.0.ebuild b/media-libs/ilmbase/ilmbase-2.3.0.ebuild
deleted file mode 100644
index e994e236f28..00000000000
--- a/media-libs/ilmbase/ilmbase-2.3.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit multilib-minimal
-
-DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="http://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 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-2.3.0-testBox.patch
- "${FILESDIR}"/${PN}-2.3.0-fix-bashisms.patch
-)
-
-DOCS=( AUTHORS ChangeLog NEWS README.md )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
-
-multilib_src_configure() {
- # Disable use of ucontext.h wrt #482890
- if use hppa || use ppc || use ppc64; then
- export ac_cv_header_ucontext_h=no
- fi
-
- ECONF_SOURCE=${S} econf "$(use_enable static-libs static)"
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- # package provides pkg-config files
- find "${D}" -name '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2021-03-31 6:31 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-24 1:48 [gentoo-commits] repo/gentoo:master commit in: media-libs/ilmbase/, media-libs/ilmbase/files/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2021-03-31 6:31 Joonas Niilola
2021-02-27 16:38 Sam James
2020-08-18 10:13 Andreas Sturmlechner
2019-06-04 2:51 Andreas K. Hüttel
2019-04-24 10:05 Thomas Deutschmann
2018-05-29 20:10 Aaron Bauman
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