Index: Makefile
===================================================================
RCS file: /cvs/ports/audio/mp3blaster/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile 26 Apr 2017 14:58:38 -0000 1.20
+++ Makefile 5 Jun 2017 22:56:46 -0000
@@ -2,12 +2,12 @@
COMMENT= text console audio player with an interactive interface
-DISTNAME= mp3blaster-3.2.5
-REVISION= 2
+DISTNAME= mp3blaster-3.2.6
CATEGORIES= audio
HOMEPAGE= http://mp3blaster.sourceforge.net/
+MAINTAINER= Brian Callahan <bcallah@devio.us>
-# GPLv2
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= c m ncurses ogg pthread sidplay sndio ${LIBCXX} vorbis vorbisfile
Index: distinfo
===================================================================
RCS file: /cvs/ports/audio/mp3blaster/distinfo,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 distinfo
--- distinfo 18 Jan 2015 03:12:44 -0000 1.9
+++ distinfo 5 Jun 2017 22:56:46 -0000
@@ -1,2 +1,2 @@
-SHA256 (mp3blaster-3.2.5.tar.gz) = EpEVdCx3NizDUI63eCcCz7RK8kY6VFPo0Z6mirzO3Ck=
-SIZE (mp3blaster-3.2.5.tar.gz) = 329407
+SHA256 (mp3blaster-3.2.6.tar.gz) = Q9n2VjZ9FqqsFj+T3DI+mEPD3VZUAVZ+3vPh5yueHuA=
+SIZE (mp3blaster-3.2.6.tar.gz) = 354019
Index: patches/patch-mp3blaster_1
===================================================================
RCS file: /cvs/ports/audio/mp3blaster/patches/patch-mp3blaster_1,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-mp3blaster_1
--- patches/patch-mp3blaster_1 18 Feb 2015 16:15:37 -0000 1.1
+++ patches/patch-mp3blaster_1 5 Jun 2017 22:56:46 -0000
@@ -1,13 +1,14 @@
$OpenBSD: patch-mp3blaster_1,v 1.1 2015/02/18 16:15:37 naddy Exp $
---- mp3blaster.1.orig Sat Jan 24 16:25:12 2009
-+++ mp3blaster.1 Wed Feb 18 17:12:45 2015
+Index: mp3blaster.1
+--- mp3blaster.1.orig
++++ mp3blaster.1
@@ -281,8 +281,8 @@ Some keywords can have multiple values, in that case i
.TP
\fBKeyword\fR = \fBValue1\fR, \fBValue2\fR
.PP
--Escape comma's in a value with a backslash (\,). If you want a litteral
+-Escape comma's in a value with a backslash (\,). If you want a literal
-backslash, escape it with another backslash (\\). Keywords are case-sensitive.
-+Escape commas in a value with a backslash (\e,). If you want a litteral
++Escape commas in a value with a backslash (\e,). If you want a literal
+backslash, escape it with another backslash (\e\e). Keywords are case-sensitive.
.PP
There are a few types of values: numbers, booleans, keybindings, colours,
Index: patches/patch-mpegsound_mpegsound_h
===================================================================
RCS file: /cvs/ports/audio/mp3blaster/patches/patch-mpegsound_mpegsound_h,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-mpegsound_mpegsound_h
--- patches/patch-mpegsound_mpegsound_h 11 Jan 2010 07:51:26 -0000 1.1
+++ patches/patch-mpegsound_mpegsound_h 5 Jun 2017 22:56:46 -0000
@@ -1,7 +1,8 @@
$OpenBSD: patch-mpegsound_mpegsound_h,v 1.1 2010/01/11 07:51:26 jakemsr Exp $
---- mpegsound/mpegsound.h.orig Sat Jan 24 07:25:11 2009
-+++ mpegsound/mpegsound.h Sun Dec 27 16:39:14 2009
-@@ -433,6 +433,36 @@ class Rawplayer : public Soundplayer (private)
+Index: mpegsound/mpegsound.h
+--- mpegsound/mpegsound.h.orig
++++ mpegsound/mpegsound.h
+@@ -430,6 +430,36 @@ class Rawplayer : public Soundplayer (private)
#endif /* WANT_OSS */
@@ -38,7 +39,7 @@ $OpenBSD: patch-mpegsound_mpegsound_h,v
#ifdef WANT_ESD
// Class for playing raw data via Enlightened Sound Daemon
class EsdPlayer : public Soundplayer
-@@ -957,7 +987,7 @@ class Fileplayer
+@@ -954,7 +984,7 @@ class Fileplayer
{
public:
enum audiodriver_t {
Index: patches/patch-mpegsound_oggplayer_cc
===================================================================
RCS file: /cvs/ports/audio/mp3blaster/patches/patch-mpegsound_oggplayer_cc,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-mpegsound_oggplayer_cc
--- patches/patch-mpegsound_oggplayer_cc 11 Jan 2010 07:51:26 -0000 1.2
+++ patches/patch-mpegsound_oggplayer_cc 5 Jun 2017 22:56:46 -0000
@@ -3,30 +3,19 @@ $OpenBSD: patch-mpegsound_oggplayer_cc,v
ov_read() can return less than asked for. get the full 4096 bytes
before continuing to save cycles and avoid confusion elsewhere.
---- mpegsound/oggplayer.cc.orig Tue Dec 22 05:08:01 2009
-+++ mpegsound/oggplayer.cc Thu Dec 24 14:20:44 2009
-@@ -18,7 +18,11 @@ Oggplayer::Oggplayer(audiodriver_t driver)
- {
- of = NULL;
- wordsize = 2; //2 bytes
-+#ifdef WORDS_BIGENDIAN
-+ bigendian = 1;
-+#else
- bigendian = 0;
-+#endif
- signeddata = 1;
- mono = 0;
- downfreq = 0;
-@@ -156,15 +160,23 @@ bool Oggplayer::playing()
+Index: mpegsound/oggplayer.cc
+--- mpegsound/oggplayer.cc.orig
++++ mpegsound/oggplayer.cc
+@@ -160,15 +160,22 @@ bool Oggplayer::playing()
bool Oggplayer::run(int sec)
{
int bitstream;
- long bytes_read = ov_read(of, soundbuf, 4096, bigendian, wordsize, signeddata,
- &bitstream);
-
-- if (sec); //prevent warning
+ long bytes_read, ret;
+- if (sec); //prevent warning
+-
- if (bytes_read < 0)
- return seterrorcode(SOUND_ERROR_BAD);
+ bytes_read = 0;
@@ -43,6 +32,6 @@ before continuing to save cycles and avo
return seterrorcode(SOUND_ERROR_FINISH);
+
+ if (sec); //prevent warning
-
+
vorbis_info *vi = ov_info(of, bitstream);
Index: patches/patch-nmixer_1
===================================================================
RCS file: patches/patch-nmixer_1
diff -N patches/patch-nmixer_1
--- patches/patch-nmixer_1 4 Apr 2015 14:45:36 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-nmixer_1,v 1.1 2015/04/04 14:45:36 schwarze Exp $
---- nmixer.1.orig Sat Jan 24 15:25:12 2009
-+++ nmixer.1 Sat Apr 4 15:38:09 2015
-@@ -21,7 +21,8 @@ volume for the currently highlighted device, and (if y
- you can use home/end/PgUp/PgDn on the numerical keyboard to set left
- and right volume independantly. You can also use 0..5 to set the
- volume to the position indicated by the numbers on top of the screen.
--.PPIf a device can be recorded from, red brackets will be displayed under
-+.PP
-+If a device can be recorded from, red brackets will be displayed under
- the device's name. If it's selected as recording source, a red 'X' is
- displayed as well. You can set a recording device with the space bar.
- .PP
Index: patches/patch-src_global_cc
===================================================================
RCS file: patches/patch-src_global_cc
diff -N patches/patch-src_global_cc
--- patches/patch-src_global_cc 26 Apr 2017 14:58:38 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_global_cc,v 1.1 2017/04/26 14:58:38 naddy Exp $
---- src/global.cc.orig Sat Jan 24 16:25:10 2009
-+++ src/global.cc Wed Apr 26 16:50:52 2017
-@@ -371,7 +371,7 @@ int
- is_sid(const char *filename)
- {
- #ifdef HAVE_SIDPLAYER
-- char *ext = strrchr(filename, '.');
-+ const char *ext = strrchr(filename, '.');
- if (ext) {
- if (!strcasecmp(ext, ".psid")) return 1;
- if (!strcasecmp(ext, ".sid")) return 1;
Index: patches/patch-src_splay_cc
===================================================================
RCS file: /cvs/ports/audio/mp3blaster/patches/patch-src_splay_cc,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-src_splay_cc
--- patches/patch-src_splay_cc 11 Jan 2010 07:51:27 -0000 1.1
+++ patches/patch-src_splay_cc 5 Jun 2017 22:56:46 -0000
@@ -1,6 +1,7 @@
$OpenBSD: patch-src_splay_cc,v 1.1 2010/01/11 07:51:27 jakemsr Exp $
---- src/splay.cc.orig Sun Dec 27 14:24:43 2009
-+++ src/splay.cc Sun Dec 27 16:35:01 2009
+Index: src/splay.cc
+--- src/splay.cc.orig
++++ src/splay.cc
@@ -82,7 +82,7 @@ static void play(char *filename)
Mpegfileplayer *player;
bool didopen = false;
@@ -8,7 +9,7 @@ $OpenBSD: patch-src_splay_cc,v 1.1 2010/
- player=new Mpegfileplayer(Fileplayer::AUDIODRV_OSS);
+ player=new Mpegfileplayer(Fileplayer::AUDIODRV_SNDIO);
if (!strcmp(splay_devicename, "-"))
- didopen = player->openfile(filename, "/dev/stdout", WAV);
+ didopen = player->openfile(filename, "/dev/stdout", ST_WAV);
else
@@ -109,7 +109,7 @@ static void play(char *filename)
{
Hi ports --
Attached is a minor update to audio/mp3blaster. It contains bugfixes
from the last 8 years. Lets us get rid of some patches too. Still plays
my music just fine on my laptop.
~Brian
No comments:
Post a Comment