From: "Pacho Ramos" <pacho@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/, media-libs/openexr/files/
Date: Sat, 20 Apr 2019 09:34:33 +0000 (UTC) [thread overview]
Message-ID: <1555752842.76a4a88d277cf9a01e833f0ba8f09d5fa4826f14.pacho@gentoo> (raw)
commit: 76a4a88d277cf9a01e833f0ba8f09d5fa4826f14
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 09:34:02 2019 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 09:34:02 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76a4a88d
media-libs/openexr: Multiple test fixes from Debian
Closes: https://bugs.gentoo.org/656680
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
.../openexr/files/openexr-2.3.0-bigendian.patch | 71 ++++++++++++++++++++++
.../openexr/files/openexr-2.3.0-bigendian2.patch | 17 ++++++
.../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 | 9 ++-
6 files changed, 179 insertions(+), 2 deletions(-)
diff --git a/media-libs/openexr/files/openexr-2.3.0-bigendian.patch b/media-libs/openexr/files/openexr-2.3.0-bigendian.patch
new file mode 100644
index 00000000000..0851fe95735
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-bigendian.patch
@@ -0,0 +1,71 @@
+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
new file mode 100644
index 00000000000..cf1ad7b0902
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-bigendian2.patch
@@ -0,0 +1,17 @@
+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-skip-bogus-tests.patch b/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch
new file mode 100644
index 00000000000..360b9609b2d
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-skip-bogus-tests.patch
@@ -0,0 +1,31 @@
+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
new file mode 100644
index 00000000000..bb3917d7996
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-tests-32bits-2.patch
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 00000000000..430bb20bcfa
--- /dev/null
+++ b/media-libs/openexr/files/openexr-2.3.0-tests-32bits.patch
@@ -0,0 +1,36 @@
+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
index 70d1ef559dd..1db0ffc5bda 100644
--- a/media-libs/openexr/openexr-2.3.0.ebuild
+++ b/media-libs/openexr/openexr-2.3.0.ebuild
@@ -31,6 +31,12 @@ 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"
+ # 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() {
@@ -66,6 +72,5 @@ multilib_src_install_all() {
rm -rf "${ED%/}"/usr/share/doc/${PF}/examples || die
fi
- # package provides .pc files
- find "${D}" -name '*.la' -delete || die
+ find "${D}" -name '*.la' -type f -delete || die
}
next reply other threads:[~2019-04-20 23:27 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-20 9:34 Pacho Ramos [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-03-08 18:34 [gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/, media-libs/openexr/files/ Sam James
2024-03-08 18:34 Sam James
2022-09-28 8:19 Joonas Niilola
2022-07-03 23:54 Sam James
2022-04-10 21:02 Andreas Sturmlechner
2021-10-17 2:22 Sam James
2021-06-22 18:35 Sam James
2020-07-21 18:58 Andreas Sturmlechner
2018-10-11 18:42 Michał Górny
2016-10-10 22:26 David Seifert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1555752842.76a4a88d277cf9a01e833f0ba8f09d5fa4826f14.pacho@gentoo \
--to=pacho@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox