1 |
commit: c8da0332de0b4be07edec88ce91e51a57708fe40 |
2 |
Author: Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net> |
3 |
AuthorDate: Sat Feb 27 14:15:47 2021 +0000 |
4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Feb 27 16:37:13 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8da0332 |
7 |
|
8 |
media-libs/ilmbase: drop 2.5.2 |
9 |
|
10 |
Security cleanup. See #770229 |
11 |
|
12 |
Package-Manager: Portage-3.0.15, Repoman-3.0.2 |
13 |
Signed-off-by: Bernd Waibel <waebbl-gentoo <AT> posteo.net> |
14 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
15 |
|
16 |
media-libs/ilmbase/Manifest | 1 - |
17 |
media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch | 50 ----------------------- |
18 |
media-libs/ilmbase/ilmbase-2.5.2.ebuild | 49 ---------------------- |
19 |
3 files changed, 100 deletions(-) |
20 |
|
21 |
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest |
22 |
index 192407c9432..823211ab083 100644 |
23 |
--- a/media-libs/ilmbase/Manifest |
24 |
+++ b/media-libs/ilmbase/Manifest |
25 |
@@ -1,4 +1,3 @@ |
26 |
DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a |
27 |
-DIST ilmbase-2.5.2.tar.gz 27525326 BLAKE2B c48a61513457f2c04f3a512963ae27eaf154933ffe7c6ff3e2d71f27f246ae624a34dbe6f8ab500c51a56898ad0f61e6784f5cd3f9c3df591ce347b46ba4ac88 SHA512 62f98695cf56600303db9c2d13d34cacc1851a103d8ffb7e7ce8c6d9d14e6bf02804836c718ae03e8d685ef3dda0cf7b2130e2d363f8095b22a15bf30d706fab |
28 |
DIST ilmbase-2.5.4.tar.gz 27535491 BLAKE2B 8951383d31ceea49202e3b77999d71c261bc9a17433fb65debd446aefd62cc1f6776a4b37fb1161196135a8883a397a94496a2295a2e0d22bc43c59e2ad0eaa5 SHA512 f0fe305987981e0c7e5a854367702585e4935ad37b0e8c10dcbc7468ae3a6d34bf963ec9ec75cc3abe4cf00e359644476b643978d0289dca46c9785a25d3f7f1 |
29 |
DIST ilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf |
30 |
|
31 |
diff --git a/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch b/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch |
32 |
deleted file mode 100644 |
33 |
index 80f11e44c12..00000000000 |
34 |
--- a/media-libs/ilmbase/files/ilmbase-2.5.2-musl.patch |
35 |
+++ /dev/null |
36 |
@@ -1,50 +0,0 @@ |
37 |
-From c7af102e6bce6638add2f38576ffe9c6741ba768 Mon Sep 17 00:00:00 2001 |
38 |
-From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@×××.me> |
39 |
-Date: Thu, 30 Jul 2020 02:21:07 +0200 |
40 |
-Subject: [PATCH] IexMathFpu.cpp: Fix build on non-glibc (e.g. musl libc). |
41 |
-MIME-Version: 1.0 |
42 |
-Content-Type: text/plain; charset=UTF-8 |
43 |
-Content-Transfer-Encoding: 8bit |
44 |
- |
45 |
-Originally from: |
46 |
-https://github.com/void-linux/void-packages/blob/80bbc168faa25448bd3399f4df331b836e74b85c/srcpkgs/ilmbase/patches/musl-_fpstate.patch |
47 |
- |
48 |
-Fixes error: |
49 |
- |
50 |
- IlmBase/IexMath/IexMathFpu.cpp: In function ‘void Iex_2_4::FpuControl::restoreControlRegs(const ucontext_t&, bool)’: |
51 |
- IlmBase/IexMath/IexMathFpu.cpp:284:38: error: ‘struct _fpstate’ has no member named ‘cw’; did you mean ‘cwd’? |
52 |
- 284 | setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal); |
53 |
- | ^~ |
54 |
- | cwd |
55 |
- IlmBase/IexMath/IexMathFpu.cpp:287:20: error: ‘struct Iex_2_4::FpuControl::_fpstate_64’ has no member named ‘magic’ |
56 |
- 287 | setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions); |
57 |
- | ^~~~~ |
58 |
- |
59 |
-Signed-off-by: Niklas Hambüchen <mail@×××.me> |
60 |
---- |
61 |
- IlmBase/IexMath/IexMathFpu.cpp | 8 ++++++++ |
62 |
- 1 file changed, 8 insertions(+) |
63 |
- |
64 |
-diff --git a/IlmBase/IexMath/IexMathFpu.cpp b/IlmBase/IexMath/IexMathFpu.cpp |
65 |
-index ceed658e0..439329e50 100644 |
66 |
---- a/IexMath/IexMathFpu.cpp |
67 |
-+++ b/IexMath/IexMathFpu.cpp |
68 |
-@@ -281,10 +281,18 @@ restoreControlRegs (const ucontext_t & ucon, bool clearExceptions) |
69 |
- inline void |
70 |
- restoreControlRegs (const ucontext_t & ucon, bool clearExceptions) |
71 |
- { |
72 |
-+#if defined(__GLIBC__) || defined(__i386__) |
73 |
- setCw ((ucon.uc_mcontext.fpregs->cw & cwRestoreMask) | cwRestoreVal); |
74 |
-+#else |
75 |
-+ setCw ((ucon.uc_mcontext.fpregs->cwd & cwRestoreMask) | cwRestoreVal); |
76 |
-+#endif |
77 |
- |
78 |
- _fpstate * kfp = reinterpret_cast<_fpstate *> (ucon.uc_mcontext.fpregs); |
79 |
-+#if defined(__GLIBC__) || defined(__i386__) |
80 |
- setMxcsr (kfp->magic == 0 ? kfp->mxcsr : 0, clearExceptions); |
81 |
-+#else |
82 |
-+ setMxcsr (kfp->mxcsr, clearExceptions); |
83 |
-+#endif |
84 |
- } |
85 |
- |
86 |
- #endif |
87 |
|
88 |
diff --git a/media-libs/ilmbase/ilmbase-2.5.2.ebuild b/media-libs/ilmbase/ilmbase-2.5.2.ebuild |
89 |
deleted file mode 100644 |
90 |
index f2e75387717..00000000000 |
91 |
--- a/media-libs/ilmbase/ilmbase-2.5.2.ebuild |
92 |
+++ /dev/null |
93 |
@@ -1,49 +0,0 @@ |
94 |
-# Copyright 1999-2020 Gentoo Authors |
95 |
-# Distributed under the terms of the GNU General Public License v2 |
96 |
- |
97 |
-EAPI=7 |
98 |
- |
99 |
-CMAKE_ECLASS=cmake |
100 |
-inherit cmake-multilib flag-o-matic |
101 |
- |
102 |
-DESCRIPTION="OpenEXR ILM Base libraries" |
103 |
-HOMEPAGE="http://openexr.com/" |
104 |
-SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
105 |
- |
106 |
-LICENSE="BSD" |
107 |
-SLOT="0/25" # based on SONAME |
108 |
-KEYWORDS="amd64 ~arm arm64 hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" |
109 |
-IUSE="large-stack static-libs test" |
110 |
-RESTRICT="!test? ( test )" |
111 |
- |
112 |
-BDEPEND="virtual/pkgconfig" |
113 |
- |
114 |
-S="${WORKDIR}/openexr-${PV}/IlmBase" |
115 |
- |
116 |
-MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfigInternal.h ) |
117 |
- |
118 |
-PATCHES=( "${FILESDIR}"/${P}-musl.patch ) |
119 |
- |
120 |
-multilib_src_configure() { |
121 |
- local mycmakeargs=( |
122 |
- -DBUILD_TESTING=$(usex test) |
123 |
- -DILMBASE_BUILD_BOTH_STATIC_SHARED=$(usex static-libs) |
124 |
- -DILMBASE_ENABLE_LARGE_STACK=$(usex large-stack) |
125 |
- -DILMBASE_INSTALL_PKG_CONFIG=ON |
126 |
- ) |
127 |
- |
128 |
- # Disable use of ucontext.h wrt #482890 |
129 |
- if use hppa || use ppc || use ppc64; then |
130 |
- mycmakeargs+=( |
131 |
- -DILMBASE_HAVE_UCONTEXT_H=OFF |
132 |
- ) |
133 |
- fi |
134 |
- |
135 |
- # needed for running tests with x86_32 |
136 |
- # see https://github.com/AcademySoftwareFoundation/openexr/issues/346 |
137 |
- if use abi_x86_32 && use test; then |
138 |
- append-cppflags -ffloat-store |
139 |
- fi |
140 |
- |
141 |
- cmake_src_configure |
142 |
-} |