1 |
commit: cb815ca5634fd66f398d1e58cfd35a61688114cd |
2 |
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> |
3 |
AuthorDate: Sat Jan 28 10:24:52 2023 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 28 11:26:42 2023 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb815ca5 |
7 |
|
8 |
media-libs/openexr: drop 2.5.8 |
9 |
|
10 |
Bug: https://bugs.gentoo.org/817431 |
11 |
Bug: https://bugs.gentoo.org/830384 |
12 |
Bug: https://bugs.gentoo.org/838079 |
13 |
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> |
14 |
Closes: https://github.com/gentoo/gentoo/pull/29317 |
15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
16 |
|
17 |
media-libs/openexr/Manifest | 1 - |
18 |
....2-0001-IlmImfTest-main.cpp-disable-tests.patch | 40 ------------- |
19 |
...xr-2.5.7-0002-increase-IlmImfTest-timeout.patch | 13 ---- |
20 |
media-libs/openexr/openexr-2.5.8.ebuild | 70 ---------------------- |
21 |
4 files changed, 124 deletions(-) |
22 |
|
23 |
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest |
24 |
index bd6854bc0ea7..3a13467779b7 100644 |
25 |
--- a/media-libs/openexr/Manifest |
26 |
+++ b/media-libs/openexr/Manifest |
27 |
@@ -1,2 +1 @@ |
28 |
-DIST openexr-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f |
29 |
DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c |
30 |
|
31 |
diff --git a/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch b/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch |
32 |
deleted file mode 100644 |
33 |
index a77705cb5a7d..000000000000 |
34 |
--- a/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch |
35 |
+++ /dev/null |
36 |
@@ -1,40 +0,0 @@ |
37 |
-From 866442b28b53f773efbb3690b6252d2e75bee137 Mon Sep 17 00:00:00 2001 |
38 |
-From: Bernd Waibel <waebbl@×××××.com> |
39 |
-Date: Fri, 3 Jul 2020 15:34:47 +0200 |
40 |
-Subject: [PATCH] IlmImfTest/main.cpp: disable tests |
41 |
- |
42 |
-Disable testOptimizedInterleavePatterns and testDwaLookup, which |
43 |
-are not working on x86. |
44 |
-For testOptimizedInterleavePatterns, see |
45 |
-https://github.com/AcademySoftwareFoundation/openexr/issues/67#issuecomment-21169748 |
46 |
- |
47 |
-Signed-off-by: Bernd Waibel <waebbl@×××××.com> |
48 |
---- |
49 |
- IlmImfTest/main.cpp | 4 ++-- |
50 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
51 |
- |
52 |
-diff --git a/IlmImfTest/main.cpp b/IlmImfTest/main.cpp |
53 |
-index 3245fc4..4ab45b1 100644 |
54 |
---- a/IlmImfTest/main.cpp |
55 |
-+++ b/IlmImfTest/main.cpp |
56 |
-@@ -228,7 +228,7 @@ main (int argc, char *argv[]) |
57 |
- TEST (testExistingStreams, "core"); |
58 |
- TEST (testStandardAttributes, "core"); |
59 |
- TEST (testOptimized, "basic"); |
60 |
-- TEST (testOptimizedInterleavePatterns, "basic"); |
61 |
-+// TEST (testOptimizedInterleavePatterns, "basic"); |
62 |
- TEST (testYca, "basic"); |
63 |
- TEST (testTiledYa, "basic"); |
64 |
- TEST (testNativeFormat, "basic"); |
65 |
-@@ -255,7 +255,7 @@ main (int argc, char *argv[]) |
66 |
- TEST (testDwaCompressorSimd, "basic"); |
67 |
- TEST (testRle, "core"); |
68 |
- TEST (testB44ExpLogTable, "core"); |
69 |
-- TEST (testDwaLookups, "core"); |
70 |
-+// TEST (testDwaLookups, "core"); |
71 |
- |
72 |
- |
73 |
- //#ifdef ENABLE_IMFHUGETEST |
74 |
--- |
75 |
-2.27.0 |
76 |
- |
77 |
|
78 |
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 |
79 |
deleted file mode 100644 |
80 |
index ef71bc0e6871..000000000000 |
81 |
--- a/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch |
82 |
+++ /dev/null |
83 |
@@ -1,13 +0,0 @@ |
84 |
-This consists of A LOT of individual tests and on some hardware |
85 |
-(e.g. the RISC-V board BeagleV Starlight) the default test time-out |
86 |
-of 1500 seconds is greatly insufficient. On said BeagleV OpenEXR.IlmImf |
87 |
-takes almost 4800 s even on an otherwise idle system so let's add a bit |
88 |
-of margin and set the time-out of this test to 1.5 hours. |
89 |
- |
90 |
---- a/IlmImfTest/CMakeLists.txt 2021-06-15 00:15:14.000000000 +0000 |
91 |
-+++ b/IlmImfTest/CMakeLists.txt 2021-07-16 16:51:20.600435829 +0000 |
92 |
-@@ -73,3 +73,4 @@ |
93 |
- target_compile_definitions(IlmImfTest PRIVATE OPENEXR_DLL) |
94 |
- endif() |
95 |
- add_test(NAME OpenEXR.IlmImf COMMAND $<TARGET_FILE:IlmImfTest>) |
96 |
-+set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 5400) |
97 |
|
98 |
diff --git a/media-libs/openexr/openexr-2.5.8.ebuild b/media-libs/openexr/openexr-2.5.8.ebuild |
99 |
deleted file mode 100644 |
100 |
index fbe8a897d4ff..000000000000 |
101 |
--- a/media-libs/openexr/openexr-2.5.8.ebuild |
102 |
+++ /dev/null |
103 |
@@ -1,70 +0,0 @@ |
104 |
-# Copyright 1999-2022 Gentoo Authors |
105 |
-# Distributed under the terms of the GNU General Public License v2 |
106 |
- |
107 |
-EAPI=8 |
108 |
- |
109 |
-inherit cmake-multilib |
110 |
- |
111 |
-DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" |
112 |
-HOMEPAGE="https://www.openexr.com/" |
113 |
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
114 |
-S="${WORKDIR}/${P}/OpenEXR" |
115 |
- |
116 |
-LICENSE="BSD" |
117 |
-SLOT="0/25" # based on SONAME |
118 |
-# -ppc -sparc because broken on big endian, bug #818424 |
119 |
-KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" |
120 |
-IUSE="cpu_flags_x86_avx doc examples static-libs utils test" |
121 |
-RESTRICT="!test? ( test )" |
122 |
- |
123 |
-RDEPEND=" |
124 |
- ~media-libs/ilmbase-${PV}:=[static-libs?,${MULTILIB_USEDEP}] |
125 |
- sys-libs/zlib[${MULTILIB_USEDEP}] |
126 |
-" |
127 |
-DEPEND="${RDEPEND}" |
128 |
-BDEPEND="virtual/pkgconfig" |
129 |
- |
130 |
-DOCS=( PATENTS README.md ) |
131 |
- |
132 |
-src_prepare() { |
133 |
- # Fix path for testsuite |
134 |
- sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests" |
135 |
- |
136 |
- # disable failing tests on various arches |
137 |
- if use test; then |
138 |
- if use abi_x86_32; then |
139 |
- eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch" |
140 |
- fi |
141 |
- |
142 |
- # Technically this doesn't disable anything, it just gives this test time to complete. |
143 |
- # Could probably be applied unconditionally but will leave this to the maintainers. |
144 |
- if use riscv; then |
145 |
- eapply "${FILESDIR}/${PN}-2.5.7-0002-increase-IlmImfTest-timeout.patch" |
146 |
- fi |
147 |
- fi |
148 |
- |
149 |
- multilib_foreach_abi cmake_src_prepare |
150 |
-} |
151 |
- |
152 |
-multilib_src_configure() { |
153 |
- local mycmakeargs=( |
154 |
- -DBUILD_TESTING=$(usex test) |
155 |
- -DINSTALL_OPENEXR_DOCS=$(usex doc) |
156 |
- -DINSTALL_OPENEXR_EXAMPLES=$(usex examples) |
157 |
- -DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs) |
158 |
- -DOPENEXR_BUILD_UTILS=$(usex utils) |
159 |
- -DOPENEXR_INSTALL_PKG_CONFIG=ON |
160 |
- -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy |
161 |
- ) |
162 |
- |
163 |
- cmake_src_configure |
164 |
-} |
165 |
- |
166 |
-multilib_src_install_all() { |
167 |
- if use doc; then |
168 |
- DOCS+=( doc/*.pdf ) |
169 |
- fi |
170 |
- einstalldocs |
171 |
- |
172 |
- use examples && docompress -x /usr/share/doc/${PF}/examples |
173 |
-} |