| 1 |
commit: ab742fb45261c9c6214f31e08cdb35eee83efe2e |
| 2 |
Author: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jul 16 22:11:40 2021 +0000 |
| 4 |
Commit: Marek Szuba <marecki <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jul 16 22:16:27 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab742fb4 |
| 7 |
|
| 8 |
media-libs/openexr: keyword 2.5.7 for ~riscv |
| 9 |
|
| 10 |
On a BeagleV Starlight, IlmImfTest times out by default - but with the |
| 11 |
time-out threshold increased from the default 1500 s to 1.5 h, tests |
| 12 |
pass. |
| 13 |
|
| 14 |
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org> |
| 15 |
|
| 16 |
.../openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch | 13 +++++++++++++ |
| 17 |
media-libs/openexr/openexr-2.5.7.ebuild | 8 +++++++- |
| 18 |
profiles/arch/riscv/package.use.mask | 6 ------ |
| 19 |
3 files changed, 20 insertions(+), 7 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch b/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch |
| 22 |
new file mode 100644 |
| 23 |
index 00000000000..ef71bc0e687 |
| 24 |
--- /dev/null |
| 25 |
+++ b/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch |
| 26 |
@@ -0,0 +1,13 @@ |
| 27 |
+This consists of A LOT of individual tests and on some hardware |
| 28 |
+(e.g. the RISC-V board BeagleV Starlight) the default test time-out |
| 29 |
+of 1500 seconds is greatly insufficient. On said BeagleV OpenEXR.IlmImf |
| 30 |
+takes almost 4800 s even on an otherwise idle system so let's add a bit |
| 31 |
+of margin and set the time-out of this test to 1.5 hours. |
| 32 |
+ |
| 33 |
+--- a/IlmImfTest/CMakeLists.txt 2021-06-15 00:15:14.000000000 +0000 |
| 34 |
++++ b/IlmImfTest/CMakeLists.txt 2021-07-16 16:51:20.600435829 +0000 |
| 35 |
+@@ -73,3 +73,4 @@ |
| 36 |
+ target_compile_definitions(IlmImfTest PRIVATE OPENEXR_DLL) |
| 37 |
+ endif() |
| 38 |
+ add_test(NAME OpenEXR.IlmImf COMMAND $<TARGET_FILE:IlmImfTest>) |
| 39 |
++set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 5400) |
| 40 |
|
| 41 |
diff --git a/media-libs/openexr/openexr-2.5.7.ebuild b/media-libs/openexr/openexr-2.5.7.ebuild |
| 42 |
index d94729d81f2..8a5f1c968b2 100644 |
| 43 |
--- a/media-libs/openexr/openexr-2.5.7.ebuild |
| 44 |
+++ b/media-libs/openexr/openexr-2.5.7.ebuild |
| 45 |
@@ -13,7 +13,7 @@ S="${WORKDIR}/${P}/OpenEXR" |
| 46 |
|
| 47 |
LICENSE="BSD" |
| 48 |
SLOT="0/25" # based on SONAME |
| 49 |
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" |
| 50 |
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" |
| 51 |
IUSE="cpu_flags_x86_avx doc examples static-libs utils test" |
| 52 |
RESTRICT="!test? ( test )" |
| 53 |
|
| 54 |
@@ -36,6 +36,12 @@ src_prepare() { |
| 55 |
eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch" |
| 56 |
fi |
| 57 |
|
| 58 |
+ # Technically this doesn't disable anything, it just gives this test time to complete. |
| 59 |
+ # Could probably be applied unconditionally but will leave this to the maintainers. |
| 60 |
+ if use riscv; then |
| 61 |
+ eapply "${FILESDIR}/${P}-0002-increase-IlmImfTest-timeout.patch" |
| 62 |
+ fi |
| 63 |
+ |
| 64 |
if use sparc; then |
| 65 |
eapply "${FILESDIR}/${P}-0001-disable-testRgba-on-sparc.patch" |
| 66 |
fi |
| 67 |
|
| 68 |
diff --git a/profiles/arch/riscv/package.use.mask b/profiles/arch/riscv/package.use.mask |
| 69 |
index 4140a2b47de..eca3ce4ba37 100644 |
| 70 |
--- a/profiles/arch/riscv/package.use.mask |
| 71 |
+++ b/profiles/arch/riscv/package.use.mask |
| 72 |
@@ -52,12 +52,6 @@ sys-cluster/openmpi openmpi_fabrics_ofed openmpi_fabrics_knem openmpi_fabrics_ps |
| 73 |
# - sci-libs/hdf5, sys-fabric/ofed, dev-db/mariadb | dev-db/mysql |
| 74 |
sys-cluster/slurm hdf5 ofed slurmdbd |
| 75 |
|
| 76 |
-# Ye Cao <ye.c@×××××××.org> (2021-06-24) |
| 77 |
-# media-libs/openexr not keyworded yet - it compiles fine but the its test |
| 78 |
-# suite times out, even with the time limit increased from 1500 to 3600 s. |
| 79 |
-# Needs more work. |
| 80 |
-media-gfx/imagemagick openexr |
| 81 |
- |
| 82 |
# Yixun Lan <dlan@g.o> (2021-05-24) |
| 83 |
# Dependencies not keyworded, not tested |
| 84 |
dev-libs/libdbusmenu test |
Archives