commit: 66ce50da64904ead6fcdfc89aa646094eb8d3e75 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Oct 27 02:57:58 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 27 02:57:58 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66ce50da
Revert "media-libs/openexr: add 3.1.11, drop obsolete blockers" This reverts commit 45c5b621cc1338fec723423bd713fffbe89d6f53. Signed-off-by: Sam James <sam <AT> gentoo.org> media-libs/openexr/Manifest | 1 - media-libs/openexr/openexr-3.1.11.ebuild | 69 ------------------------------ media-libs/openexr/openexr-3.1.5-r1.ebuild | 4 +- media-libs/openexr/openexr-3.1.7.ebuild | 4 +- 4 files changed, 6 insertions(+), 72 deletions(-) diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest index ea41489d2b92..b628bae952f4 100644 --- a/media-libs/openexr/Manifest +++ b/media-libs/openexr/Manifest @@ -1,3 +1,2 @@ -DIST openexr-3.1.11.tar.gz 20539852 BLAKE2B 9d57362c656a646a5b909063ff57eccfacbc70929a802561c2be71b050e97e7087221f78110f2686fcc1ea960d87880ccdbcb57b474f635a3392f3fa169ef3c5 SHA512 ebbad4b22315522f43cafefca77cf92ce38cac87f024c8dc6429aed04a6dad1f0a3d717faaab39c4c3605e440442952acc4630c5393754ea138929be4ad8a0d4 DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c DIST openexr-3.1.7.tar.gz 20494812 BLAKE2B 2cc03ed8da77f4a9523b7a0f55c78e78ab55f8f6de67cb68f1b2b4ad4b512448d80f39d60a0cc9eab451da35539027a573a0c6d6900e7f81b39f90703909b5af SHA512 f72f5e728f10c06fca0172c9b4c1df752225c3aed7384b4eaa502f92f8547bb1df93fe96d4d132a81eb32b729cb9fd615be825aa6c5de78481d3038c0d47c4d5 diff --git a/media-libs/openexr/openexr-3.1.11.ebuild b/media-libs/openexr/openexr-3.1.11.ebuild deleted file mode 100644 index bbb330f1fc0f..000000000000 --- a/media-libs/openexr/openexr-3.1.11.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -MY_PN=OpenEXR - -DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://openexr.com/"; -SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0/30" # based on SONAME -# -ppc -sparc because broken on big endian, bug #818424 -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong -ppc ~ppc64 ~riscv -sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" -IUSE="cpu_flags_x86_avx examples large-stack utils test threads" -RESTRICT="!test? ( test )" - -RDEPEND=" - >=dev-libs/Imath-3.1.6:= - sys-libs/zlib -" -DEPEND="${RDEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( "${FILESDIR}"/${PN}-3.1.1-0003-disable-failing-test.patch ) -DOCS=( CHANGES.md GOVERNANCE.md PATENTS README.md SECURITY.md ) - -src_prepare() { - # Fix path for testsuite - sed -e "s:/var/tmp/:${T}:" \ - -i "${S}"/src/test/${MY_PN}Test/tmpDir.h || die "failed to set temp path for tests" - - if use x86; then - eapply "${FILESDIR}"/${PN}-3.1.5-drop-failing-testDwaLookups.patch - fi - - cmake_src_prepare -} - -src_configure() { - if use x86; then - replace-cpu-flags native i686 - fi - - local mycmakeargs=( - -DBUILD_DOCS=OFF # needs sphinx_press_theme which we don't have in ::gentoo - -DBUILD_TESTING=$(usex test) - -DOPENEXR_BUILD_TOOLS=$(usex utils) - -DOPENEXR_ENABLE_LARGE_STACK=$(usex large-stack) - -DOPENEXR_ENABLE_THREADING=$(usex threads) - -DOPENEXR_INSTALL_EXAMPLES=$(usex examples) - -DOPENEXR_INSTALL_PKG_CONFIG=ON - -DOPENEXR_INSTALL_TOOLS=$(usex utils) - -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy - ) - - use test && mycmakeargs+=( -DOPENEXR_RUN_FUZZ_TESTS=ON ) - - cmake_src_configure -} - -src_install() { - use examples && docompress -x /usr/share/doc/${PF}/examples - - cmake_src_install -} diff --git a/media-libs/openexr/openexr-3.1.5-r1.ebuild b/media-libs/openexr/openexr-3.1.5-r1.ebuild index 514978514e74..b307b8c8c2ac 100644 --- a/media-libs/openexr/openexr-3.1.5-r1.ebuild +++ b/media-libs/openexr/openexr-3.1.5-r1.ebuild @@ -8,7 +8,7 @@ inherit cmake flag-o-matic MY_PN=OpenEXR DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://openexr.com/"; +HOMEPAGE="https://www.openexr.com/"; SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" @@ -21,6 +21,8 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/Imath-${PV}:= sys-libs/zlib + !media-libs/openexr:3 + !media-libs/ilmbase " DEPEND="${RDEPEND}" BDEPEND=" diff --git a/media-libs/openexr/openexr-3.1.7.ebuild b/media-libs/openexr/openexr-3.1.7.ebuild index bc11bb9507bc..445494079498 100644 --- a/media-libs/openexr/openexr-3.1.7.ebuild +++ b/media-libs/openexr/openexr-3.1.7.ebuild @@ -8,7 +8,7 @@ inherit cmake flag-o-matic MY_PN=OpenEXR DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries" -HOMEPAGE="https://openexr.com/"; +HOMEPAGE="https://www.openexr.com/"; SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="BSD" @@ -21,6 +21,8 @@ RESTRICT="!test? ( test )" RDEPEND=" >=dev-libs/Imath-3.1.6:= sys-libs/zlib + !media-libs/openexr:3 + !media-libs/ilmbase " DEPEND="${RDEPEND}" BDEPEND="virtual/pkgconfig"
