From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-904539-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 9DCAB138331
for <garchives@archives.gentoo.org>; Sun, 2 Oct 2016 16:46:05 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 7B4B0E0BCF;
Sun, 2 Oct 2016 16:46:03 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 5BAF3E0BD2
for <gentoo-commits@lists.gentoo.org>; Sun, 2 Oct 2016 16:46:03 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id BFD1C340D1B
for <gentoo-commits@lists.gentoo.org>; Sun, 2 Oct 2016 16:46:01 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 0389624A3
for <gentoo-commits@lists.gentoo.org>; Sun, 2 Oct 2016 16:46:00 +0000 (UTC)
From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" <soap@gentoo.org>
Message-ID: <1475426747.f82fb9223e807b3e8c9b4bf8aa36b468fbb80ec3.soap@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/splay/files/, media-sound/splay/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-sound/splay/files/splay-0.9.5.2-fix-c++14.patch media-sound/splay/splay-0.9.5.2-r2.ebuild
X-VCS-Directories: media-sound/splay/ media-sound/splay/files/
X-VCS-Committer: soap
X-VCS-Committer-Name: David Seifert
X-VCS-Revision: f82fb9223e807b3e8c9b4bf8aa36b468fbb80ec3
X-VCS-Branch: master
Date: Sun, 2 Oct 2016 16:46:00 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: b84b59d7-654e-49d2-bd4e-26cc755ab89a
X-Archives-Hash: 0b567425fe0cb59ef84a6fc233eca60c
commit: f82fb9223e807b3e8c9b4bf8aa36b468fbb80ec3
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 16:07:21 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 16:45:47 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f82fb922
media-sound/splay: Allow for compiling with GCC 6
Gentoo-bug: 594684
Package-Manager: portage-2.3.1
.../splay/files/splay-0.9.5.2-fix-c++14.patch | 28 ++++++++++++++++++++++
media-sound/splay/splay-0.9.5.2-r2.ebuild | 1 +
2 files changed, 29 insertions(+)
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 00000000..328463a
--- /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 67d31ae..f8390eb 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() {