| 1 |
commit: 0ec76bea6cf18532f4c7ec56e8e51db1e70c8ee3 |
| 2 |
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> |
| 3 |
AuthorDate: Thu Jun 23 15:29:29 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jul 3 23:53:50 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ec76bea |
| 7 |
|
| 8 |
media-libs/openexr: fix typo for patches |
| 9 |
|
| 10 |
Remove patch and bits for sparc machines regarding test patches. |
| 11 |
Sparc is keyworded as -sparc, so this patch for failing tests will usually not |
| 12 |
be needed. |
| 13 |
|
| 14 |
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> |
| 15 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 16 |
|
| 17 |
...nexr-2.5.7-0001-disable-testRgba-on-sparc.patch | 31 ---------------------- |
| 18 |
media-libs/openexr/openexr-2.5.8.ebuild | 6 +---- |
| 19 |
2 files changed, 1 insertion(+), 36 deletions(-) |
| 20 |
|
| 21 |
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 |
| 22 |
deleted file mode 100644 |
| 23 |
index 368c9173d133..000000000000 |
| 24 |
--- a/media-libs/openexr/files/openexr-2.5.7-0001-disable-testRgba-on-sparc.patch |
| 25 |
+++ /dev/null |
| 26 |
@@ -1,31 +0,0 @@ |
| 27 |
-From: Bernd Waibel <waebbl-gentoo@××××××.net> |
| 28 |
-Date: Mon, 21 Jun 2021 12:03:02 +0200 |
| 29 |
-Subject: [PATCH] disable testRgba on sparc |
| 30 |
- |
| 31 |
-Fails on sparc, bug #656680 and issue |
| 32 |
-https://github.com/openexr/openexr/issues/222 |
| 33 |
- |
| 34 |
-Bug: https://bugs.gentoo.org/656680 |
| 35 |
-Bug: https://github.com/AcademySoftwareFoundation/openexr/issues/222 |
| 36 |
- |
| 37 |
-Signed-off-by: Bernd Waibel <waebbl-gentoo@××××××.net> |
| 38 |
---- |
| 39 |
- IlmImfTest/main.cpp | 2 +- |
| 40 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 41 |
- |
| 42 |
-diff --git a/IlmImfTest/main.cpp b/IlmImfTest/main.cpp |
| 43 |
-index 3245fc4..3ba3e60 100644 |
| 44 |
---- a/IlmImfTest/main.cpp |
| 45 |
-+++ b/IlmImfTest/main.cpp |
| 46 |
-@@ -206,7 +206,7 @@ main (int argc, char *argv[]) |
| 47 |
- TEST (testXdr, "core"); |
| 48 |
- TEST (testHuf, "core"); |
| 49 |
- TEST (testWav, "core"); |
| 50 |
-- TEST (testRgba, "basic"); |
| 51 |
-+// TEST (testRgba, "basic"); |
| 52 |
- TEST (testLargeDataWindowOffsets, "basic"); |
| 53 |
- TEST (testSharedFrameBuffer, "basic"); |
| 54 |
- TEST (testRgbaThreading, "basic"); |
| 55 |
--- |
| 56 |
-2.32.0 |
| 57 |
- |
| 58 |
|
| 59 |
diff --git a/media-libs/openexr/openexr-2.5.8.ebuild b/media-libs/openexr/openexr-2.5.8.ebuild |
| 60 |
index 9040c83eabdb..e5e93f2625bb 100644 |
| 61 |
--- a/media-libs/openexr/openexr-2.5.8.ebuild |
| 62 |
+++ b/media-libs/openexr/openexr-2.5.8.ebuild |
| 63 |
@@ -40,11 +40,7 @@ src_prepare() { |
| 64 |
# Technically this doesn't disable anything, it just gives this test time to complete. |
| 65 |
# Could probably be applied unconditionally but will leave this to the maintainers. |
| 66 |
if use riscv; then |
| 67 |
- eapply "${FILESDIR}/${P}-0002-increase-IlmImfTest-timeout.patch" |
| 68 |
- fi |
| 69 |
- |
| 70 |
- if use sparc; then |
| 71 |
- eapply "${FILESDIR}/${P}-0001-disable-testRgba-on-sparc.patch" |
| 72 |
+ eapply "${FILESDIR}/${PN}-2.5.7-0002-increase-IlmImfTest-timeout.patch" |
| 73 |
fi |
| 74 |
fi |
Archives