Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/zimg/files/, media-libs/zimg/
Date: Sat, 09 May 2020 09:36:45
Message-Id: 1589016993.7a49f4df7f6bc0e0ab953c10ec1cd4a25558cb4b.slyfox@gentoo
1 commit: 7a49f4df7f6bc0e0ab953c10ec1cd4a25558cb4b
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Sat May 9 09:36:19 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Sat May 9 09:36:33 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a49f4df
7
8 media-libs/zimg: tweak for gcc-10, bug #721676
9
10 The build fails as:
11
12 ```
13 src/zimg/colorspace/matrix3.cpp:20:7:
14 error: 'size_t' was not declared in this scope; did you mean 'std::size_t'?
15 20 | for (size_t i = 0; i < 3; ++i) {
16 | ^~~~~~
17 | std::size_t
18 ```
19
20 Direct backport of upstream 9ae36d7d5f74 ("Update matrix3.cpp")
21 which adds missing <cstddef> include needed for 'size_t'.
22
23 Reported-by: Patrick McLean
24 Closes: https://bugs.gentoo.org/721676
25 Package-Manager: Portage-2.3.99, Repoman-2.3.22
26 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
27
28 media-libs/zimg/files/zimg-2.9.2-gcc-10.patch | 18 ++++++++++++++++++
29 media-libs/zimg/zimg-2.9.2.ebuild | 2 ++
30 2 files changed, 20 insertions(+)
31
32 diff --git a/media-libs/zimg/files/zimg-2.9.2-gcc-10.patch b/media-libs/zimg/files/zimg-2.9.2-gcc-10.patch
33 new file mode 100644
34 index 00000000000..ea192f77fca
35 --- /dev/null
36 +++ b/media-libs/zimg/files/zimg-2.9.2-gcc-10.patch
37 @@ -0,0 +1,18 @@
38 +https://bugs.gentoo.org/721676
39 +
40 +From 9ae36d7d5f7420eaacd9644451933512fa13d716 Mon Sep 17 00:00:00 2001
41 +From: sekrit-twc <sekrit-twc@××××××××××××××××××××.com>
42 +Date: Wed, 4 Dec 2019 12:01:26 -0800
43 +Subject: [PATCH] Update matrix3.cpp
44 +
45 +---
46 + src/zimg/colorspace/matrix3.cpp | 1 +
47 + 1 file changed, 1 insertion(+)
48 +
49 +--- a/src/zimg/colorspace/matrix3.cpp
50 ++++ b/src/zimg/colorspace/matrix3.cpp
51 +@@ -1,3 +1,4 @@
52 ++#include <cstddef>
53 + #include "matrix3.h"
54 +
55 + namespace zimg {
56
57 diff --git a/media-libs/zimg/zimg-2.9.2.ebuild b/media-libs/zimg/zimg-2.9.2.ebuild
58 index c1295123848..e962d7a4b5f 100644
59 --- a/media-libs/zimg/zimg-2.9.2.ebuild
60 +++ b/media-libs/zimg/zimg-2.9.2.ebuild
61 @@ -20,6 +20,8 @@ LICENSE="WTFPL-2"
62 SLOT="0"
63 IUSE="cpu_flags_x86_sse debug static-libs"
64
65 +PATCHES=("${FILESDIR}"/${PN}-2.9.2-gcc-10.patch)
66 +
67 src_prepare() {
68 default
69 eautoreconf