summaryrefslogtreecommitdiff
path: root/media-sound/splay
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
committerV3n3RiX <venerix@redcorelinux.org>2017-10-09 18:53:29 +0100
commit4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch)
treeba5f07bf3f9d22d82e54a462313f5d244036c768 /media-sound/splay
reinit the tree, so we can have metadata
Diffstat (limited to 'media-sound/splay')
-rw-r--r--media-sound/splay/Manifest9
-rw-r--r--media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff17
-rw-r--r--media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch243
-rw-r--r--media-sound/splay/files/splay-0.9.5.2-fix-c++14.patch28
-rw-r--r--media-sound/splay/files/splay-0.9.5.2-gcc43-2.patch42
-rw-r--r--media-sound/splay/metadata.xml11
-rw-r--r--media-sound/splay/splay-0.9.5.2-r2.ebuild31
7 files changed, 381 insertions, 0 deletions
diff --git a/media-sound/splay/Manifest b/media-sound/splay/Manifest
new file mode 100644
index 000000000000..e6d7b62c9628
--- /dev/null
+++ b/media-sound/splay/Manifest
@@ -0,0 +1,9 @@
+AUX splay-0.9.5.2-external-id3lib.diff 583 SHA256 93b98294d9baf6bfc12b974742e7ad0bfa9009323848e33db61f1cbf1fe90f05 SHA512 fe5db7a4a624c15dbcfff3c1b6087b33970ae09ecdc6f83348eb6da7cd3ead5df71fac6cbabe6f5b1d3389696676da390982216f53acf9450511bfd9dbfa097e WHIRLPOOL 4482db805f3fa09b05d447d66cea9be2727f752eb2039b38d41647b753f5acc956b509e14f358cf308bdf8498091652efc1ec9f39450fc2ee192613054637037
+AUX splay-0.9.5.2-fix-buildsystem.patch 6083 SHA256 692426a0cfbbb25bffacbb17f6525920bbb1c31de1db7dbdbdc31ed3aa0484b5 SHA512 135ff607f47322fc13d8d94277f24e4d844e04c9557e689e93d3bec80cb5806f631ebcb07f6b19be7724946592005359f558f0971fe62c5c3225f5c9cd274b95 WHIRLPOOL 677e3f4c878bee0396239caa733626ccc5a855f4604e8857e33df48d869a5178ddae3a5e004faa1eaedadbd31ac520dbcbc0ee067f9be8f5c4378060babc5f25
+AUX splay-0.9.5.2-fix-c++14.patch 953 SHA256 d3b2a169baab87812a8d42018cb721c964a740d93bf9e35e9dc6f5d44848c497 SHA512 150c4dbbb9f2f7dded871d245daffb25c4b3e67f6fe0db09a1f7c893dc2ef8a96eed70aefb32c4418aa83264b82d8a8504c29cb5561e0287fd448a0d398c360b WHIRLPOOL 11f1ec038dc62625e0b12df41c521300ff78dbf2d8c4acc3daf3a64d478a31d620eb4bb1ee9ecef37b51d25eac4cabac6266588b9fc38d5e82ac2734d3478cdc
+AUX splay-0.9.5.2-gcc43-2.patch 1838 SHA256 d05decb40351a2276f997160e1e0dc4d86ade71c929767d8d073303e8059efdd SHA512 41da577fd4fc7e28d99fd7dc4b340e5555cddef8965e05a2b166a776867a7ec610befe7e7231cd91fb695e438b6c9ba01b688e1030a0fe48d0636c72b6380cf2 WHIRLPOOL ed5cc1ee3153332f8272b6b798003d651e136fe99a3932b6a27a657e3f1326ccd5d48fffa222c89e4ab8a2a5e2501171a867e3cfcdf951872c14b640c33e560b
+DIST splay-0.9.5.2.tar.gz 105510 SHA256 38266b7620e8dde9ca39ace245ded4d9fadc3ea9e35772190fcfe90efe8d39bd SHA512 cab1fa2c753c0d7be58b29328db6c444872969b33b24191409efcf782201716d10b14109f23b2f2368909aa60a8a517ec894aeeb649ee0ac5811413a8ebeae09 WHIRLPOOL 335be0ac5b7ae970a4fde21e30dda5635f2bba5f4d8f9eb9543c7373bfeb69d4e99ca9722b616701ef11634419139114744e5743b67599324d794113aa3aefd7
+EBUILD splay-0.9.5.2-r2.ebuild 634 SHA256 edac55a6a1a3c946d1a701670f53d94698b83e2f0ab567783b48b63a5d46eb67 SHA512 6872f4e3c72b6af615a46b5888baf646749060811c85ad32ac6fadf2b4b305b7d77f77ef8f0d76720f08912eb79d2a82c2204ef64baf9d3d4b64c4931c3bf405 WHIRLPOOL eb0dafa0b1c3da2542d5c760c5031f7dcf27620fad36d4f3a85bd6dca22059f7d6aff9c1812c8b1137fbe9c7e60713bf7347dc0043ad897d31b1fe3b7e6ab32b
+MISC ChangeLog 4140 SHA256 4892cd16059d520be768706fddad5d81c4df96f751103c3ca70eaa1e047cc1a9 SHA512 b2b2c8f2df67aa3bc6e27e0c586f1dd53fccdc0f20480690366fb0bfbc52f6d8fc50941df8a76886ef4bb39f78411fac117a3dc9c1da90eead32980d38c4eaf4 WHIRLPOOL e3c2f581d0ed41f7b39c4ea150477017ebf0480ff10318541bbbe29dc265826d6f6a6ee0a5adac0b6e2b186fbb954e667da4b5d15cd4eac8596f8cfece65182c
+MISC ChangeLog-2015 1894 SHA256 527eddd7a5d660b0f58ed73f2fe11345503497153420371de6fd1167e892d25b SHA512 970761ac83fe917244c8b3c27a1107109f8c6b9afa46907bafc434d6dc13dbf013f8705b71fffecbc9b106882e1dadd1c3050e24eb82eb8382b169860652f6b2 WHIRLPOOL 542c71a21d46aa4d28827998c084e5618af2a445a47082db1270786f72058f4b407408bd52739bcc3e13f6a30c6a5cb1cd4f28bfd2d14b5a44734e4e761c2d04
+MISC metadata.xml 328 SHA256 e32f661e8747233c77e3721a592bd62eb167cb1a595bc1882f0ef3439652bbd0 SHA512 90224a6fed46fe48538837e0c6252b1b15f33231b9f639f6ab62e1104ebee98a540a831980920820bb4f00cb0bb5db02fddbb28c51ba68bd83613adf5782243a WHIRLPOOL 0e3bbd6e46c08f1e487e3bc729275b454622c94eadac6057b5b1f831a78533d396c15171ed72320482048ec154748a13362d52a829d294910681d2a9eaafe257
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
new file mode 100644
index 000000000000..3a5335bdbb81
--- /dev/null
+++ b/media-sound/splay/files/splay-0.9.5.2-external-id3lib.diff
@@ -0,0 +1,17 @@
+--- splay-0.9.5.2/apps/splay.cc
++++ splay-0.9.5.2/apps/splay.cc
+@@ -184,9 +184,11 @@
+ delete mytag;
+
+ }
+- catch(ID3_Error &err){
+- cout << err.GetErrorFile() << " (" << err.GetErrorLine() << "): "
+- << err.GetErrorType() << ": " << err.GetErrorDesc() << endl;
++// catch(ID3_Error &err){
++ catch(...){
++ cout << "Error found (GetError functions disabled)" << endl;
++// cout << err.GetErrorFile() << " (" << err.GetErrorLine() << "): "
++// << err.GetErrorType() << ": " << err.GetErrorDesc() << endl;
+ }
+ #endif /* HAVE_LIBID3 */
+ }
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
new file mode 100644
index 000000000000..52cea88b89ed
--- /dev/null
+++ b/media-sound/splay/files/splay-0.9.5.2-fix-buildsystem.patch
@@ -0,0 +1,243 @@
+* 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 @@
+ 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/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/files/splay-0.9.5.2-gcc43-2.patch b/media-sound/splay/files/splay-0.9.5.2-gcc43-2.patch
new file mode 100644
index 000000000000..d07090743b5a
--- /dev/null
+++ b/media-sound/splay/files/splay-0.9.5.2-gcc43-2.patch
@@ -0,0 +1,42 @@
+diff -Nurpa splay-0.9.5.2.orig/apps/splay.cc splay-0.9.5.2/apps/splay.cc
+--- splay-0.9.5.2.orig/apps/splay.cc 2008-12-17 03:37:47.000000000 +0300
++++ splay-0.9.5.2/apps/splay.cc 2008-12-17 03:39:34.000000000 +0300
+@@ -150,16 +150,16 @@ ostream& operator<<(ostream& s, const ID
+ // Print just what we want...
+ s.setf(ios::left); // The filled fields get the text to the left
+ s <<
+- "Title : " << nn(ID3_GetTitle(tag)) << endl;
++ "Title : " << nn(ID3_GetTitle(tag)) << std::endl;
+ s <<
+- "Artist: " << setw(30) << nn(ID3_GetArtist(tag)) <<
++ "Artist: " << std::setw(30) << nn(ID3_GetArtist(tag)) <<
+ "Album: " << nn(ID3_GetAlbum(tag)) <<
+- endl ;
++ std::endl ;
+
+ s <<
+- "Genre : " << setw(18) << nn(ID3_gen_list[ID3_GetGenreNum(tag)]) <<
+- "Track: " << setw(5) << ID3_GetTrackNum(tag) <<
+- "Year: " << setw(6) << nn(ID3_GetYear(tag));
++ "Genre : " << std::setw(18) << nn(ID3_gen_list[ID3_GetGenreNum(tag)]) <<
++ "Track: " << std::setw(5) << ID3_GetTrackNum(tag) <<
++ "Year: " << std::setw(6) << nn(ID3_GetYear(tag));
+ // if ( ID3_GetComment(tag) ){
+ // s << endl << "Comment:" << nn(ID3_GetComment(tag)) <<
+ // nn(ID3_GetLyricist(tag)) << nn(ID3_GetLyrics(tag));
+@@ -180,13 +180,13 @@ static void play(char *filename)
+ try {
+ const ID3_Tag* mytag = new ID3_Tag(filename);
+ if ( mytag->HasV1Tag() || mytag->HasV2Tag() )
+- cout << mytag << endl;
++ std::cout << mytag << std::endl;
+ delete mytag;
+
+ }
+ // catch(ID3_Error &err){
+ catch(...){
+- cout << "Error found (GetError functions disabled)" << endl;
++ std::cout << "Error found (GetError functions disabled)" << std::endl;
+ // cout << err.GetErrorFile() << " (" << err.GetErrorLine() << "): "
+ // << err.GetErrorType() << ": " << err.GetErrorDesc() << endl;
+ }
diff --git a/media-sound/splay/metadata.xml b/media-sound/splay/metadata.xml
new file mode 100644
index 000000000000..0de8cce1131e
--- /dev/null
+++ b/media-sound/splay/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="project">
+ <email>sound@gentoo.org</email>
+ <name>Gentoo Sound project</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="sourceforge">splay</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/media-sound/splay/splay-0.9.5.2-r2.ebuild b/media-sound/splay/splay-0.9.5.2-r2.ebuild
new file mode 100644
index 000000000000..2878aaf04bc3
--- /dev/null
+++ b/media-sound/splay/splay-0.9.5.2-r2.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+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=""
+
+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"
+)
+
+src_prepare() {
+ mv configure.{in,ac} || die
+ default
+ eautoreconf
+}