pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/mp3blaster Update to version 3.2.0.
details: https://anonhg.NetBSD.org/pkgsrc/rev/d6a5e77104d8
branches: trunk
changeset: 463995:d6a5e77104d8
user: cube <cube%pkgsrc.org@localhost>
date: Wed Dec 03 12:31:36 2003 +0000
description:
Update to version 3.2.0.
V3.2.0 2003/11/28
=================
-Updated source to compile with recent gcc compilers
-Pausing mp3/wav/ogg playback releases the sound device
-Better mp3 integrity checks. Songs that didn't previously play (or only
partly), should now play fine (as in, the bits that are valid)
-Fixed a bug that would hang mp3blaster if you'd be in a dir that was deleted
meanwhile.
-bugfix that could crash mp3blaster after a request to quit (..)
-bugfix that failed to redraw screen correctly after operations that
required input (such as convert to wav, enter group name, ..)
-fixed a bug that could crash mp3blaster on opening oggs when sound device
was busy.
-Check if the playlist directory actually exists before trying to write
a playlist
-Added '--repeat/-R' command line option
-Applied LIRC support patch from Olgierd Pieczul .
Thanks a lot!
diffstat:
audio/mp3blaster/Makefile | 8 +-
audio/mp3blaster/distinfo | 24 ++++----
audio/mp3blaster/patches/patch-aa | 14 +++-
audio/mp3blaster/patches/patch-ab | 112 +++++++++++++++++++++++++++----------
audio/mp3blaster/patches/patch-ac | 24 +++-----
audio/mp3blaster/patches/patch-ad | 18 +++---
audio/mp3blaster/patches/patch-ae | 43 ++++++++------
audio/mp3blaster/patches/patch-ag | 16 +----
audio/mp3blaster/patches/patch-ak | 7 +-
audio/mp3blaster/patches/patch-al | 12 ++--
audio/mp3blaster/patches/patch-an | 22 +++++--
11 files changed, 178 insertions(+), 122 deletions(-)
diffs (truncated from 662 to 300 lines):
diff -r 788ae422832a -r d6a5e77104d8 audio/mp3blaster/Makefile
--- a/audio/mp3blaster/Makefile Wed Dec 03 12:26:35 2003 +0000
+++ b/audio/mp3blaster/Makefile Wed Dec 03 12:31:36 2003 +0000
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2003/09/30 09:43:59 cube Exp $
+# $NetBSD: Makefile,v 1.15 2003/12/03 12:31:36 cube Exp $
-DISTNAME= mp3blaster-3.1.3
-PKGREVISION= 3
+DISTNAME= mp3blaster-3.2.0
CATEGORIES= audio
-MASTER_SITES= ftp://mud.stack.nl/pub/mp3blaster/ \
- http://mp3blaster.linuxave.net/src/
+MASTER_SITES= http://www.stack.nl/~brama/mp3blaster/src/
MAINTAINER= rxg%NetBSD.org@localhost
HOMEPAGE= http://www.stack.nl/~brama/mp3blaster.html
diff -r 788ae422832a -r d6a5e77104d8 audio/mp3blaster/distinfo
--- a/audio/mp3blaster/distinfo Wed Dec 03 12:26:35 2003 +0000
+++ b/audio/mp3blaster/distinfo Wed Dec 03 12:31:36 2003 +0000
@@ -1,20 +1,20 @@
-$NetBSD: distinfo,v 1.5 2003/10/11 21:55:24 cube Exp $
+$NetBSD: distinfo,v 1.6 2003/12/03 12:31:36 cube Exp $
-SHA1 (mp3blaster-3.1.3.tar.gz) = 516f0b55443c9b7035ef2a82903b369c13a8f001
-Size (mp3blaster-3.1.3.tar.gz) = 273688 bytes
-SHA1 (patch-aa) = d6a9663d14bcf353e0c78df9d63f3c3565e4b074
-SHA1 (patch-ab) = 285020f22f45c1b0e84b87f67e454de81dd0538a
-SHA1 (patch-ac) = 859ad4b9ea4a501be08672142f1fed462abaa707
-SHA1 (patch-ad) = b181950ed46cb29508f75a9e681038a66444b48d
-SHA1 (patch-ae) = 74e28ada4059863c51eb7590b28c58a3b07bb1c2
+SHA1 (mp3blaster-3.2.0.tar.gz) = edc4538ad233270dd4b17066c5d2267708f1b5e0
+Size (mp3blaster-3.2.0.tar.gz) = 312991 bytes
+SHA1 (patch-aa) = d869d2acb66edbf569f39fd8d35e66b4651b4f77
+SHA1 (patch-ab) = f4d2486c915e593c81653df1285d532706e4107b
+SHA1 (patch-ac) = 3ad9344d22e511682ad05ab1e2dfbc057fb6cf96
+SHA1 (patch-ad) = bf744e9d9fffe01dcbeaa1579029d94a6060fa22
+SHA1 (patch-ae) = 65feb8611cea4b0f6e8de593e56972d676fb64d4
SHA1 (patch-af) = bc48687a1e08d1884f79d5e0b5835f60435ea0a2
-SHA1 (patch-ag) = e1e3a921b45e46c688c1466f8de3970d8fc0bd38
+SHA1 (patch-ag) = a7b796b7ff1c1c5497e0127a5f8b6dc02278d91b
SHA1 (patch-ah) = 8dfd9c60b113a925187187100b785bb99d5f4722
SHA1 (patch-ai) = 6a95a0ff24b09e4bc3b13cc5a09336f43a03bcbd
SHA1 (patch-aj) = db1484dbbb10e951dd88b1b40bedafe3c6ede174
-SHA1 (patch-ak) = d839af2dd8bc09260b67573b7837789a4b718340
-SHA1 (patch-al) = c43b9f42050fd3bfb5943d3c3bc1c3d8814b8eb7
+SHA1 (patch-ak) = 35ec20a47287e0a158b385be3e8fcc133684d40b
+SHA1 (patch-al) = 746d2441b79530f3efa51bcd2bce847f247eec7c
SHA1 (patch-am) = 14c4dff0bd8d02e5b9a3f3968602c76241905e26
-SHA1 (patch-an) = 1a29ac76aa9725f7d42f31a4713defafd675c1af
+SHA1 (patch-an) = 7e801e08c2d5e72ff6dd4215c8d3466362fc54b1
SHA1 (patch-ao) = d3c3fc1c5d51791282e196ee6381fd2f542f695e
SHA1 (patch-ap) = cbad4001c1d1440150ec738797bc8e5238d019e8
diff -r 788ae422832a -r d6a5e77104d8 audio/mp3blaster/patches/patch-aa
--- a/audio/mp3blaster/patches/patch-aa Wed Dec 03 12:26:35 2003 +0000
+++ b/audio/mp3blaster/patches/patch-aa Wed Dec 03 12:31:36 2003 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2003/09/30 09:44:00 cube Exp $
+$NetBSD: patch-aa,v 1.4 2003/12/03 12:31:36 cube Exp $
---- getopt/Makefile.in.orig 2003-09-29 13:46:00.000000000 +0200
+--- getopt/Makefile.in.orig 2003-11-29 15:26:17.000000000 +0100
+++ getopt/Makefile.in
-@@ -0,0 +1,310 @@
+@@ -0,0 +1,316 @@
+# Makefile.in generated automatically by automake 1.4-p6 from Makefile.am
+
+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
@@ -62,13 +62,19 @@
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
++host_alias = @host_alias@
++host_triplet = @host@
+CC = @CC@
+CXX = @CXX@
++HAVE_LIB = @HAVE_LIB@
++LIB = @LIB@
+LIBGETOPT = @LIBGETOPT@
+LIBMPEGSOUND = @LIBMPEGSOUND@
+LIBMYSQL = @LIBMYSQL@
+LIBNMIXER = @LIBNMIXER@
++LIRC_LIBS = @LIRC_LIBS@
+LN_S = @LN_S@
++LTLIB = @LTLIB@
+MAKEINFO = @MAKEINFO@
+MP3B_MODULES = @MP3B_MODULES@
+NAS_CFLAGS = @NAS_CFLAGS@
@@ -109,7 +115,7 @@
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
-+TAR = gtar
++TAR = tar
+GZIP_ENV = --best
+DEP_FILES = .deps/getopt.P .deps/getopt1.P
+SOURCES = $(libgetopt_a_SOURCES)
diff -r 788ae422832a -r d6a5e77104d8 audio/mp3blaster/patches/patch-ab
--- a/audio/mp3blaster/patches/patch-ab Wed Dec 03 12:26:35 2003 +0000
+++ b/audio/mp3blaster/patches/patch-ab Wed Dec 03 12:31:36 2003 +0000
@@ -1,40 +1,50 @@
-$NetBSD: patch-ab,v 1.4 2003/09/30 09:44:00 cube Exp $
+$NetBSD: patch-ab,v 1.5 2003/12/03 12:31:36 cube Exp $
---- src/Makefile.in.orig 2002-10-20 19:05:08.000000000 +0200
+--- src/Makefile.in.orig 2003-11-28 21:07:27.000000000 +0100
+++ src/Makefile.in
-@@ -59,6 +59,7 @@ PRE_UNINSTALL = :
- POST_UNINSTALL = :
- CC = @CC@
+@@ -10,6 +10,8 @@
+ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ # PARTICULAR PURPOSE.
+
++#bin_PROGRAMS = mp3blaster mp3tag splay
++
+
+ SHELL = @SHELL@
+
+@@ -63,6 +65,7 @@ CC = @CC@
CXX = @CXX@
+ HAVE_LIB = @HAVE_LIB@
+ LIB = @LIB@
+LIBGETOPT = @LIBGETOPT@
LIBMPEGSOUND = @LIBMPEGSOUND@
LIBMYSQL = @LIBMYSQL@
LIBNMIXER = @LIBNMIXER@
-@@ -75,9 +76,9 @@ SID_LIBS = @SID_LIBS@
+@@ -81,19 +84,15 @@ SID_LIBS = @SID_LIBS@
SRCDIRS = @SRCDIRS@
VERSION = @VERSION@
-bin_PROGRAMS = mp3blaster mp3tag splay
+-#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 history.cc
history.h getinput.cc getinput.h interface.cc interface.h
+-
+-splay_SOURCES = splay.cc splay.h splay_common.cc
+-splay_DEPENDENCIES = ../mpegsound/libmpegsound.a
+-splay_LDADD = @LIBMPEGSOUND@
+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 history.cc
history.h getinput.cc getinput.h interface.cc interface.h
+mp3blaster_SOURCES = fileman.cc main.cc scrollwin.cc fileman.h genretab.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 history.cc history.h getinput.cc
getinput.h interface.cc interface.h
-
- splay_SOURCES = splay.cc splay.h splay_common.cc
- splay_DEPENDENCIES = ../mpegsound/libmpegsound.a
-@@ -85,9 +86,9 @@ splay_LDADD = @LIBMPEGSOUND@
++
mp3tag_SOURCES = id3parse.cc mp3tag.cc id3parse.h
mp3tag_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
mp3tag_LDADD = @LIBMPEGSOUND@ @LIBMYSQL@
-mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a
+mp3blaster_DEPENDENCIES = ../mpegsound/libmpegsound.a ../nmixer/libnmixer.a ../getopt/libgetopt.a
INCLUDES = -I$(top_srcdir)/mpegsound -I/usr/include/ncurses -I$(top_srcdir)/nmixer -I$(includedir)
--mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @NCURSES_LIBS@
-+mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @LIBGETOPT@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @NCURSES_LIBS@
+-mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@
++mp3blaster_LDADD = @LIBMPEGSOUND@ @LIBNMIXER@ @LIBGETOPT@ @NAS_LIBS@ @SID_LIBS@ @OGG_LIBS@ @LIRC_LIBS@ @NCURSES_LIBS@
EXTRA_DIST = FILES
CXXFLAGS = @CXXFLAGS@ @NAS_CFLAGS@ -DMP3BLASTER_DOCDIR=\"${pkgdatadir}\"
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-@@ -104,9 +105,8 @@ X_CFLAGS = @X_CFLAGS@
+@@ -110,14 +109,11 @@ X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
X_EXTRA_LIBS = @X_EXTRA_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
@@ -46,21 +56,25 @@
mp3blaster_LDFLAGS =
mp3tag_OBJECTS = id3parse.o mp3tag.o
mp3tag_LDFLAGS =
-@@ -124,8 +124,12 @@ DIST_COMMON = Makefile.am Makefile.in
-
- DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+-splay_OBJECTS = splay.o splay_common.o
+-splay_LDFLAGS =
+ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ CXXLD = $(CXX)
+ CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
+@@ -132,16 +128,20 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
--TAR = tar
-+TAR = gtar
+ TAR = tar
GZIP_ENV = --best
+-SOURCES = $(mp3blaster_SOURCES) $(mp3tag_SOURCES) $(splay_SOURCES)
+-OBJECTS = $(mp3blaster_OBJECTS) $(mp3tag_OBJECTS) $(splay_OBJECTS)
+DEP_FILES = .deps/config.P .deps/fileman.P .deps/getinput.P \
+.deps/global.P .deps/history.P .deps/id3parse.P .deps/interface.P \
+.deps/main.P .deps/mp3item.P .deps/mp3tag.P .deps/mp3win.P \
-+.deps/scrollwin.P .deps/splay.P .deps/splay_common.P .deps/winitem.P
- SOURCES = $(mp3blaster_SOURCES) $(mp3tag_SOURCES) $(splay_SOURCES)
- OBJECTS = $(mp3blaster_OBJECTS) $(mp3tag_OBJECTS) $(splay_OBJECTS)
++.deps/scrollwin.P .deps/winitem.P
++SOURCES = $(mp3blaster_SOURCES) $(mp3tag_SOURCES)
++OBJECTS = $(mp3blaster_OBJECTS) $(mp3tag_OBJECTS)
-@@ -133,9 +137,9 @@ all: all-redirect
+ all: all-redirect
.SUFFIXES:
.SUFFIXES: .S .c .cc .o .s
$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
@@ -72,7 +86,7 @@
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-@@ -165,9 +169,6 @@ uninstall-binPROGRAMS:
+@@ -171,9 +171,6 @@ uninstall-binPROGRAMS:
rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
done
@@ -82,7 +96,18 @@
.s.o:
$(COMPILE) -c $<
-@@ -216,7 +217,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
+@@ -197,10 +194,6 @@ mp3blaster: $(mp3blaster_OBJECTS) $(mp3b
+ mp3tag: $(mp3tag_OBJECTS) $(mp3tag_DEPENDENCIES)
+ @rm -f mp3tag
+ $(CXXLINK) $(mp3tag_LDFLAGS) $(mp3tag_OBJECTS) $(mp3tag_LDADD) $(LIBS)
+-
+-splay: $(splay_OBJECTS) $(splay_DEPENDENCIES)
+- @rm -f splay
+- $(CXXLINK) $(splay_LDFLAGS) $(splay_OBJECTS) $(splay_LDADD) $(LIBS)
+ .cc.o:
+ $(CXXCOMPILE) -c $<
+
+@@ -222,7 +215,7 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEP
awk ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
@@ -91,7 +116,7 @@
mostlyclean-tags:
-@@ -232,6 +233,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
+@@ -238,6 +231,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
subdir = src
distdir: $(DISTFILES)
@@ -103,9 +128,36 @@
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
-@@ -243,6 +249,56 @@ distdir: $(DISTFILES)
+@@ -248,33 +246,57 @@ distdir: $(DISTFILES)
+ || cp -p $$d/$$file $(distdir)/$$file || :; \
fi; \
done
+-config.o: config.cc mp3blaster.h ../config.h global.h
+-fileman.o: fileman.cc mp3blaster.h ../config.h getopt.h fileman.h \
+- scrollwin.h winitem.h global.h
+-getinput.o: getinput.cc getinput.h ../config.h
+-getopt.o: getopt.c ../config.h
+-getopt1.o: getopt1.c ../config.h getopt.h
+-global.o: global.cc getopt.h mp3blaster.h ../config.h id3parse.h
+-history.o: history.cc ../config.h history.h getopt.h
+-id3parse.o: id3parse.cc id3parse.h genretab.h
+-interface.o: interface.cc
+-main.o: main.cc ../config.h history.h getopt.h mp3blaster.h global.h \
+- scrollwin.h winitem.h mp3win.h fileman.h \
+- ../mpegsound/mpegsound.h ../nmixer/nmixer.h keybindings.h \
+- getinput.h
+-mp3item.o: mp3item.cc mp3item.h winitem.h mp3blaster.h ../config.h \
+- mp3win.h scrollwin.h
+-mp3tag.o: mp3tag.cc mp3blaster.h ../config.h getopt.h \
+- ../mpegsound/mpegsound.h id3parse.h
+-mp3win.o: mp3win.cc mp3win.h scrollwin.h mp3blaster.h ../config.h \
+- winitem.h mp3item.h
+-scrollwin.o: scrollwin.cc mp3blaster.h ../config.h global.h scrollwin.h \
+- winitem.h
+-splay.o: splay.cc ../config.h getopt.h ../mpegsound/mpegsound.h splay.h
+-splay_common.o: splay_common.cc ../config.h ../mpegsound/mpegsound.h \
+- getopt.h splay.h
+-winitem.o: winitem.cc mp3blaster.h ../config.h scrollwin.h winitem.h
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
@@ -160,7 +212,7 @@
info-am:
info: info-am
dvi-am:
-@@ -280,23 +336,24 @@ distclean-generic:
+@@ -312,23 +334,24 @@ distclean-generic:
maintainer-clean-generic:
mostlyclean-am: mostlyclean-binPROGRAMS mostlyclean-compile \
@@ -190,7 +242,7 @@
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
-@@ -306,12 +363,13 @@ maintainer-clean: maintainer-clean-am
+@@ -338,12 +361,13 @@ maintainer-clean: maintainer-clean-am
maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
mostlyclean-compile distclean-compile clean-compile \
maintainer-clean-compile tags mostlyclean-tags distclean-tags \
diff -r 788ae422832a -r d6a5e77104d8 audio/mp3blaster/patches/patch-ac
--- a/audio/mp3blaster/patches/patch-ac Wed Dec 03 12:26:35 2003 +0000
+++ b/audio/mp3blaster/patches/patch-ac Wed Dec 03 12:31:36 2003 +0000
@@ -1,16 +1,16 @@
-$NetBSD: patch-ac,v 1.4 2003/09/30 09:44:00 cube Exp $
Home |
Main Index |
Thread Index |
Old Index