summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernd Waibel <waebbl-gentoo@posteo.net>2022-06-23 17:29:29 +0200
committerSam James <sam@gentoo.org>2022-07-04 00:53:50 +0100
commit0ec76bea6cf18532f4c7ec56e8e51db1e70c8ee3 (patch)
treeb3038064ff3db57bec0cc4f609e389f0ab92dcd4 /media-libs/openexr
parentmedia-libs/openexr: drop 2.5.7 (diff)
downloadgentoo-0ec76bea6cf18532f4c7ec56e8e51db1e70c8ee3.tar.gz
gentoo-0ec76bea6cf18532f4c7ec56e8e51db1e70c8ee3.tar.bz2
gentoo-0ec76bea6cf18532f4c7ec56e8e51db1e70c8ee3.zip
media-libs/openexr: fix typo for patches
Remove patch and bits for sparc machines regarding test patches. Sparc is keyworded as -sparc, so this patch for failing tests will usually not be needed. Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'media-libs/openexr')
-rw-r--r--media-libs/openexr/files/openexr-2.5.7-0001-disable-testRgba-on-sparc.patch31
-rw-r--r--media-libs/openexr/openexr-2.5.8.ebuild6
2 files changed, 1 insertions, 36 deletions
diff --git a/media-libs/openexr/files/openexr-2.5.7-0001-disable-testRgba-on-sparc.patch b/media-libs/openexr/files/openexr-2.5.7-0001-disable-testRgba-on-sparc.patch
deleted file mode 100644
index 368c9173d133..000000000000
--- a/media-libs/openexr/files/openexr-2.5.7-0001-disable-testRgba-on-sparc.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From: Bernd Waibel <waebbl-gentoo@posteo.net>
-Date: Mon, 21 Jun 2021 12:03:02 +0200
-Subject: [PATCH] disable testRgba on sparc
-
-Fails on sparc, bug #656680 and issue
-https://github.com/openexr/openexr/issues/222
-
-Bug: https://bugs.gentoo.org/656680
-Bug: https://github.com/AcademySoftwareFoundation/openexr/issues/222
-
-Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
----
- IlmImfTest/main.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/IlmImfTest/main.cpp b/IlmImfTest/main.cpp
-index 3245fc4..3ba3e60 100644
---- a/IlmImfTest/main.cpp
-+++ b/IlmImfTest/main.cpp
-@@ -206,7 +206,7 @@ main (int argc, char *argv[])
- TEST (testXdr, "core");
- TEST (testHuf, "core");
- TEST (testWav, "core");
-- TEST (testRgba, "basic");
-+// TEST (testRgba, "basic");
- TEST (testLargeDataWindowOffsets, "basic");
- TEST (testSharedFrameBuffer, "basic");
- TEST (testRgbaThreading, "basic");
---
-2.32.0
-
diff --git a/media-libs/openexr/openexr-2.5.8.ebuild b/media-libs/openexr/openexr-2.5.8.ebuild
index 9040c83eabdb..e5e93f2625bb 100644
--- a/media-libs/openexr/openexr-2.5.8.ebuild
+++ b/media-libs/openexr/openexr-2.5.8.ebuild
@@ -40,11 +40,7 @@ src_prepare() {
# 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}/${P}-0002-increase-IlmImfTest-timeout.patch"
- fi
-
- if use sparc; then
- eapply "${FILESDIR}/${P}-0001-disable-testRgba-on-sparc.patch"
+ eapply "${FILESDIR}/${PN}-2.5.7-0002-increase-IlmImfTest-timeout.patch"
fi
fi