| 1 |
commit: f82fb9223e807b3e8c9b4bf8aa36b468fbb80ec3 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 2 16:07:21 2016 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 2 16:45:47 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f82fb922 |
| 7 |
|
| 8 |
media-sound/splay: Allow for compiling with GCC 6 |
| 9 |
|
| 10 |
Gentoo-bug: 594684 |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.1 |
| 13 |
|
| 14 |
.../splay/files/splay-0.9.5.2-fix-c++14.patch | 28 ++++++++++++++++++++++ |
| 15 |
media-sound/splay/splay-0.9.5.2-r2.ebuild | 1 + |
| 16 |
2 files changed, 29 insertions(+) |
| 17 |
|
| 18 |
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 |
| 19 |
new file mode 100644 |
| 20 |
index 00000000..328463a |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-sound/splay/files/splay-0.9.5.2-fix-c++14.patch |
| 23 |
@@ -0,0 +1,28 @@ |
| 24 |
+Fix building with C++14, which errors out due to narrowing conversions. |
| 25 |
+See also: https://bugs.gentoo.org/show_bug.cgi?id=594684 |
| 26 |
+ |
| 27 |
+--- a/libs/huffmantable.cc |
| 28 |
++++ b/libs/huffmantable.cc |
| 29 |
+@@ -550,11 +550,11 @@ |
| 30 |
+ |
| 31 |
+ const HUFFMANCODETABLE Mpegtoraw::ht[HTN]= |
| 32 |
+ { |
| 33 |
+- { 0, 0-1, 0-1, 0, 0, htd33}, |
| 34 |
++ { 0, (unsigned int)(0-1), (unsigned int)(0-1), 0, 0, htd33}, |
| 35 |
+ { 1, 2-1, 2-1, 0, 7,htd01}, |
| 36 |
+ { 2, 3-1, 3-1, 0, 17,htd02}, |
| 37 |
+ { 3, 3-1, 3-1, 0, 17,htd03}, |
| 38 |
+- { 4, 0-1, 0-1, 0, 0, htd33}, |
| 39 |
++ { 4, (unsigned int)(0-1), (unsigned int)(0-1), 0, 0, htd33}, |
| 40 |
+ { 5, 4-1, 4-1, 0, 31,htd05}, |
| 41 |
+ { 6, 4-1, 4-1, 0, 31,htd06}, |
| 42 |
+ { 7, 6-1, 6-1, 0, 71,htd07}, |
| 43 |
+@@ -564,7 +564,7 @@ |
| 44 |
+ {11, 8-1, 8-1, 0,127,htd11}, |
| 45 |
+ {12, 8-1, 8-1, 0,127,htd12}, |
| 46 |
+ {13,16-1,16-1, 0,511,htd13}, |
| 47 |
+- {14, 0-1, 0-1, 0, 0, htd33}, |
| 48 |
++ {14, (unsigned int)(0-1), (unsigned int)(0-1), 0, 0, htd33}, |
| 49 |
+ {15,16-1,16-1, 0,511,htd15}, |
| 50 |
+ {16,16-1,16-1, 1,511,htd16}, |
| 51 |
+ {17,16-1,16-1, 2,511,htd16}, |
| 52 |
|
| 53 |
diff --git a/media-sound/splay/splay-0.9.5.2-r2.ebuild b/media-sound/splay/splay-0.9.5.2-r2.ebuild |
| 54 |
index 67d31ae..f8390eb 100644 |
| 55 |
--- a/media-sound/splay/splay-0.9.5.2-r2.ebuild |
| 56 |
+++ b/media-sound/splay/splay-0.9.5.2-r2.ebuild |
| 57 |
@@ -22,6 +22,7 @@ PATCHES=( |
| 58 |
"${FILESDIR}/${P}-external-id3lib.diff" |
| 59 |
"${FILESDIR}/${P}-gcc43-2.patch" |
| 60 |
"${FILESDIR}/${P}-fix-buildsystem.patch" |
| 61 |
+ "${FILESDIR}/${P}-fix-c++14.patch" |
| 62 |
) |
| 63 |
|
| 64 |
src_prepare() { |
Archives