diff options
| author |   David Seifert <soap@gentoo.org> | 2016-10-02 18:07:21 +0200 |
|---|---|---|
| committer | David Seifert <soap@gentoo.org> | 2016-10-02 18:45:47 +0200 |
| commit | f82fb9223e807b3e8c9b4bf8aa36b468fbb80ec3 (patch) | |
| tree | 22130bc04196f2b3d79e48107049c2904667796c /media-sound/splay | |
| parent | media-sound/cplay: Remove old (diff) | |
| download | gentoo-f82fb9223e807b3e8c9b4bf8aa36b468fbb80ec3.tar.gz gentoo-f82fb9223e807b3e8c9b4bf8aa36b468fbb80ec3.tar.bz2 gentoo-f82fb9223e807b3e8c9b4bf8aa36b468fbb80ec3.zip | |
media-sound/splay: Allow for compiling with GCC 6
Gentoo-bug: 594684
Package-Manager: portage-2.3.1
Diffstat (limited to 'media-sound/splay')
| -rw-r--r-- | media-sound/splay/files/splay-0.9.5.2-fix-c++14.patch | 28 | ||||
| -rw-r--r-- | media-sound/splay/splay-0.9.5.2-r2.ebuild | 1 |
2 files changed, 29 insertions, 0 deletions
diff --git a/media-sound/splay/files/splay-0.9.5.2-fix-c++14.patch b/media-sound/splay/files/splay-0.9.5.2-fix-c++14.patch new file mode 100644 index 000000000000..328463aaa67b --- /dev/null +++ b/media-sound/splay/files/splay-0.9.5.2-fix-c++14.patch @@ -0,0 +1,28 @@ +Fix building with C++14, which errors out due to narrowing conversions. +See also: https://bugs.gentoo.org/show_bug.cgi?id=594684 + +--- a/libs/huffmantable.cc ++++ b/libs/huffmantable.cc +@@ -550,11 +550,11 @@ + + const HUFFMANCODETABLE Mpegtoraw::ht[HTN]= + { +- { 0, 0-1, 0-1, 0, 0, htd33}, ++ { 0, (unsigned int)(0-1), (unsigned int)(0-1), 0, 0, htd33}, + { 1, 2-1, 2-1, 0, 7,htd01}, + { 2, 3-1, 3-1, 0, 17,htd02}, + { 3, 3-1, 3-1, 0, 17,htd03}, +- { 4, 0-1, 0-1, 0, 0, htd33}, ++ { 4, (unsigned int)(0-1), (unsigned int)(0-1), 0, 0, htd33}, + { 5, 4-1, 4-1, 0, 31,htd05}, + { 6, 4-1, 4-1, 0, 31,htd06}, + { 7, 6-1, 6-1, 0, 71,htd07}, +@@ -564,7 +564,7 @@ + {11, 8-1, 8-1, 0,127,htd11}, + {12, 8-1, 8-1, 0,127,htd12}, + {13,16-1,16-1, 0,511,htd13}, +- {14, 0-1, 0-1, 0, 0, htd33}, ++ {14, (unsigned int)(0-1), (unsigned int)(0-1), 0, 0, htd33}, + {15,16-1,16-1, 0,511,htd15}, + {16,16-1,16-1, 1,511,htd16}, + {17,16-1,16-1, 2,511,htd16}, diff --git a/media-sound/splay/splay-0.9.5.2-r2.ebuild b/media-sound/splay/splay-0.9.5.2-r2.ebuild index 67d31aeeacb9..f8390eb2fb0d 100644 --- a/media-sound/splay/splay-0.9.5.2-r2.ebuild +++ b/media-sound/splay/splay-0.9.5.2-r2.ebuild @@ -22,6 +22,7 @@ PATCHES=( "${FILESDIR}/${P}-external-id3lib.diff" "${FILESDIR}/${P}-gcc43-2.patch" "${FILESDIR}/${P}-fix-buildsystem.patch" + "${FILESDIR}/${P}-fix-c++14.patch" ) src_prepare() { |