1 |
commit: 299c1ff0f29fab1d72daa3bf6a335a59f775fc02 |
2 |
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Oct 26 22:03:49 2019 +0000 |
4 |
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Oct 26 22:04:19 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=299c1ff0 |
7 |
|
8 |
media-libs/libheif: security cleanup (#696302) |
9 |
|
10 |
Bug: https://bugs.gentoo.org/696302 |
11 |
Package-Manager: Portage-2.3.78, Repoman-2.3.17 |
12 |
Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> |
13 |
|
14 |
media-libs/libheif/Manifest | 3 - |
15 |
.../libheif/files/libheif-1.3.2-openjpeg-2.patch | 93 ---------------------- |
16 |
media-libs/libheif/libheif-1.3.2-r1.ebuild | 56 ------------- |
17 |
media-libs/libheif/libheif-1.4.0.ebuild | 58 -------------- |
18 |
media-libs/libheif/libheif-1.4.1.ebuild | 66 --------------- |
19 |
5 files changed, 276 deletions(-) |
20 |
|
21 |
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest |
22 |
index 0a30dd8db3c..3ce89884367 100644 |
23 |
--- a/media-libs/libheif/Manifest |
24 |
+++ b/media-libs/libheif/Manifest |
25 |
@@ -1,4 +1 @@ |
26 |
-DIST libheif-1.3.2.tar.gz 1328174 BLAKE2B 4c0f82bb90d48f89a4ce9aed525c5823bb5d008e54e580e761f6fa4f5493f265929a0607e7b81046ba7c249bd2ca21a0c5ab91da83b7e7f3a2a63e8f24df88ed SHA512 bcc8b4b2522ef6fe68f5a9ffd5312c2c8f6bc3718394eef1860e199c30fb735bb214f665ed6480b5f5fe5d578b3ed77a4301af93775ae2349ba5038b3f3ef63a |
27 |
-DIST libheif-1.4.0.tar.gz 1366030 BLAKE2B a93b3b59a4f89e0aa5a5069fdebc54b9d09adeeff05ebf28b9535baa2fb26e4122b4c5d96b7015fdd181720f10e3dd0887038f0c5567c94509aa76d2ef119dd9 SHA512 fc48caaadb71ffa87227de75c9e13d5006c66f1c966ce454552defb8947999f5242a9bbd1413f58be1ccbf61df7f118defe96d67376e3b4e7b12fe5dfa0fe0c7 |
28 |
-DIST libheif-1.4.1.tar.gz 950721 BLAKE2B 39793dbf4334b7ca93993ba518f9c935eb6d29a2debea12a3f1727d245572945e456b7997d79403da53bb5701ee62af8235a9815221402e5b901d9c07aa015a0 SHA512 c6e7d00c040885c506dde40469ba51b0346126689ed238abce123b471f748431cb29914015b3ca97749855a0f1f7c8e9a58388d4468da3c2d17c7a3a15270af0 |
29 |
DIST libheif-1.5.1.tar.gz 1510087 BLAKE2B 1dd5e913c8913c6b62b770653585f8ccf7cda14c4dd79ff2073bf085da4d730accaef8d0f8008ac941238a7e3e131add1a218e0c78a886847b3bcf253d66c9b6 SHA512 05e32ebff08d5f0e82e9b1107253c27882ae1694150033fe7b3ca07db8c64567f09002081276e92a3b490a63022a1522d577b094a7f489742139758d17f484b8 |
30 |
|
31 |
diff --git a/media-libs/libheif/files/libheif-1.3.2-openjpeg-2.patch b/media-libs/libheif/files/libheif-1.3.2-openjpeg-2.patch |
32 |
deleted file mode 100644 |
33 |
index 138295965b4..00000000000 |
34 |
--- a/media-libs/libheif/files/libheif-1.3.2-openjpeg-2.patch |
35 |
+++ /dev/null |
36 |
@@ -1,93 +0,0 @@ |
37 |
-Support building against libjpeg-turbo 2.0. |
38 |
- |
39 |
-Backport of https://github.com/strukturag/libheif/pull/85 |
40 |
- |
41 |
---- a/configure.ac |
42 |
-+++ b/configure.ac |
43 |
-@@ -95,6 +95,22 @@ AC_CHECK_LIB([jpeg], [jpeg_destroy_compress], [ |
44 |
- ], [have_libjpeg="no"]) |
45 |
- fi |
46 |
- AM_CONDITIONAL([HAVE_LIBJPEG], [test "x$have_libjpeg" = "xyes"]) |
47 |
-+if eval "test x$have_libjpeg = xyes"; then |
48 |
-+AC_MSG_CHECKING([for jpeg_write_icc_profile]) |
49 |
-+AC_LANG_PUSH(C++) |
50 |
-+AC_TRY_COMPILE([ |
51 |
-+ #include <stddef.h> |
52 |
-+ #include <stdio.h> |
53 |
-+ #include <jpeglib.h> |
54 |
-+],[ |
55 |
-+ jpeg_write_icc_profile(NULL, NULL, 0); |
56 |
-+],[has_jpeg_write_icc_profile=yes],[has_jpeg_write_icc_profile=no]); |
57 |
-+AC_LANG_POP(C++) |
58 |
-+AC_MSG_RESULT([$has_jpeg_write_icc_profile]) |
59 |
-+if eval "test x$has_jpeg_write_icc_profile = xyes"; then |
60 |
-+ AC_DEFINE(HAVE_JPEG_WRITE_ICC_PROFILE, 1, [Define to 1 if jpeg_write_icc_profile is available in libjpeg.]) |
61 |
-+fi |
62 |
-+fi |
63 |
- |
64 |
- PKG_CHECK_MODULES([libpng], [libpng], [ |
65 |
- AC_DEFINE([HAVE_LIBPNG], [1], [Whether libpng was found.]) |
66 |
---- a/examples/CMakeLists.txt |
67 |
-+++ b/examples/CMakeLists.txt |
68 |
-@@ -8,6 +8,24 @@ include (${CMAKE_ROOT}/Modules/FindJPEG.cmake) |
69 |
- |
70 |
- if(JPEG_FOUND) |
71 |
- add_definitions(-DHAVE_LIBJPEG=1) |
72 |
-+ |
73 |
-+include (${CMAKE_ROOT}/Modules/CheckCXXSourceCompiles.cmake) |
74 |
-+ |
75 |
-+set(CMAKE_REQUIRED_LIBRARIES ${JPEG_LIBRARIES}) |
76 |
-+check_cxx_source_compiles(" |
77 |
-+#include <stddef.h> |
78 |
-+#include <stdio.h> |
79 |
-+#include <jpeglib.h> |
80 |
-+ |
81 |
-+int main() { |
82 |
-+ jpeg_write_icc_profile(NULL, NULL, 0); |
83 |
-+ return 0; |
84 |
-+} |
85 |
-+" HAVE_JPEG_WRITE_ICC_PROFILE) |
86 |
-+if(HAVE_JPEG_WRITE_ICC_PROFILE) |
87 |
-+ add_definitions(-DHAVE_JPEG_WRITE_ICC_PROFILE=1) |
88 |
-+endif() |
89 |
-+ |
90 |
- set (heif_convert_sources |
91 |
- ${heif_convert_sources} |
92 |
- encoder_jpeg.cc |
93 |
---- a/examples/encoder_jpeg.cc |
94 |
-+++ b/examples/encoder_jpeg.cc |
95 |
-@@ -17,6 +17,10 @@ |
96 |
- * You should have received a copy of the GNU General Public License |
97 |
- * along with convert. If not, see <http://www.gnu.org/licenses/>. |
98 |
- */ |
99 |
-+#if defined(HAVE_CONFIG_H) |
100 |
-+#include "config.h" |
101 |
-+#endif |
102 |
-+ |
103 |
- #include <assert.h> |
104 |
- #include <errno.h> |
105 |
- #include <string.h> |
106 |
---- a/examples/encoder_jpeg.h |
107 |
-+++ b/examples/encoder_jpeg.h |
108 |
-@@ -24,6 +24,9 @@ |
109 |
- #include <stddef.h> |
110 |
- #include <stdio.h> |
111 |
- |
112 |
-+// Prevent duplicate definition for newer versions of libjpeg-turbo. |
113 |
-+#undef HAVE_STDDEF_H |
114 |
-+#undef HAVE_STDLIB_H |
115 |
- #include <jpeglib.h> |
116 |
- |
117 |
- #include <string> |
118 |
---- a/examples/heif_enc.cc |
119 |
-+++ b/examples/heif_enc.cc |
120 |
-@@ -35,6 +35,9 @@ |
121 |
- |
122 |
- #if HAVE_LIBJPEG |
123 |
- extern "C" { |
124 |
-+// Prevent duplicate definition for newer versions of libjpeg-turbo. |
125 |
-+#undef HAVE_STDDEF_H |
126 |
-+#undef HAVE_STDLIB_H |
127 |
- #include <jpeglib.h> |
128 |
- } |
129 |
- #endif |
130 |
|
131 |
diff --git a/media-libs/libheif/libheif-1.3.2-r1.ebuild b/media-libs/libheif/libheif-1.3.2-r1.ebuild |
132 |
deleted file mode 100644 |
133 |
index f65ef1de3e8..00000000000 |
134 |
--- a/media-libs/libheif/libheif-1.3.2-r1.ebuild |
135 |
+++ /dev/null |
136 |
@@ -1,56 +0,0 @@ |
137 |
-# Copyright 1999-2019 Gentoo Authors |
138 |
-# Distributed under the terms of the GNU General Public License v2 |
139 |
- |
140 |
-EAPI="7" |
141 |
- |
142 |
-inherit autotools multilib-minimal |
143 |
- |
144 |
-if [[ ${PV} == "9999" ]] ; then |
145 |
- EGIT_REPO_URI="https://github.com/strukturag/${PN}.git" |
146 |
- inherit git-r3 |
147 |
-else |
148 |
- SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz" |
149 |
- KEYWORDS="amd64 arm64 x86" |
150 |
- |
151 |
- PATCHES=( "${FILESDIR}"/${P}-openjpeg-2.patch ) |
152 |
-fi |
153 |
- |
154 |
-DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder" |
155 |
-HOMEPAGE="https://github.com/strukturag/libheif" |
156 |
- |
157 |
-LICENSE="GPL-3" |
158 |
-SLOT="0/1.3" |
159 |
-IUSE="static-libs +threads" |
160 |
- |
161 |
-DEPEND=" |
162 |
- media-libs/libde265:=[${MULTILIB_USEDEP}] |
163 |
- media-libs/libpng:0=[${MULTILIB_USEDEP}] |
164 |
- media-libs/x265:=[${MULTILIB_USEDEP}] |
165 |
- sys-libs/zlib:=[${MULTILIB_USEDEP}] |
166 |
- virtual/jpeg:0=[${MULTILIB_USEDEP}] |
167 |
-" |
168 |
-RDEPEND="${DEPEND}" |
169 |
- |
170 |
-src_prepare() { |
171 |
- default |
172 |
- |
173 |
- sed -i -e 's:-Werror::' \ |
174 |
- configure.ac || die |
175 |
- |
176 |
- eautoreconf |
177 |
-} |
178 |
- |
179 |
-multilib_src_configure() { |
180 |
- local myeconfargs=( |
181 |
- $(use_enable threads multithreading) |
182 |
- $(use_enable static-libs static) |
183 |
- ) |
184 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
185 |
-} |
186 |
- |
187 |
-multilib_src_install_all() { |
188 |
- find "${ED}" -name '*.la' -delete || die |
189 |
- if ! use static-libs ; then |
190 |
- find "${ED}" -name "*.a" -delete || die |
191 |
- fi |
192 |
-} |
193 |
|
194 |
diff --git a/media-libs/libheif/libheif-1.4.0.ebuild b/media-libs/libheif/libheif-1.4.0.ebuild |
195 |
deleted file mode 100644 |
196 |
index 4950607eb42..00000000000 |
197 |
--- a/media-libs/libheif/libheif-1.4.0.ebuild |
198 |
+++ /dev/null |
199 |
@@ -1,58 +0,0 @@ |
200 |
-# Copyright 1999-2019 Gentoo Authors |
201 |
-# Distributed under the terms of the GNU General Public License v2 |
202 |
- |
203 |
-EAPI="7" |
204 |
- |
205 |
-inherit autotools multilib-minimal |
206 |
- |
207 |
-if [[ ${PV} == "9999" ]] ; then |
208 |
- EGIT_REPO_URI="https://github.com/strukturag/${PN}.git" |
209 |
- inherit git-r3 |
210 |
-else |
211 |
- SRC_URI="https://github.com/strukturag/${PN}/releases/download/v${PV}/${P}.tar.gz" |
212 |
- KEYWORDS="~amd64 ~arm64 ~x86" |
213 |
-fi |
214 |
- |
215 |
-DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder" |
216 |
-HOMEPAGE="https://github.com/strukturag/libheif" |
217 |
- |
218 |
-LICENSE="GPL-3" |
219 |
-SLOT="0/1.4" |
220 |
-IUSE="static-libs test +threads" |
221 |
- |
222 |
-BDEPEND="test? ( dev-lang/go )" |
223 |
-DEPEND=" |
224 |
- media-libs/libde265:=[${MULTILIB_USEDEP}] |
225 |
- media-libs/libpng:0=[${MULTILIB_USEDEP}] |
226 |
- media-libs/x265:=[${MULTILIB_USEDEP}] |
227 |
- sys-libs/zlib:=[${MULTILIB_USEDEP}] |
228 |
- virtual/jpeg:0=[${MULTILIB_USEDEP}] |
229 |
-" |
230 |
-RDEPEND="${DEPEND}" |
231 |
- |
232 |
-src_prepare() { |
233 |
- default |
234 |
- |
235 |
- sed -i -e 's:-Werror::' \ |
236 |
- configure.ac || die |
237 |
- |
238 |
- eautoreconf |
239 |
- |
240 |
- # prevent "stat heif-test.go: no such file or directory" |
241 |
- multilib_copy_sources |
242 |
-} |
243 |
- |
244 |
-multilib_src_configure() { |
245 |
- local myeconfargs=( |
246 |
- $(use_enable threads multithreading) |
247 |
- $(use_enable static-libs static) |
248 |
- ) |
249 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
250 |
-} |
251 |
- |
252 |
-multilib_src_install_all() { |
253 |
- find "${ED}" -name '*.la' -delete || die |
254 |
- if ! use static-libs ; then |
255 |
- find "${ED}" -name "*.a" -delete || die |
256 |
- fi |
257 |
-} |
258 |
|
259 |
diff --git a/media-libs/libheif/libheif-1.4.1.ebuild b/media-libs/libheif/libheif-1.4.1.ebuild |
260 |
deleted file mode 100644 |
261 |
index cdb69afd093..00000000000 |
262 |
--- a/media-libs/libheif/libheif-1.4.1.ebuild |
263 |
+++ /dev/null |
264 |
@@ -1,66 +0,0 @@ |
265 |
-# Copyright 1999-2019 Gentoo Authors |
266 |
-# Distributed under the terms of the GNU General Public License v2 |
267 |
- |
268 |
-EAPI="7" |
269 |
- |
270 |
-inherit autotools xdg-utils multilib-minimal |
271 |
- |
272 |
-if [[ ${PV} == "9999" ]] ; then |
273 |
- EGIT_REPO_URI="https://github.com/strukturag/${PN}.git" |
274 |
- inherit git-r3 |
275 |
-else |
276 |
- SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
277 |
- KEYWORDS="~amd64 ~arm64 ~x86" |
278 |
-fi |
279 |
- |
280 |
-DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder" |
281 |
-HOMEPAGE="https://github.com/strukturag/libheif" |
282 |
- |
283 |
-LICENSE="GPL-3" |
284 |
-SLOT="0/1.4" |
285 |
-IUSE="static-libs test +threads" |
286 |
- |
287 |
-BDEPEND="test? ( dev-lang/go )" |
288 |
-DEPEND=" |
289 |
- media-libs/libde265:=[${MULTILIB_USEDEP}] |
290 |
- media-libs/libpng:0=[${MULTILIB_USEDEP}] |
291 |
- media-libs/x265:=[${MULTILIB_USEDEP}] |
292 |
- sys-libs/zlib:=[${MULTILIB_USEDEP}] |
293 |
- virtual/jpeg:0=[${MULTILIB_USEDEP}] |
294 |
-" |
295 |
-RDEPEND="${DEPEND}" |
296 |
- |
297 |
-src_prepare() { |
298 |
- default |
299 |
- |
300 |
- sed -i -e 's:-Werror::' \ |
301 |
- configure.ac || die |
302 |
- |
303 |
- eautoreconf |
304 |
- |
305 |
- # prevent "stat heif-test.go: no such file or directory" |
306 |
- multilib_copy_sources |
307 |
-} |
308 |
- |
309 |
-multilib_src_configure() { |
310 |
- local myeconfargs=( |
311 |
- $(use_enable threads multithreading) |
312 |
- $(use_enable static-libs static) |
313 |
- ) |
314 |
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
315 |
-} |
316 |
- |
317 |
-multilib_src_install_all() { |
318 |
- find "${ED}" -name '*.la' -delete || die |
319 |
- if ! use static-libs ; then |
320 |
- find "${ED}" -name "*.a" -delete || die |
321 |
- fi |
322 |
-} |
323 |
- |
324 |
-pkg_postinst() { |
325 |
- xdg_mimeinfo_database_update |
326 |
-} |
327 |
- |
328 |
-pkg_postrm() { |
329 |
- xdg_mimeinfo_database_update |
330 |
-} |