Gentoo Archives: gentoo-commits

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/ilmbase/, media-libs/ilmbase/files/
Date: Tue, 04 Jun 2019 02:51:33
Message-Id: 1559616504.fc1ce929dcdaa63179c68c5c83e74fdb5a6e227a.dilfridge@gentoo
1 commit: fc1ce929dcdaa63179c68c5c83e74fdb5a6e227a
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jun 4 02:48:24 2019 +0000
4 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Tue Jun 4 02:48:24 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc1ce929
7
8 media-libs/ilmbase: Drop vulnerable versions, bug 620324
9
10 Bug: https://bugs.gentoo.org/620324
11 Package-Manager: Portage-2.3.67, Repoman-2.3.13
12 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
13
14 media-libs/ilmbase/Manifest | 4 --
15 .../ilmbase/files/ilmbase-1.0.0-asneeded.patch | 11 ---
16 media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch | 11 ---
17 .../ilmbase-2.2.0-Remove-register-keyword.patch | 79 ----------------------
18 media-libs/ilmbase/ilmbase-1.0.2.ebuild | 37 ----------
19 media-libs/ilmbase/ilmbase-2.0.1-r1.ebuild | 17 -----
20 media-libs/ilmbase/ilmbase-2.1.0.ebuild | 26 -------
21 media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild | 33 ---------
22 media-libs/ilmbase/ilmbase-2.2.0.ebuild | 26 -------
23 9 files changed, 244 deletions(-)
24
25 diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
26 index cb8ef67725d..b89e75e8259 100644
27 --- a/media-libs/ilmbase/Manifest
28 +++ b/media-libs/ilmbase/Manifest
29 @@ -1,5 +1 @@
30 -DIST ilmbase-1.0.2.tar.gz 496540 BLAKE2B 1727be15753102f56d7b23bb88c68897006cdba546000653f7028c511e6cd208bcbf23b27478db25f41890bb362e687e10fc9342785d25a92df6a3d7b0b77d90 SHA512 5a1a0011ef43132f33832d2e322320abb81a0f495e921de52af8f6e9ee50e0bed63897a0054de228f4081cc2f6591cb99a686f908620e87bf86c9d2d689923cd
31 -DIST ilmbase-2.0.1.tar.gz 555828 BLAKE2B 95cf3019c74c1efd95e1b7ddf2df224f4bcc93bafb9936c408f94ddaa2fa243161c91f8527ec9e67d7d48fb9d41dc84c42a2745d8e75d3a648f66bf0331d41e7 SHA512 0f2341fefd7c661b62bfd42590c9f29e5b58fbf303a4418e17d3bb831c40ebe23848250f360bc755113b84882665eb8c90497ee2f8d77bc5ed8e1fd43182c712
32 -DIST ilmbase-2.1.0.tar.gz 557552 BLAKE2B f210d47ab886cf9d2d76ca6ef6cc86123f887a0a3971e4063b5451293827861f10a6cc94bbe2399a9fcbacf48492e8d739b216b4baef72cc167bec1f2ed5fd6f SHA512 2d168accc4f4fb8256fa7a4488c1a930bf1f088bda93f6d8272d3ce15219716d3e85dfa1e85dc2766bce10438e8fb38607a232a145c00d5d742cbde6604df342
33 -DIST ilmbase-2.2.0.tar.gz 525289 BLAKE2B 951f6601075098b5f38e26d47f28a83f923d2689d306c02c855a0e8c846a339dfa589f574c6ffcb70e56ed8d7ff0202fea0709939c65aeaff3978ab9e2d58f4a SHA512 0bbad14ed2bd286dff3987b16ef8631470211da54f822cb3e29b7931807216845ded81c9bf41fd2d22a8b362e8b9904a5450f61f5a242e460083e86b846513f1
34 DIST ilmbase-2.3.0.tar.gz 595490 BLAKE2B db956fe7dbabf94632eb98635f4ebda8e937f26e26ed69f33743069fa2bf6d5ed3711f00eb33377c98b4f8ea367bbfc51b11d4cb884ce02238b537857cc19a9c SHA512 db0804a7c37c2a97f9dbf81b20f40f7fdea73242baa2759d9dc3728e6849e7ecae0e178fa1c710add980d050499151650675e4b2cda6cbbaa61aca406a1f929a
35
36 diff --git a/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch b/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch
37 deleted file mode 100644
38 index a3953efd351..00000000000
39 --- a/media-libs/ilmbase/files/ilmbase-1.0.0-asneeded.patch
40 +++ /dev/null
41 @@ -1,11 +0,0 @@
42 ---- a/IlmThread/Makefile.in
43 -+++ b/IlmThread/Makefile.in
44 -@@ -209,7 +209,7 @@
45 - IlmThreadMutexPosix.cpp
46 -
47 - libIlmThread_la_LDFLAGS = -version-info @LIBTOOL_VERSION@ -no-undefined
48 --libIlmThread_la_LIBADD = ../Iex/libIex.la
49 -+libIlmThread_la_LIBADD = ../Iex/libIex.la -lpthread
50 - libIlmThreadincludedir = $(includedir)/OpenEXR
51 - libIlmThreadinclude_HEADERS = IlmThreadPool.h IlmThread.h \
52 - IlmThreadSemaphore.h IlmThreadMutex.h
53
54 diff --git a/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch b/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch
55 deleted file mode 100644
56 index a4e186058fe..00000000000
57 --- a/media-libs/ilmbase/files/ilmbase-1.0.2-gcc43.patch
58 +++ /dev/null
59 @@ -1,11 +0,0 @@
60 ---- a/Imath/ImathMatrix.h
61 -+++ b/Imath/ImathMatrix.h
62 -@@ -37,6 +37,8 @@
63 - #ifndef INCLUDED_IMATHMATRIX_H
64 - #define INCLUDED_IMATHMATRIX_H
65 -
66 -+#include <cstring>
67 -+
68 - //----------------------------------------------------------------
69 - //
70 - // 2D (3x3) and 3D (4x4) transformation matrix templates.
71
72 diff --git a/media-libs/ilmbase/files/ilmbase-2.2.0-Remove-register-keyword.patch b/media-libs/ilmbase/files/ilmbase-2.2.0-Remove-register-keyword.patch
73 deleted file mode 100644
74 index 3fd95aceda9..00000000000
75 --- a/media-libs/ilmbase/files/ilmbase-2.2.0-Remove-register-keyword.patch
76 +++ /dev/null
77 @@ -1,79 +0,0 @@
78 -From 6d297f35c5dbfacc8a5e94f33b986db7ab468db9 Mon Sep 17 00:00:00 2001
79 -From: Larry Gritz <lg@××××××××××.com>
80 -Date: Fri, 30 Sep 2016 15:58:27 -0700
81 -Subject: [PATCH] Remove 'register' keyword.
82 -
83 -'register' is a relic of K&R-era C, it's utterly useless in modern
84 -compilers. It's been deprecated in C++11, and therefore will generate
85 -warnings when encountered -- and many packages that use OpenEXR's public
86 -headers use -Werr to turn warnings into errors. Starting in C++17, the
87 -keyword is removed entirely, and thus will certainly be a build break
88 -for that version of the standard. So it's time for it to go.
89 ----
90 - IlmBase/Half/half.cpp | 6 +++---
91 - IlmBase/Half/half.h | 4 ++--
92 - IlmBase/Imath/ImathMatrix.h | 8 ++++----
93 - 3 files changed, 9 insertions(+), 9 deletions(-)
94 -
95 -diff --git a/Half/half.cpp b/Half/half.cpp
96 -index 609aaa1..09a50aa 100644
97 ---- a/Half/half.cpp
98 -+++ b/Half/half.cpp
99 -@@ -94,9 +94,9 @@ half::convert (int i)
100 - // of float and half (127 versus 15).
101 - //
102 -
103 -- register int s = (i >> 16) & 0x00008000;
104 -- register int e = ((i >> 23) & 0x000000ff) - (127 - 15);
105 -- register int m = i & 0x007fffff;
106 -+ int s = (i >> 16) & 0x00008000;
107 -+ int e = ((i >> 23) & 0x000000ff) - (127 - 15);
108 -+ int m = i & 0x007fffff;
109 -
110 - //
111 - // Now reassemble s, e and m into a half:
112 -diff --git a/Half/half.h b/Half/half.h
113 -index f78e4f6..da418d6 100644
114 ---- a/Half/half.h
115 -+++ b/Half/half.h
116 -@@ -459,7 +459,7 @@ half::half (float f)
117 - // to do the float-to-half conversion.
118 - //
119 -
120 -- register int e = (x.i >> 23) & 0x000001ff;
121 -+ int e = (x.i >> 23) & 0x000001ff;
122 -
123 - e = _eLut[e];
124 -
125 -@@ -470,7 +470,7 @@ half::half (float f)
126 - // bits and combine it with the sign and exponent.
127 - //
128 -
129 -- register int m = x.i & 0x007fffff;
130 -+ int m = x.i & 0x007fffff;
131 - _h = e + ((m + 0x00000fff + ((m >> 13) & 1)) >> 13);
132 - }
133 - else
134 -diff --git a/Imath/ImathMatrix.h b/Imath/ImathMatrix.h
135 -index 3e96c2f..1d7f8dc 100644
136 ---- a/Imath/ImathMatrix.h
137 -+++ b/Imath/ImathMatrix.h
138 -@@ -2527,11 +2527,11 @@ Matrix44<T>::multiply (const Matrix44<T> &a,
139 - const Matrix44<T> &b,
140 - Matrix44<T> &c)
141 - {
142 -- register const T * IMATH_RESTRICT ap = &a.x[0][0];
143 -- register const T * IMATH_RESTRICT bp = &b.x[0][0];
144 -- register T * IMATH_RESTRICT cp = &c.x[0][0];
145 -+ const T * IMATH_RESTRICT ap = &a.x[0][0];
146 -+ const T * IMATH_RESTRICT bp = &b.x[0][0];
147 -+ T * IMATH_RESTRICT cp = &c.x[0][0];
148 -
149 -- register T a0, a1, a2, a3;
150 -+ T a0, a1, a2, a3;
151 -
152 - a0 = ap[0];
153 - a1 = ap[1];
154 ---
155 -2.14.1
156 -
157
158 diff --git a/media-libs/ilmbase/ilmbase-1.0.2.ebuild b/media-libs/ilmbase/ilmbase-1.0.2.ebuild
159 deleted file mode 100644
160 index b92d275e1df..00000000000
161 --- a/media-libs/ilmbase/ilmbase-1.0.2.ebuild
162 +++ /dev/null
163 @@ -1,37 +0,0 @@
164 -# Copyright 1999-2018 Gentoo Foundation
165 -# Distributed under the terms of the GNU General Public License v2
166 -
167 -EAPI=6
168 -inherit libtool
169 -
170 -DESCRIPTION="OpenEXR ILM Base libraries"
171 -HOMEPAGE="http://openexr.com/"
172 -SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
173 -
174 -LICENSE="BSD"
175 -SLOT="0"
176 -KEYWORDS="amd64 -arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
177 -IUSE="static-libs"
178 -
179 -RDEPEND="!<media-libs/openexr-1.5.0"
180 -DEPEND="${RDEPEND}"
181 -
182 -PATCHES=(
183 - "${FILESDIR}/${PN}-1.0.0-asneeded.patch"
184 - "${FILESDIR}/${P}-gcc43.patch"
185 -)
186 -
187 -src_prepare() {
188 - default
189 - elibtoolize
190 -}
191 -
192 -src_configure() {
193 - econf \
194 - $(use_enable static-libs static)
195 -}
196 -
197 -src_install() {
198 - default
199 - find "${D}" -name '*.la' -delete || die "Pruning failed"
200 -}
201
202 diff --git a/media-libs/ilmbase/ilmbase-2.0.1-r1.ebuild b/media-libs/ilmbase/ilmbase-2.0.1-r1.ebuild
203 deleted file mode 100644
204 index e9d83ade3ac..00000000000
205 --- a/media-libs/ilmbase/ilmbase-2.0.1-r1.ebuild
206 +++ /dev/null
207 @@ -1,17 +0,0 @@
208 -# Copyright 1999-2015 Gentoo Foundation
209 -# Distributed under the terms of the GNU General Public License v2
210 -
211 -EAPI=5
212 -inherit autotools-multilib
213 -
214 -DESCRIPTION="OpenEXR ILM Base libraries"
215 -HOMEPAGE="http://openexr.com/"
216 -SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
217 -
218 -LICENSE="BSD"
219 -SLOT="0/2.0.1" # 2.0.1 for the namespace off -> on switch, caused library renaming
220 -KEYWORDS="~amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
221 -IUSE="static-libs"
222 -
223 -DOCS=( AUTHORS ChangeLog NEWS README )
224 -MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
225
226 diff --git a/media-libs/ilmbase/ilmbase-2.1.0.ebuild b/media-libs/ilmbase/ilmbase-2.1.0.ebuild
227 deleted file mode 100644
228 index bdbfe9d413f..00000000000
229 --- a/media-libs/ilmbase/ilmbase-2.1.0.ebuild
230 +++ /dev/null
231 @@ -1,26 +0,0 @@
232 -# Copyright 1999-2017 Gentoo Foundation
233 -# Distributed under the terms of the GNU General Public License v2
234 -
235 -EAPI=5
236 -inherit autotools-multilib
237 -
238 -DESCRIPTION="OpenEXR ILM Base libraries"
239 -HOMEPAGE="http://openexr.com/"
240 -SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
241 -
242 -LICENSE="BSD"
243 -SLOT="0/11" # 11 from SONAME
244 -KEYWORDS="amd64 -arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
245 -IUSE="static-libs"
246 -
247 -DOCS=( AUTHORS ChangeLog NEWS README )
248 -MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
249 -
250 -src_configure() {
251 - # Disable use of ucontext.h wrt #482890
252 - if use hppa || use ppc || use ppc64; then
253 - export ac_cv_header_ucontext_h=no
254 - fi
255 -
256 - autotools-multilib_src_configure
257 -}
258
259 diff --git a/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild b/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild
260 deleted file mode 100644
261 index db5418878b6..00000000000
262 --- a/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild
263 +++ /dev/null
264 @@ -1,33 +0,0 @@
265 -# Copyright 1999-2018 Gentoo Foundation
266 -# Distributed under the terms of the GNU General Public License v2
267 -
268 -EAPI=6
269 -inherit multilib-minimal
270 -
271 -DESCRIPTION="OpenEXR ILM Base libraries"
272 -HOMEPAGE="http://openexr.com/"
273 -SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
274 -
275 -LICENSE="BSD"
276 -SLOT="0/12" # based on SONAME
277 -KEYWORDS="amd64 -arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
278 -IUSE="static-libs"
279 -
280 -DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]"
281 -
282 -DOCS=( AUTHORS ChangeLog NEWS README )
283 -MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
284 -
285 -# https://bugs.gentoo.org/632259
286 -RESTRICT="test"
287 -
288 -PATCHES=( "${FILESDIR}/${P}-Remove-register-keyword.patch" )
289 -
290 -multilib_src_configure() {
291 - # Disable use of ucontext.h wrt #482890
292 - if use hppa || use ppc || use ppc64; then
293 - export ac_cv_header_ucontext_h=no
294 - fi
295 -
296 - ECONF_SOURCE=${S} econf "$(use_enable static-libs static)"
297 -}
298
299 diff --git a/media-libs/ilmbase/ilmbase-2.2.0.ebuild b/media-libs/ilmbase/ilmbase-2.2.0.ebuild
300 deleted file mode 100644
301 index ed86d10473a..00000000000
302 --- a/media-libs/ilmbase/ilmbase-2.2.0.ebuild
303 +++ /dev/null
304 @@ -1,26 +0,0 @@
305 -# Copyright 1999-2017 Gentoo Foundation
306 -# Distributed under the terms of the GNU General Public License v2
307 -
308 -EAPI=5
309 -inherit autotools-multilib
310 -
311 -DESCRIPTION="OpenEXR ILM Base libraries"
312 -HOMEPAGE="http://openexr.com/"
313 -SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
314 -
315 -LICENSE="BSD"
316 -SLOT="0/12" # based on SONAME
317 -KEYWORDS="~amd64 -arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
318 -IUSE="static-libs"
319 -
320 -DOCS=( AUTHORS ChangeLog NEWS README )
321 -MULTILIB_WRAPPED_HEADERS=( /usr/include/OpenEXR/IlmBaseConfig.h )
322 -
323 -src_configure() {
324 - # Disable use of ucontext.h wrt #482890
325 - if use hppa || use ppc || use ppc64; then
326 - export ac_cv_header_ucontext_h=no
327 - fi
328 -
329 - autotools-multilib_src_configure
330 -}