* [gentoo-commits] repo/gentoo:master commit in: media-sound/splay/files/, media-sound/splay/
@ 2016-10-02 16:46 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2016-10-02 16:46 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/splay/files/, media-sound/splay/
@ 2016-10-02 16:46 David Seifert
0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2016-10-02 16:46 UTC (permalink / raw
To: gentoo-commits
commit: f906491ebc946b144901f0db324801657b0e5ed8
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 2 16:42:57 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Oct 2 16:45:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f906491e
media-sound/splay: Remove old ebuild
Package-Manager: portage-2.3.1
media-sound/splay/files/splay-0.9.5.2-gcc43.patch | 113 ----------------------
media-sound/splay/splay-0.9.5.2.ebuild | 37 -------
2 files changed, 150 deletions(-)
diff --git a/media-sound/splay/files/splay-0.9.5.2-gcc43.patch b/media-sound/splay/files/splay-0.9.5.2-gcc43.patch
deleted file mode 100644
index 70b9113..00000000
--- a/media-sound/splay/files/splay-0.9.5.2-gcc43.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-Index: splay-0.9.5.2/apps/splay.cc
-===================================================================
---- splay-0.9.5.2.orig/apps/splay.cc
-+++ splay-0.9.5.2/apps/splay.cc
-@@ -16,14 +16,14 @@
-
- #include <sys/types.h>
- #include <sys/wait.h>
--#include <iostream.h>
-+#include <iostream>
-
- #ifdef HAVE_LIBID3
- #include <id3/tag.h>
- #include <id3/misc_support.h>
- #endif /* HAVE_LIBID3 */
-
--#include <iomanip.h>
-+#include <iomanip>
-
- #include "mpegsound.h"
-
-@@ -172,7 +172,7 @@ ostream& operator<<(ostream& s, const ID
- static void play(char *filename)
- {
- if( splay_verbose-- )
-- cout << filename << ":" << endl;
-+ std::cout << filename << ":" << std::endl;
- if( splay_verbose>0 )
- {
- // cerr << getpid() << endl;
-Index: splay-0.9.5.2/libs/fileplayer.cc
-===================================================================
---- splay-0.9.5.2.orig/libs/fileplayer.cc
-+++ splay-0.9.5.2/libs/fileplayer.cc
-@@ -10,7 +10,7 @@
- #endif
-
- #include <string.h>
--#include <iostream.h>
-+#include <iostream>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-@@ -55,7 +55,7 @@ bool Mpegfileplayer::openfile(char *file
- fd=open(device, O_WRONLY|O_NDELAY);
- }
- if ( fd == -1 ) {
-- cerr << "Cannot open /dev/dsp or /dev/sound/dsp!" << endl;
-+ std::cerr << "Cannot open /dev/dsp or /dev/sound/dsp!" << std::endl;
- return seterrorcode(SOUND_ERROR_DEVOPENFAIL);
- }
- close(fd);
-@@ -121,8 +121,8 @@ bool Mpegfileplayer::playing(int verbose
- int totframes=server->gettotalframe();
- double tottime=1.0*totframes*pcmperframe/frequency;
- if(frameinfo) {
-- cout << "Totalframes " << totframes;
-- cout << "; Totaltime " << tominsec(tottime) << endl;
-+ std::cout << "Totalframes " << totframes;
-+ std::cout << "; Totaltime " << tominsec(tottime) << std::endl;
- }
-
- // Playing
-@@ -132,9 +132,9 @@ bool Mpegfileplayer::playing(int verbose
- if(frameinfo) {
- int currframe=server-> getcurrentframe();
- double currtime=1.0*currframe*pcmperframe/frequency;
-- cout << "Frame " << currframe << " [" << totframes-currframe << "]; ";
-- cout << "Time " << tominsec(currtime) << " [" ;
-- cout << tominsec(tottime-currtime) << "]" << endl ;
-+ std::cout << "Frame " << currframe << " [" << totframes-currframe << "]; ";
-+ std::cout << "Time " << tominsec(currtime) << " [" ;
-+ std::cout << tominsec(tottime-currtime) << "]" << std::endl ;
- }
- }
-
-@@ -161,8 +161,8 @@ bool Mpegfileplayer::playingwiththread(i
- int totframes=server->gettotalframe();
- double tottime=1.0*totframes*pcmperframe/frequency;
- if(frameinfo) {
-- cout << "Totalframes " << totframes;
-- cout << "; Totaltime " << tominsec(tottime) << endl;
-+ std::cout << "Totalframes " << totframes;
-+ std::cout << "; Totaltime " << tominsec(tottime) << std::endl;
- }
-
- // Playing
-@@ -172,9 +172,9 @@ bool Mpegfileplayer::playingwiththread(i
- if(frameinfo) {
- int currframe=server-> getcurrentframe();
- double currtime=1.0*currframe*pcmperframe/frequency;
-- cout << "Frame " << currframe << " [" << totframes-currframe << "]; ";
-- cout << "Time " << tominsec(currtime) << " [" ;
-- cout << tominsec(tottime-currtime) << "]" << endl ;
-+ std::cout << "Frame " << currframe << " [" << totframes-currframe << "]; ";
-+ std::cout << "Time " << tominsec(currtime) << " [" ;
-+ std::cout << tominsec(tottime-currtime) << "]" << std::endl ;
- }
- }
-
-Index: splay-0.9.5.2/libs/mpegtoraw.cc
-===================================================================
---- splay-0.9.5.2.orig/libs/mpegtoraw.cc
-+++ splay-0.9.5.2/libs/mpegtoraw.cc
-@@ -552,7 +552,7 @@ int Mpegtoraw::getframesaved(void)
- #endif
-
-
--#include <iostream.h>
-+#include <iostream>
- // Convert mpeg to raw
- bool Mpegtoraw::run(int frames)
- {
diff --git a/media-sound/splay/splay-0.9.5.2.ebuild b/media-sound/splay/splay-0.9.5.2.ebuild
deleted file mode 100644
index 23eed98..00000000
--- a/media-sound/splay/splay-0.9.5.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-inherit eutils
-
-IUSE=""
-
-DESCRIPTION="an audio player, primarily for the console"
-HOMEPAGE="http://splay.sourceforge.net/"
-SRC_URI="http://splay.sourceforge.net/tgz/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-
-src_unpack() {
- unpack ${A}
- epatch "${FILESDIR}/${P}-gcc43.patch"
- cd "${S}/apps"
- epatch "${FILESDIR}/${P}-external-id3lib.diff"
- epatch "${FILESDIR}/${P}-gcc43-2.patch"
-}
-
-src_compile() {
- # Force compilation to omit X support according to BUG #5856
- # even when qt is present on the system.
- export ac_cv_lib_qt_main=no
- econf || die "econf failed"
- emake || die "emake failed"
-}
-
-src_install() {
- # Specify man-page to prevent xsplay.1 from being installed
- einstall man_MANS=splay.1 || die "einstall failed"
- dodoc AUTHORS ChangeLog README README.LIB NEWS
-}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-10-02 16:46 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-10-02 16:46 [gentoo-commits] repo/gentoo:master commit in: media-sound/splay/files/, media-sound/splay/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2016-10-02 16:46 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox