Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/zvbi/files/, media-libs/zvbi/
Date: Thu, 22 Jun 2017 14:24:59
Message-Id: 1498141474.f5081e2efceec7b034d0519f0d60c3205bd86701.aballier@gentoo
1 commit: f5081e2efceec7b034d0519f0d60c3205bd86701
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 22 12:19:15 2017 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 22 14:24:34 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f5081e2e
7
8 media-libs/zvbi: Fix building tests with gcc7.
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 media-libs/zvbi/files/tests-gcc7.patch | 22 ++++++++++++++++++++++
13 media-libs/zvbi/zvbi-0.2.35-r1.ebuild | 1 +
14 2 files changed, 23 insertions(+)
15
16 diff --git a/media-libs/zvbi/files/tests-gcc7.patch b/media-libs/zvbi/files/tests-gcc7.patch
17 new file mode 100644
18 index 00000000000..181285cfbd4
19 --- /dev/null
20 +++ b/media-libs/zvbi/files/tests-gcc7.patch
21 @@ -0,0 +1,22 @@
22 +Index: zvbi-0.2.35/test/test-dvb_mux.cc
23 +===================================================================
24 +--- zvbi-0.2.35.orig/test/test-dvb_mux.cc
25 ++++ zvbi-0.2.35/test/test-dvb_mux.cc
26 +@@ -137,7 +137,7 @@ is_good_service (vbi_service_set servi
27 + static const vbi_service_set
28 + all_services [] = {
29 + 0,
30 +- -1,
31 ++ (vbi_service_set)-1,
32 + VBI_SLICED_2xCAPTION_525,
33 + VBI_SLICED_CAPTION_525,
34 + VBI_SLICED_CAPTION_525_F1,
35 +@@ -3237,7 +3237,7 @@ static void
36 + test_dvb_mux_cor_pts (void)
37 + {
38 + static const int64_t ptss [] = {
39 +- 0x8000000000000000ll, -1, 0, 0x7FFFFFFFFFFFFFFFll,
40 ++ (int64_t)0x8000000000000000ll, -1, 0, 0x7FFFFFFFFFFFFFFFll,
41 + };
42 + DVBPESMuxTest mx;
43 + unsigned int i;
44
45 diff --git a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
46 index 1ebe916ea7c..02b94b7885b 100644
47 --- a/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
48 +++ b/media-libs/zvbi/zvbi-0.2.35-r1.ebuild
49 @@ -24,6 +24,7 @@ DEPEND="${RDEPEND}
50 X? ( x11-libs/libXt )"
51
52 src_prepare() {
53 + epatch "${FILESDIR}/tests-gcc7.patch"
54 elibtoolize
55 }