[gentoo-commits] repo/gentoo:master commit in: media-libs/ilmbase/, media-libs/ilmbase/files/

["Sam James" <sam@gentoo.org>]

commit:     c8da0332de0b4be07edec88ce91e51a57708fe40
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Feb 27 14:15:47 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Feb 27 16:37:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8da0332

media-libs/ilmbase: drop 2.5.2

Security cleanup. See #770229

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/ilmbase/Manifest                       |  1 -
 media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch | 50 -----------------------
 media-libs/ilmbase/ilmbase-2.5.2.ebuild           | 49 ----------------------
 3 files changed, 100 deletions(-)

diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 192407c9432..823211ab083 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,4 +1,3 @@
 DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
-DIST ilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab
 DIST ilmbase-2.5.4.tar.gz 27535491 BLAKE2B 8951383d31ceea49202e3b77999d71c261bc9a17433fb65debd446aefd62cc1f6776a4b37fb1161196135a8883a397a94496a2295a2e0d22bc43c59e2ad0eaa5 SHA512 f0fe305987981e0c7e5a854367702585e4935ad37b0e8c10dcbc7468ae3a6d34bf963ec9ec75cc3abe4cf00e359644476b643978d0289dca46c9785a25d3f7f1
 DIST ilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf

diff --git a/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch b/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch
deleted file mode 100644
index 80f11e44c12..00000000000
--- a/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From c7af102e6bce6638add2f38576ffe9c6741ba768 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
-Date: Thu, 30 Jul 2020 02:21:07 +0200
-Subject: [PATCH] IexMathFpu.cpp: Fix build on non-glibc (e.g. musl libc).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Originally from:
-https://github.com/void-linux/void-packages/blob/80bbc168faa25448bd3399f4df331b836e74b85c/srcpkgs/ilmbase/patches/musl-_fpstate.patch
-
-Fixes error:
-
-    IlmBase/IexMath/IexMathFpu.cpp: In function ‘void Iex_2_4::FpuControl::restoreControlRegs(const ucontext_t&, bool)’:
-    IlmBase/IexMath/IexMathFpu.cpp:284:38: error: ‘struct _fpstate’ has no member named ‘cw’; did you mean ‘cwd’?
-      284 |     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-          |                                      ^~
-          |                                      cwd
-    IlmBase/IexMath/IexMathFpu.cpp:287:20: error: ‘struct Iex_2_4::FpuControl::_fpstate_64’ has no member named ‘magic’
-      287 |     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-          |                    ^~~~~
-
-Signed-off-by: Niklas Hambüchen <mail@nh2.me>
----
- IlmBase/IexMath/IexMathFpu.cpp | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/IlmBase/IexMath/IexMathFpu.cpp b/IlmBase/IexMath/IexMathFpu.cpp
-index ceed658e0..439329e50 100644
---- a/IexMath/IexMathFpu.cpp
-+++ b/IexMath/IexMathFpu.cpp
-@@ -281,10 +281,18 @@ restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- inline void
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions)
- {
-+#if defined(__GLIBC__) || defined(__i386__)
-     setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal);
-+#else
-+    setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal);
-+#endif
-     
-     _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs);
-+#if defined(__GLIBC__) || defined(__i386__)
-     setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions);
-+#else
-+    setMxcsr (kfp->mxcsr, clearExceptions);
-+#endif
- }
- 
- #endif

diff --git a/media-libs/ilmbase/ilmbase-2.5.2.ebuild b/media-libs/ilmbase/ilmbase-2.5.2.ebuild
deleted file mode 100644
index f2e75387717..00000000000
--- a/media-libs/ilmbase/ilmbase-2.5.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-CMAKE_ECLASS=cmake
-inherit cmake-multilib flag-o-matic
-
-DESCRIPTION="OpenEXR ILM Base libraries"
-HOMEPAGE="http://openexr.com/"
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/25" # based on SONAME
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
-IUSE="large-stack static-libs test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/openexr-${PV}/IlmBase"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfigInternal.h )
-
-PATCHES=( "${FILESDIR}"/${P}-musl.patch )
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		-DBUILD_TESTING=$(usex test)
-		-DILMBASE_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
-		-DILMBASE_ENABLE_LARGE_STACK=$(usex large-stack)
-		-DILMBASE_INSTALL_PKG_CONFIG=ON
-	)
-
-	# Disable use of ucontext.h wrt #482890
-	if use hppa || use ppc || use ppc64; then
-		mycmakeargs+=(
-			-DILMBASE_HAVE_UCONTEXT_H=OFF
-		)
-	fi
-
-	# needed for running tests with x86_32
-	# see https://github.com/AcademySoftwareFoundation/openexr/issues/346
-	if use abi_x86_32 && use test; then
-		append-cppflags -ffloat-store
-	fi
-
-	cmake_src_configure
-}