From c33f7ac9fa7a7ad49fe19e9a8e28fbecc3805998 Mon Sep 17 00:00:00 2001 From: rxg Date: Mon, 18 Mar 2002 14:13:50 +0000 Subject: Updated mp3blaster to 3.1.1 V3.1.1 2002/03/16 ================= -Applied a patch from Douglas Richard that introduces horizontal panning of the scrollable window using Key.Left and Key.Right, as well as configurable wraparound-behaviour (see config file directive 'WrapAround') and jump-to-top/bottom of the list using Key.Home and Key.End keybindings. -When resetting sound device failed, playback of current song is stopped. -config file directive 'SkipFrames' => 'SkipLength' -Added RPM specfile, so you can build mp3blaster on RedHat 7.2 with rpm -ta -applied patches from Martijn to fix compiling issues with NetBSD/curses. -applied patch from Martijn that fixes endian issues in waveplayer -applied patch from Ivan Prokudin that fixes a bug in the character set recoding code. -Added patch from Serge v/d Boom that writes info about mp3's being played to a status file (see --status-file). -Fixed bug that prevented showing next song -Configfile directive 'File.ID3Names' enabled now implies that the default file display mode in the filemanager is show by ID3 name instead of filename. -When decoding mp3s as wavs, decoding will be aborted with a warning when samplerate/speed/stereo-mode changes. -ID3tags in ID3 displaying mode are now charset-recoded as well. Thank Martijn van Buul for fixing many bugs for NetBSD. --- audio/mp3blaster/Makefile | 12 +++++------- audio/mp3blaster/PLIST | 10 ++++++++-- audio/mp3blaster/distinfo | 10 +++++----- audio/mp3blaster/patches/patch-aa | 13 ------------- audio/mp3blaster/patches/patch-ab | 22 +++++++++++++++------- audio/mp3blaster/patches/patch-ac | 14 +++++++------- 6 files changed, 40 insertions(+), 41 deletions(-) delete mode 100644 audio/mp3blaster/patches/patch-aa (limited to 'audio') diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile index c01e0f9b360..5c0744b288e 100644 --- a/audio/mp3blaster/Makefile +++ b/audio/mp3blaster/Makefile @@ -1,27 +1,25 @@ -# $NetBSD: Makefile,v 1.2 2002/02/24 22:46:29 wiz Exp $ -# FreeBSD Id: ports/audio/mp3blaster/Makefile,v 1.10 2001/08/20 05:45:57 greid Exp +# $NetBSD: Makefile,v 1.3 2002/03/18 14:13:50 rxg Exp $ -DISTNAME= mp3blaster-3.0p8 +DISTNAME= mp3blaster-3.1.1 CATEGORIES= audio MASTER_SITES= ftp://mud.stack.nl/pub/mp3blaster/ \ http://mp3blaster.linuxave.net/src/ MAINTAINER= rxg@netbsd.org HOMEPAGE= http://www.stack.nl/~brama/mp3blaster.html -COMMENT= MP3 console ncurses-based player +COMMENT= MP3 console curses-based player -# missing: wchgat -USE_NCURSES= YES USE_PTHREAD= native pth GNU_CONFIGURE= yes CONFIGURE_ARGS+="--with-cxxflags=${CXXFLAGS}" \ + --with-curses \ --with-oggvorbis \ - --with-pth \ --enable-newthreads .include "../../audio/libogg/buildlink.mk" .include "../../audio/libvorbis/buildlink.mk" .include "../../devel/ncurses/buildlink.mk" +.include "../../mk/ossaudio.buildlink.mk" .include "../../mk/pthread.buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/audio/mp3blaster/PLIST b/audio/mp3blaster/PLIST index 69142dd27a3..83f3d7689b5 100644 --- a/audio/mp3blaster/PLIST +++ b/audio/mp3blaster/PLIST @@ -1,10 +1,16 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2002/02/23 07:43:19 rxg Exp $ +@comment $NetBSD: PLIST,v 1.2 2002/03/18 14:13:50 rxg Exp $ bin/mp3blaster bin/mp3tag bin/nmixer man/man1/mp3blaster.1 man/man1/nmixer.1 +share/mp3blaster/README +share/mp3blaster/chargen.c share/mp3blaster/commands.txt +share/mp3blaster/koi8-r +share/mp3blaster/makefile +share/mp3blaster/maketbl.c share/mp3blaster/sample.mp3blasterrc -share/mp3blaster/sample.mp3blasterrc_for_x +share/mp3blaster/win1251 +share/mp3blaster/win2koi.tbl @dirrm share/mp3blaster diff --git a/audio/mp3blaster/distinfo b/audio/mp3blaster/distinfo index 0a35cfd2a3f..0f69dc8bc7a 100644 --- a/audio/mp3blaster/distinfo +++ b/audio/mp3blaster/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2002/02/23 07:43:19 rxg Exp $ +$NetBSD: distinfo,v 1.2 2002/03/18 14:13:51 rxg Exp $ -MD5 (mp3blaster-3.0p8.tar.gz) = ac8d30b18cfd7b67efe1a3847c62fe17 -SHA1 (patch-aa) = e8e6823e55598b8f19688d3afddff11fa80be449 -SHA1 (patch-ab) = bda29c7efd978b63ba038cabb69c62f9a625640a -SHA1 (patch-ac) = ddc7a7d7509002af68ead8a8d370238cae65783c +SHA1 (mp3blaster-3.1.1.tar.gz) = 794e87ac78f915bedf72a685080e729bf2f13337 +Size (mp3blaster-3.1.1.tar.gz) = 286621 bytes +SHA1 (patch-ab) = 02a1245efef23f1807c05aab530bf0ae4502fd5a +SHA1 (patch-ac) = fb99e0330bbec8c0813eb8a38fe534e090878c43 diff --git a/audio/mp3blaster/patches/patch-aa b/audio/mp3blaster/patches/patch-aa deleted file mode 100644 index 8b00c56dbf2..00000000000 --- a/audio/mp3blaster/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2002/02/23 07:43:19 rxg Exp $ - ---- configure.orig Thu Feb 14 23:59:31 2002 -+++ configure -@@ -3521,7 +3521,7 @@ - fi - fi - --if test "`uname -s`" = "OpenBSD" ; then -+if test "`uname -s`" = "OpenBSD" || test "`uname -s`" = "NetBSD" ; then - SOUNDDEV="/dev/audio" - else - SOUNDDEV="/dev/dsp" diff --git a/audio/mp3blaster/patches/patch-ab b/audio/mp3blaster/patches/patch-ab index a66b1511d97..7ef4698c884 100644 --- a/audio/mp3blaster/patches/patch-ab +++ b/audio/mp3blaster/patches/patch-ab @@ -1,14 +1,22 @@ -$NetBSD: patch-ab,v 1.1.1.1 2002/02/23 07:43:20 rxg Exp $ +$NetBSD: patch-ab,v 1.2 2002/03/18 14:13:53 rxg Exp $ ---- src/Makefile.in.orig Fri Feb 15 22:35:03 2002 +--- src/Makefile.in.orig Sun Mar 17 04:00:49 2002 +++ src/Makefile.in -@@ -75,8 +75,7 @@ - SRCDIRS = @SRCDIRS@ - VERSION = @VERSION@ +@@ -85,8 +85,7 @@ + am__quote = @am__quote@ + install_sh = @install_sh@ -bin_PROGRAMS = mp3blaster mp3tag splay -#bin_PROGRAMS = mp3blaster mp3tag +bin_PROGRAMS = mp3blaster mp3tag - mp3blaster_SOURCES = fileman.cc main.cc scrollwin.cc getopt.c getopt1.c fileman.h genretab.h getopt.h id3parse.cc id3parse.h mp3blaster.h global.cc global.h config.cc scrollwin.h winitem.cc winitem.h mp3win.cc mp3win.h mp3item.cc mp3item.h keybindings.h @MP3B_MODULES@ + mp3blaster_SOURCES = fileman.cc \ + main.cc \ + scrollwin.cc \ +@@ -131,7 +130,6 @@ + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = $(top_builddir)/config.h + CONFIG_CLEAN_FILES = +-bin_PROGRAMS = mp3blaster$(EXEEXT) mp3tag$(EXEEXT) splay$(EXEEXT) + PROGRAMS = $(bin_PROGRAMS) - splay_SOURCES = splay.cc splay.h splay_common.cc + am_mp3blaster_OBJECTS = fileman.$(OBJEXT) main.$(OBJEXT) \ diff --git a/audio/mp3blaster/patches/patch-ac b/audio/mp3blaster/patches/patch-ac index d497ad170d1..8804eafb154 100644 --- a/audio/mp3blaster/patches/patch-ac +++ b/audio/mp3blaster/patches/patch-ac @@ -1,13 +1,13 @@ -$NetBSD: patch-ac,v 1.1.1.1 2002/02/23 07:43:20 rxg Exp $ +$NetBSD: patch-ac,v 1.2 2002/03/18 14:13:53 rxg Exp $ ---- Makefile.in.orig Fri Feb 15 22:45:24 2002 +--- Makefile.in.orig Sun Mar 17 04:00:46 2002 +++ Makefile.in -@@ -76,7 +76,7 @@ - VERSION = @VERSION@ +@@ -86,7 +86,7 @@ + install_sh = @install_sh@ SUBDIRS = mpegsound nmixer src doc -man_MANS = mp3blaster.1 nmixer.1 splay.1 +man_MANS = mp3blaster.1 nmixer.1 - EXTRA_DIST = CREDITS TODO FAQ id3scripts/id3name.sh mp3blaster.1 nmixer.1 winnt/AUTHORS winnt/README.txt winnt/getopt.c winnt/getopt.h winnt/id3parse.cpp winnt/id3parse.h winnt/mp3tag.cpp winnt/mp3tag.mak BUGS splay.1 - - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 + EXTRA_DIST = CREDITS TODO FAQ id3scripts/id3name.sh mp3blaster.1 nmixer.1 \ + winnt/AUTHORS winnt/README.txt winnt/getopt.c winnt/getopt.h \ + winnt/id3parse.cpp winnt/id3parse.h winnt/mp3tag.cpp winnt/mp3tag.mak \ -- cgit v1.2.3