* [gentoo-commits] repo/gentoo:master commit in: media-sound/splay/, media-sound/splay/files/
@ 2016-01-23 16:29 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2016-01-23 16:29 UTC (permalink / raw
To: gentoo-commits
commit: ea17159739c98e2365d1ce3ad0d669d3dae6fdb7
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 23 16:29:00 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Jan 23 16:29:40 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ea171597
media-sound/splay: Remove use of 'einstall', EAPI=6
Gentoo-Bug: 521566
Package-Manager: portage-2.2.27
.../splay/files/splay-0.9.5.2-external-id3lib.diff | 4 +-
.../splay/files/splay-0.9.5.2-modernize-cpp.patch | 211 +++++++++++++++++++++
media-sound/splay/splay-0.9.5.2-r1.ebuild | 28 +++
3 files changed, 241 insertions(+), 2 deletions(-)
diff --git a/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff b/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff
index 6039018..3a5335b 100644
--- a/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff
+++ b/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff
@@ -1,5 +1,5 @@
---- splay.cc~ 2005-04-03 19:56:37.000000000 -0300
-+++ splay.cc 2005-04-03 19:58:24.000000000 -0300
+--- splay-0.9.5.2/apps/splay.cc
++++ splay-0.9.5.2/apps/splay.cc
@@ -184,9 +184,11 @@
delete mytag;
diff --git a/media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch b/media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch
new file mode 100644
index 0000000..286228a
--- /dev/null
+++ b/media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch
@@ -0,0 +1,211 @@
+--- splay-0.9.5.2/apps/common.cc
++++ splay-0.9.5.2/apps/common.cc
+@@ -34,7 +34,7 @@
+ int splay_threadnum=50;
+ #endif
+
+-char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]=
++const char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]=
+ { "Failed to open sound device.",
+ "Sound device is busy.",
+ "Buffersize of sound device is wrong.",
+--- splay-0.9.5.2/apps/splay.cc
++++ splay-0.9.5.2/apps/splay.cc
+@@ -16,20 +16,23 @@
+
+ #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>
++
++using std::cout;
++using std::endl;
+
+ #include "mpegsound.h"
+
+ #include "splay.h"
+
+-static char *help=
++static const char *help=
+ "\t-2 : playing with half frequency.\n"
+ "\t-e : exit when playing is done. (only XSPLAY)\n"
+ "\t-f : display frame and time info (played and remaining).\n"
+--- splay-0.9.5.2/apps/splay.h
++++ splay-0.9.5.2/apps/splay.h
+@@ -20,7 +20,7 @@
+ splay_forcetomonoflag,
+ splay_frameinfo;
+
+-extern char *splay_Sounderrors[];
++extern const char *splay_Sounderrors[];
+
+ #ifdef PTHREADEDMPEG
+ extern int splay_threadnum;
+--- splay-0.9.5.2/apps/xsplay.cc
++++ splay-0.9.5.2/apps/xsplay.cc
+@@ -29,8 +29,8 @@
+ #include <fcntl.h>
+ #include <string.h>
+ #include <unistd.h>
+-#include <iostream.h>
+-#include <iomanip.h>
++#include <iostream>
++#include <iomanip>
+
+ #include "mpegsound.h"
+ #include "xsplay.h"
+--- splay-0.9.5.2/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>
+@@ -18,6 +18,10 @@
+
+ #include "mpegsound.h"
+
++using std::cout;
++using std::cerr;
++using std::endl;
++
+ // File player superclass
+ Fileplayer::Fileplayer()
+ {
+@@ -43,7 +47,7 @@
+ if(server)delete server;
+ }
+
+-bool Mpegfileplayer::openfile(char *filename,char *device)
++bool Mpegfileplayer::openfile(char *filename, const char *device)
+ {
+ // Player
+ if(device==NULL){
+@@ -188,7 +192,7 @@
+
+ void Mpegfileplayer::showverbose(int )
+ {
+- static char *modestring[4]={"stereo","joint stereo","dual channel","mono"};
++ static const char *modestring[4]={"stereo","joint stereo","dual channel","mono"};
+
+ fprintf(stderr,"\tMPEG-%d Layer %d, %s,\n\t%dHz%s, %dkbit/s, ",
+ server->getversion()+1,
+--- splay-0.9.5.2/libs/mpegsound.h
++++ splay-0.9.5.2/libs/mpegsound.h
+@@ -230,7 +230,7 @@
+ Soundplayer() {__errorcode=SOUND_ERROR_OK;};
+ virtual ~Soundplayer();
+
+- virtual bool initialize(char *filename) =0;
++ virtual bool initialize(const char *filename) =0;
+ virtual void abort(void);
+ virtual int getprocessed(void);
+
+@@ -255,7 +255,7 @@
+ public:
+ ~Rawtofile();
+
+- bool initialize(char *filename);
++ bool initialize(const char *filename);
+ bool setsoundtype(int stereo,int samplesize,int speed);
+ bool putblock(void *buffer,int size);
+
+@@ -270,7 +270,7 @@
+ public:
+ ~Rawplayer();
+
+- bool initialize(char *filename);
++ bool initialize(const char *filename);
+ void abort(void);
+ int getprocessed(void);
+
+@@ -284,7 +284,7 @@
+ void setquota(int q){quota=q;};
+ int getquota(void) {return quota;};
+
+- static char *defaultdevice;
++ static const char *defaultdevice;
+ static int setvolume(int volume);
+
+ private:
+@@ -573,7 +573,7 @@
+
+ int geterrorcode(void) {return __errorcode;};
+
+- virtual bool openfile(char *filename,char *device)=0;
++ virtual bool openfile(char *filename, const char *device)=0;
+ virtual void setforcetomono(bool flag) =0;
+ virtual bool playing(int verbose,bool frameinfo, int startframe) =0;
+
+@@ -593,7 +593,7 @@
+ Mpegfileplayer();
+ ~Mpegfileplayer();
+
+- bool openfile(char *filename,char *device);
++ bool openfile(char *filename, const char *device);
+ void setforcetomono(bool flag);
+ void setdownfrequency(int value);
+ bool playing(int verbose, bool frameinfo, int startframe);
+--- splay-0.9.5.2/libs/mpegtoraw.cc
++++ splay-0.9.5.2/libs/mpegtoraw.cc
+@@ -552,7 +552,7 @@
+ #endif
+
+
+-#include <iostream.h>
++#include <iostream>
+ // Convert mpeg to raw
+ bool Mpegtoraw::run(int frames)
+ {
+--- splay-0.9.5.2/libs/rawplayer.cc
++++ splay-0.9.5.2/libs/rawplayer.cc
+@@ -24,7 +24,7 @@
+ #define IOCTL(a,b,c) (c = ioctl(a,b,c) )
+ #endif
+
+-char *Rawplayer::defaultdevice="/dev/dsp";
++const char *Rawplayer::defaultdevice="/dev/dsp";
+
+ /* Volume */
+ int Rawplayer::setvolume(int volume)
+@@ -57,7 +57,7 @@
+ close(audiohandle);
+ }
+
+-bool Rawplayer::initialize(char *filename)
++bool Rawplayer::initialize(const char *filename)
+ {
+ int flag;
+
+@@ -172,7 +172,7 @@
+
+ if(quota)
+ while(getprocessed()>quota)usleep(3);
+- write(audiohandle,buffer,modifiedsize);
++ if(write(audiohandle,buffer,modifiedsize)) {}
+
+ return true;
+ }
+--- splay-0.9.5.2/libs/rawtofile.cc
++++ splay-0.9.5.2/libs/rawtofile.cc
+@@ -20,7 +20,7 @@
+ close(filehandle);
+ }
+
+-bool Rawtofile::initialize(char *filename)
++bool Rawtofile::initialize(const char *filename)
+ {
+ if(filename==NULL)filehandle=1;
+ else if((filehandle=creat(filename,0644))==-1)
diff --git a/media-sound/splay/splay-0.9.5.2-r1.ebuild b/media-sound/splay/splay-0.9.5.2-r1.ebuild
new file mode 100644
index 0000000..7113106
--- /dev/null
+++ b/media-sound/splay/splay-0.9.5.2-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit autotools
+
+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"
+IUSE=""
+
+PATCHES=(
+ "${FILESDIR}/${P}-external-id3lib.diff"
+ "${FILESDIR}/${P}-gcc43-2.patch"
+ "${FILESDIR}/${P}-modernize-cpp.patch"
+)
+
+src_prepare() {
+ mv configure.{in,ac} || die
+ default
+ eautoreconf
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/splay/, media-sound/splay/files/
@ 2016-02-10 22:31 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2016-02-10 22:31 UTC (permalink / raw
To: gentoo-commits
commit: 2f2ed7ed16205a11433816b85e8313b20001193f
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 10 22:27:19 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Wed Feb 10 22:31:34 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f2ed7ed
media-sound/splay: Patch out completely broken Qt3 handling
Gentoo-Bug: 574202
* Add missing media-libs/id3lib dependency
* Remove xsplay.1 man page
Package-Manager: portage-2.2.27
...p.patch => splay-0.9.5.2-fix-buildsystem.patch} | 32 ++++++++++++++++++++++
...y-0.9.5.2-r1.ebuild => splay-0.9.5.2-r2.ebuild} | 5 +++-
2 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch b/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch
similarity index 85%
rename from media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch
rename to media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch
index 286228a..52cea88 100644
--- a/media-sound/splay/files/splay-0.9.5.2-modernize-cpp.patch
+++ b/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch
@@ -1,3 +1,35 @@
+* Remove completely broken Qt handling, dating back to Qt3 days
+* Fix ancient C++ includes using '.h' suffixes
+* Fix warnings caused by not using 'const char*'
+
+--- splay-0.9.5.2/apps/Makefile.am
++++ splay-0.9.5.2/apps/Makefile.am
+@@ -1,4 +1,4 @@
+-bin_PROGRAMS = splay @XSPLAY@
++bin_PROGRAMS = splay
+ EXTRA_PROGRAMS =xsplay
+ splay_SOURCES = common.cc splay.cc splay.h
+ xsplay_SOURCES = xsplay.cc functions.cc \
+@@ -17,7 +17,7 @@
+ INCLUDES = -I../libs -I/usr/include/qt
+ xsplay_LDADD=-lqt $(LDADD)
+
+-man_MANS = splay.1 xsplay.1
++man_MANS = splay.1
+ EXTRA_DIST = $(man_MANS)
+
+
+--- splay-0.9.5.2/configure.ac
++++ splay-0.9.5.2/configure.ac
+@@ -15,7 +15,7 @@
+ AC_CHECK_LIB(id3, ID3Tag_New)
+ AC_CHECK_LIB(m, cos)
+ AC_CHECK_LIB(pthread,main,INCLUDEPTHREAD=1)
+-AC_CHECK_LIB(qt, main,XSPLAY=xsplay)
++
+
+ if test "$INCLUDEPTHREAD" = 1; then
+ LIBS="$LIBS -lpthread"
--- splay-0.9.5.2/apps/common.cc
+++ splay-0.9.5.2/apps/common.cc
@@ -34,7 +34,7 @@
diff --git a/media-sound/splay/splay-0.9.5.2-r1.ebuild b/media-sound/splay/splay-0.9.5.2-r2.ebuild
similarity index 85%
rename from media-sound/splay/splay-0.9.5.2-r1.ebuild
rename to media-sound/splay/splay-0.9.5.2-r2.ebuild
index 7113106..67d31ae 100644
--- a/media-sound/splay/splay-0.9.5.2-r1.ebuild
+++ b/media-sound/splay/splay-0.9.5.2-r2.ebuild
@@ -15,10 +15,13 @@ SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
+DEPEND="media-libs/id3lib"
+RDEPEND="${DEPEND}"
+
PATCHES=(
"${FILESDIR}/${P}-external-id3lib.diff"
"${FILESDIR}/${P}-gcc43-2.patch"
- "${FILESDIR}/${P}-modernize-cpp.patch"
+ "${FILESDIR}/${P}-fix-buildsystem.patch"
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/splay/, media-sound/splay/files/
@ 2020-06-21 13:21 David Seifert
0 siblings, 0 replies; 3+ messages in thread
From: David Seifert @ 2020-06-21 13:21 UTC (permalink / raw
To: gentoo-commits
commit: 5359c413d9b80966f04004aadca06c2e498923ea
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 13:19:41 2020 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 13:19:41 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5359c413
media-sound/splay: [QA] Add AM_PROG_AR
Closes: https://bugs.gentoo.org/724758
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/splay-0.9.5.2-fix-buildsystem.patch | 85 ++++++++++++----------
media-sound/splay/splay-0.9.5.2-r2.ebuild | 15 ++--
2 files changed, 52 insertions(+), 48 deletions(-)
diff --git a/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch b/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch
index 52cea88b89e..07d6f2d3751 100644
--- a/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch
+++ b/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch
@@ -2,8 +2,19 @@
* Fix ancient C++ includes using '.h' suffixes
* Fix warnings caused by not using 'const char*'
---- splay-0.9.5.2/apps/Makefile.am
-+++ splay-0.9.5.2/apps/Makefile.am
+--- a/apps/common.cc
++++ b/apps/common.cc
+@@ -34,7 +34,7 @@
+ int splay_threadnum=50;
+ #endif
+
+-char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]=
++const char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]=
+ { "Failed to open sound device.",
+ "Sound device is busy.",
+ "Buffersize of sound device is wrong.",
+--- a/apps/Makefile.am
++++ b/apps/Makefile.am
@@ -1,4 +1,4 @@
-bin_PROGRAMS = splay @XSPLAY@
+bin_PROGRAMS = splay
@@ -19,30 +30,8 @@
EXTRA_DIST = $(man_MANS)
---- splay-0.9.5.2/configure.ac
-+++ splay-0.9.5.2/configure.ac
-@@ -15,7 +15,7 @@
- AC_CHECK_LIB(id3, ID3Tag_New)
- AC_CHECK_LIB(m, cos)
- AC_CHECK_LIB(pthread,main,INCLUDEPTHREAD=1)
--AC_CHECK_LIB(qt, main,XSPLAY=xsplay)
-+
-
- if test "$INCLUDEPTHREAD" = 1; then
- LIBS="$LIBS -lpthread"
---- splay-0.9.5.2/apps/common.cc
-+++ splay-0.9.5.2/apps/common.cc
-@@ -34,7 +34,7 @@
- int splay_threadnum=50;
- #endif
-
--char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]=
-+const char *splay_Sounderrors[SOUND_ERROR_UNKNOWN]=
- { "Failed to open sound device.",
- "Sound device is busy.",
- "Buffersize of sound device is wrong.",
---- splay-0.9.5.2/apps/splay.cc
-+++ splay-0.9.5.2/apps/splay.cc
+--- a/apps/splay.cc
++++ b/apps/splay.cc
@@ -16,20 +16,23 @@
#include <sys/types.h>
@@ -70,8 +59,8 @@
"\t-2 : playing with half frequency.\n"
"\t-e : exit when playing is done. (only XSPLAY)\n"
"\t-f : display frame and time info (played and remaining).\n"
---- splay-0.9.5.2/apps/splay.h
-+++ splay-0.9.5.2/apps/splay.h
+--- a/apps/splay.h
++++ b/apps/splay.h
@@ -20,7 +20,7 @@
splay_forcetomonoflag,
splay_frameinfo;
@@ -81,8 +70,8 @@
#ifdef PTHREADEDMPEG
extern int splay_threadnum;
---- splay-0.9.5.2/apps/xsplay.cc
-+++ splay-0.9.5.2/apps/xsplay.cc
+--- a/apps/xsplay.cc
++++ b/apps/xsplay.cc
@@ -29,8 +29,8 @@
#include <fcntl.h>
#include <string.h>
@@ -94,8 +83,24 @@
#include "mpegsound.h"
#include "xsplay.h"
---- splay-0.9.5.2/libs/fileplayer.cc
-+++ splay-0.9.5.2/libs/fileplayer.cc
+--- a/configure.in
++++ b/configure.in
+@@ -10,12 +10,12 @@
+ AC_PROG_INSTALL
+ AC_PROG_LN_S
+ AC_PROG_RANLIB
++AM_PROG_AR
+
+ dnl Checks for libraries.
+ AC_CHECK_LIB(id3, ID3Tag_New)
+ AC_CHECK_LIB(m, cos)
+ AC_CHECK_LIB(pthread,main,INCLUDEPTHREAD=1)
+-AC_CHECK_LIB(qt, main,XSPLAY=xsplay)
+
+ if test "$INCLUDEPTHREAD" = 1; then
+ LIBS="$LIBS -lpthread"
+--- a/libs/fileplayer.cc
++++ b/libs/fileplayer.cc
@@ -10,7 +10,7 @@
#endif
@@ -134,8 +139,8 @@
fprintf(stderr,"\tMPEG-%d Layer %d, %s,\n\t%dHz%s, %dkbit/s, ",
server->getversion()+1,
---- splay-0.9.5.2/libs/mpegsound.h
-+++ splay-0.9.5.2/libs/mpegsound.h
+--- a/libs/mpegsound.h
++++ b/libs/mpegsound.h
@@ -230,7 +230,7 @@
Soundplayer() {__errorcode=SOUND_ERROR_OK;};
virtual ~Soundplayer();
@@ -190,8 +195,8 @@
void setforcetomono(bool flag);
void setdownfrequency(int value);
bool playing(int verbose, bool frameinfo, int startframe);
---- splay-0.9.5.2/libs/mpegtoraw.cc
-+++ splay-0.9.5.2/libs/mpegtoraw.cc
+--- a/libs/mpegtoraw.cc
++++ b/libs/mpegtoraw.cc
@@ -552,7 +552,7 @@
#endif
@@ -201,8 +206,8 @@
// Convert mpeg to raw
bool Mpegtoraw::run(int frames)
{
---- splay-0.9.5.2/libs/rawplayer.cc
-+++ splay-0.9.5.2/libs/rawplayer.cc
+--- a/libs/rawplayer.cc
++++ b/libs/rawplayer.cc
@@ -24,7 +24,7 @@
#define IOCTL(a,b,c) (c = ioctl(a,b,c) )
#endif
@@ -230,8 +235,8 @@
return true;
}
---- splay-0.9.5.2/libs/rawtofile.cc
-+++ splay-0.9.5.2/libs/rawtofile.cc
+--- a/libs/rawtofile.cc
++++ b/libs/rawtofile.cc
@@ -20,7 +20,7 @@
close(filehandle);
}
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 2878aaf04bc..b66657bceeb 100644
--- a/media-sound/splay/splay-0.9.5.2-r2.ebuild
+++ b/media-sound/splay/splay-0.9.5.2-r2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit autotools
@@ -12,20 +12,19 @@ SRC_URI="http://splay.sourceforge.net/tgz/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
DEPEND="media-libs/id3lib"
RDEPEND="${DEPEND}"
PATCHES=(
- "${FILESDIR}/${P}-external-id3lib.diff"
- "${FILESDIR}/${P}-gcc43-2.patch"
- "${FILESDIR}/${P}-fix-buildsystem.patch"
- "${FILESDIR}/${P}-fix-c++14.patch"
+ "${FILESDIR}"/${P}-external-id3lib.diff
+ "${FILESDIR}"/${P}-gcc43-2.patch
+ "${FILESDIR}"/${P}-fix-buildsystem.patch
+ "${FILESDIR}"/${P}-fix-c++14.patch
)
src_prepare() {
- mv configure.{in,ac} || die
default
+ mv configure.{in,ac} || die
eautoreconf
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-21 13:21 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-21 13:21 [gentoo-commits] repo/gentoo:master commit in: media-sound/splay/, media-sound/splay/files/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2016-02-10 22:31 David Seifert
2016-01-23 16:29 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox