From cb815ca5634fd66f398d1e58cfd35a61688114cd Mon Sep 17 00:00:00 2001 From: Bernd Waibel Date: Sat, 28 Jan 2023 11:24:52 +0100 Subject: media-libs/openexr: drop 2.5.8 Bug: https://bugs.gentoo.org/817431 Bug: https://bugs.gentoo.org/830384 Bug: https://bugs.gentoo.org/838079 Signed-off-by: Bernd Waibel Closes: https://github.com/gentoo/gentoo/pull/29317 Signed-off-by: Andreas Sturmlechner --- media-libs/openexr/Manifest | 1 - ....2-0001-IlmImfTest-main.cpp-disable-tests.patch | 40 ------------- ...xr-2.5.7-0002-increase-IlmImfTest-timeout.patch | 13 ---- media-libs/openexr/openexr-2.5.8.ebuild | 70 ---------------------- 4 files changed, 124 deletions(-) delete mode 100644 media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch delete mode 100644 media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch delete mode 100644 media-libs/openexr/openexr-2.5.8.ebuild diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest index bd6854bc0ea7..3a13467779b7 100644 --- a/media-libs/openexr/Manifest +++ b/media-libs/openexr/Manifest @@ -1,2 +1 @@ -DIST openexr-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c 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 deleted file mode 100644 index a77705cb5a7d..000000000000 --- a/media-libs/openexr/files/openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 866442b28b53f773efbb3690b6252d2e75bee137 Mon Sep 17 00:00:00 2001 -From: Bernd Waibel -Date: Fri, 3 Jul 2020 15:34:47 +0200 -Subject: [PATCH] IlmImfTest/main.cpp: disable tests - -Disable testOptimizedInterleavePatterns and testDwaLookup, which -are not working on x86. -For testOptimizedInterleavePatterns, see -https://github.com/AcademySoftwareFoundation/openexr/issues/67#issuecomment-21169748 - -Signed-off-by: Bernd Waibel ---- - IlmImfTest/main.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/IlmImfTest/main.cpp b/IlmImfTest/main.cpp -index 3245fc4..4ab45b1 100644 ---- a/IlmImfTest/main.cpp -+++ b/IlmImfTest/main.cpp -@@ -228,7 +228,7 @@ main (int argc, char *argv[]) - TEST (testExistingStreams, "core"); - TEST (testStandardAttributes, "core"); - TEST (testOptimized, "basic"); -- TEST (testOptimizedInterleavePatterns, "basic"); -+// TEST (testOptimizedInterleavePatterns, "basic"); - TEST (testYca, "basic"); - TEST (testTiledYa, "basic"); - TEST (testNativeFormat, "basic"); -@@ -255,7 +255,7 @@ main (int argc, char *argv[]) - TEST (testDwaCompressorSimd, "basic"); - TEST (testRle, "core"); - TEST (testB44ExpLogTable, "core"); -- TEST (testDwaLookups, "core"); -+// TEST (testDwaLookups, "core"); - - - //#ifdef ENABLE_IMFHUGETEST --- -2.27.0 - 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 deleted file mode 100644 index ef71bc0e6871..000000000000 --- a/media-libs/openexr/files/openexr-2.5.7-0002-increase-IlmImfTest-timeout.patch +++ /dev/null @@ -1,13 +0,0 @@ -This consists of A LOT of individual tests and on some hardware -(e.g. the RISC-V board BeagleV Starlight) the default test time-out -of 1500 seconds is greatly insufficient. On said BeagleV OpenEXR.IlmImf -takes almost 4800 s even on an otherwise idle system so let's add a bit -of margin and set the time-out of this test to 1.5 hours. - ---- a/IlmImfTest/CMakeLists.txt 2021-06-15 00:15:14.000000000 +0000 -+++ b/IlmImfTest/CMakeLists.txt 2021-07-16 16:51:20.600435829 +0000 -@@ -73,3 +73,4 @@ - target_compile_definitions(IlmImfTest PRIVATE OPENEXR_DLL) - endif() - add_test(NAME OpenEXR.IlmImf COMMAND $) -+set_tests_properties(OpenEXR.IlmImf PROPERTIES TIMEOUT 5400) diff --git a/media-libs/openexr/openexr-2.5.8.ebuild b/media-libs/openexr/openexr-2.5.8.ebuild deleted file mode 100644 index fbe8a897d4ff..000000000000 --- a/media-libs/openexr/openexr-2.5.8.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake-multilib - -DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://www.openexr.com/" -SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P}/OpenEXR" - -LICENSE="BSD" -SLOT="0/25" # based on SONAME -# -ppc -sparc because broken on big endian, bug #818424 -KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" -IUSE="cpu_flags_x86_avx doc examples static-libs utils test" -RESTRICT="!test? ( test )" - -RDEPEND=" - ~media-libs/ilmbase-${PV}:=[static-libs?,${MULTILIB_USEDEP}] - sys-libs/zlib[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -DOCS=( PATENTS README.md ) - -src_prepare() { - # Fix path for testsuite - sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests" - - # disable failing tests on various arches - if use test; then - if use abi_x86_32; then - eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch" - fi - - # 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}/${PN}-2.5.7-0002-increase-IlmImfTest-timeout.patch" - fi - fi - - multilib_foreach_abi cmake_src_prepare -} - -multilib_src_configure() { - local mycmakeargs=( - -DBUILD_TESTING=$(usex test) - -DINSTALL_OPENEXR_DOCS=$(usex doc) - -DINSTALL_OPENEXR_EXAMPLES=$(usex examples) - -DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs) - -DOPENEXR_BUILD_UTILS=$(usex utils) - -DOPENEXR_INSTALL_PKG_CONFIG=ON - -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy - ) - - cmake_src_configure -} - -multilib_src_install_all() { - if use doc; then - DOCS+=( doc/*.pdf ) - fi - einstalldocs - - use examples && docompress -x /usr/share/doc/${PF}/examples -} -- cgit v1.2.3-65-gdbad