[gentoo-commits] repo/gentoo:master commit in: media-libs/openexr/, media-libs/openexr/files/

["Sam James" <sam@gentoo.org>]

commit:     0ec76bea6cf18532f4c7ec56e8e51db1e70c8ee3
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Thu Jun 23 15:29:29 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jul  3 23:53:50 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ec76bea

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 <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...nexr-2.5.7-0001-disable-testRgba-on-sparc.patch | 31 ----------------------
 media-libs/openexr/openexr-2.5.8.ebuild            |  6 +----
 2 files changed, 1 insertion(+), 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