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/smpeg2/, media-libs/smpeg2/files/
Date: Mon, 27 Feb 2017 21:55:57
Message-Id: 1488232536.b0465fee65e55231c624512248aa6637d7569198.slyfox@gentoo
1 commit: b0465fee65e55231c624512248aa6637d7569198
2 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
3 AuthorDate: Mon Feb 27 21:55:27 2017 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 27 21:55:36 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0465fee
7
8 media-libs/smpeg2: fix build failure against gcc-6, bug #594912
9
10 Reported-by: Toralf Förster
11 Bug: https://bugs.gentoo.org/594912
12
13 Package-Manager: Portage-2.3.3, Repoman-2.3.1
14
15 media-libs/smpeg2/files/smpeg2-2.0.0-gcc6.patch | 23 +++++++++++++++++++++++
16 media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild | 1 +
17 2 files changed, 24 insertions(+)
18
19 diff --git a/media-libs/smpeg2/files/smpeg2-2.0.0-gcc6.patch b/media-libs/smpeg2/files/smpeg2-2.0.0-gcc6.patch
20 new file mode 100644
21 index 0000000000..4094c61ba4
22 --- /dev/null
23 +++ b/media-libs/smpeg2/files/smpeg2-2.0.0-gcc6.patch
24 @@ -0,0 +1,23 @@
25 +gcc-6 is more strict WRT narrowing:
26 +error: narrowing conversion of ‘-1’ from ‘int’ to ‘unsigned int’ inside { } [-Wnarrowing]
27 +
28 +https://bugs.gentoo.org/594912
29 +diff --git a/audio/hufftable.cpp b/audio/hufftable.cpp
30 +index 6bc8e86..5414ae3 100644
31 +--- a/audio/hufftable.cpp
32 ++++ b/audio/hufftable.cpp
33 +@@ -552,3 +552,3 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
34 + {
35 +- { 0, 0-1, 0-1, 0, 0, htd33},
36 ++ { 0, ~0u, ~0u, 0, 0, htd33},
37 + { 1, 2-1, 2-1, 0, 7,htd01},
38 +@@ -556,3 +556,3 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
39 + { 3, 3-1, 3-1, 0, 17,htd03},
40 +- { 4, 0-1, 0-1, 0, 0, htd33},
41 ++ { 4, ~0u, ~0u, 0, 0, htd33},
42 + { 5, 4-1, 4-1, 0, 31,htd05},
43 +@@ -566,3 +566,3 @@ const HUFFMANCODETABLE MPEGaudio::ht[HTN]=
44 + {13,16-1,16-1, 0,511,htd13},
45 +- {14, 0-1, 0-1, 0, 0, htd33},
46 ++ {14,~0u, ~0u, 0, 0, htd33},
47 + {15,16-1,16-1, 0,511,htd15},
48
49 diff --git a/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild b/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
50 index 71994bba5a..5e39a34756 100644
51 --- a/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
52 +++ b/media-libs/smpeg2/smpeg2-2.0.0-r3.ebuild
53 @@ -24,6 +24,7 @@ S=${WORKDIR}/${MY_P}
54
55 src_prepare() {
56 epatch "${FILESDIR}"/${P}-smpeg2-config.patch
57 + epatch "${FILESDIR}"/${P}-gcc6.patch
58 epatch_user
59
60 # avoid file collision with media-libs/smpeg