pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/audio/musicpd Update to version 0.13.0. Notable chang...
details: https://anonhg.NetBSD.org/pkgsrc/rev/ac8990a4e9b3
branches: trunk
changeset: 531958:ac8990a4e9b3
user: simonb <simonb%pkgsrc.org@localhost>
date: Thu Aug 09 04:09:33 2007 +0000
description:
Update to version 0.13.0. Notable changes are:
- Many changes to playlist support
- Lots of bug fixes, cleaned up code, and performance improvements
diffstat:
audio/musicpd/Makefile | 4 +-
audio/musicpd/distinfo | 10 +-
audio/musicpd/patches/patch-ab | 120 --------
audio/musicpd/patches/patch-ac | 581 -----------------------------------------
audio/musicpd/patches/patch-ad | 26 -
5 files changed, 6 insertions(+), 735 deletions(-)
diffs (truncated from 768 to 300 lines):
diff -r a7a3f531d7c4 -r ac8990a4e9b3 audio/musicpd/Makefile
--- a/audio/musicpd/Makefile Thu Aug 09 04:05:28 2007 +0000
+++ b/audio/musicpd/Makefile Thu Aug 09 04:09:33 2007 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2007/01/09 23:19:26 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2007/08/09 04:09:33 simonb Exp $
-DISTNAME= mpd-0.12.1
+DISTNAME= mpd-0.13.0
PKGNAME= ${DISTNAME:S/mpd/musicpd/}
CATEGORIES= audio
MASTER_SITES= http://musicpd.org/uploads/files/
diff -r a7a3f531d7c4 -r ac8990a4e9b3 audio/musicpd/distinfo
--- a/audio/musicpd/distinfo Thu Aug 09 04:05:28 2007 +0000
+++ b/audio/musicpd/distinfo Thu Aug 09 04:09:33 2007 +0000
@@ -1,9 +1,7 @@
-$NetBSD: distinfo,v 1.11 2007/01/09 23:19:26 wiz Exp $
+$NetBSD: distinfo,v 1.12 2007/08/09 04:09:33 simonb Exp $
-SHA1 (mpd-0.12.1.tar.bz2) = 8b124bfcf4b1b2c23abd40661bd0ad0b33fadbfe
-RMD160 (mpd-0.12.1.tar.bz2) = 3352e60ead352bac0b4776f4b784c9f9505bc9bc
-Size (mpd-0.12.1.tar.bz2) = 397761 bytes
+SHA1 (mpd-0.13.0.tar.bz2) = 5d69d5ec6da8e4a26797017f682e54789691395c
+RMD160 (mpd-0.13.0.tar.bz2) = cce5507070c3ccc58f2d8ad6330cd6adff91a747
+Size (mpd-0.13.0.tar.bz2) = 410927 bytes
SHA1 (patch-aa) = 246424791365a3a9a29c2efe36bbbcd40416ae48
-SHA1 (patch-ab) = 3ddd0f23a9d796d4e4c428819657f9a66cf624ba
-SHA1 (patch-ac) = f6876c403c1357e99534878b01044e4a22ed0a97
SHA1 (patch-ad) = 5ba01e9b2b7f1ecca9565e0809021e47df0c4145
diff -r a7a3f531d7c4 -r ac8990a4e9b3 audio/musicpd/patches/patch-ab
--- a/audio/musicpd/patches/patch-ab Thu Aug 09 04:05:28 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,120 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2007/01/09 23:19:26 wiz Exp $
-
---- src/inputPlugins/_flac_common.h.orig 2006-10-10 23:56:55.000000000 +0000
-+++ src/inputPlugins/_flac_common.h
-@@ -30,7 +30,114 @@
- #include "../inputStream.h"
- #include "../outputBuffer.h"
- #include "../decode.h"
--#include <FLAC/seekable_stream_decoder.h>
-+#include <FLAC/export.h>
-+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
-+# include <FLAC/seekable_stream_decoder.h>
-+# define flac_decoder FLAC__SeekableStreamDecoder
-+# define flac_new(x) FLAC__seekable_stream_decoder_new(x)
-+
-+# define flac_ogg_init(a,b,c,d,e,f,g,h,i,j) (0)
-+
-+# define flac_get_decode_position(x,y) \
-+ FLAC__seekable_stream_decoder_get_decode_position(x,y)
-+# define flac_get_state(x) FLAC__seekable_stream_decoder_get_state(x)
-+# define flac_process_single(x) FLAC__seekable_stream_decoder_process_single(x)
-+# define flac_process_metadata(x) \
-+ FLAC__seekable_stream_decoder_process_until_end_of_metadata(x)
-+# define flac_seek_absolute(x,y) \
-+ FLAC__seekable_stream_decoder_seek_absolute(x,y)
-+# define flac_finish(x) FLAC__seekable_stream_decoder_finish(x)
-+# define flac_delete(x) FLAC__seekable_stream_decoder_delete(x)
-+
-+# define flac_decoder_eof FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM
-+
-+# define flac_read_status FLAC__SeekableStreamDecoderReadStatus
-+# define flac_read_status_continue \
-+ FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK
-+# define flac_read_status_eof FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK
-+# define flac_read_status_abort \
-+ FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR
-+
-+# define flac_seek_status FLAC__SeekableStreamDecoderSeekStatus
-+# define flac_seek_status_ok FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK
-+# define flac_seek_status_error FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR
-+
-+# define flac_tell_status FLAC__SeekableStreamDecoderTellStatus
-+# define flac_tell_status_ok FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK
-+# define flac_tell_status_error \
-+ FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR
-+# define flac_tell_status_unsupported \
-+ FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR
-+
-+# define flac_length_status FLAC__SeekableStreamDecoderLengthStatus
-+# define flac_length_status_ok FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK
-+# define flac_length_status_error \
-+ FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR
-+# define flac_length_status_unsupported \
-+ FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR
-+
-+# ifdef HAVE_OGGFLAC
-+# include <OggFLAC/seekable_stream_decoder.h>
-+# endif
-+#else /* FLAC_API_VERSION_CURRENT >= 7 */
-+
-+ /* OggFLAC support is handled by our flac_plugin already, and
-+ * thus we *can* always have it if libFLAC was compiled with it */
-+# ifndef HAVE_OGGFLAC
-+# define HAVE_OGGFLAC 1
-+# endif
-+# include "_ogg_common.h"
-+# undef HAVE_OGGFLAC /* we don't need this defined anymore */
-+
-+# include <FLAC/stream_decoder.h>
-+# define flac_decoder FLAC__StreamDecoder
-+# define flac_new(x) FLAC__stream_decoder_new(x)
-+
-+# define flac_init(a,b,c,d,e,f,g,h,i,j) \
-+ (FLAC__stream_decoder_init_stream(a,b,c,d,e,f,g,h,i,j) \
-+ == FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+# define flac_ogg_init(a,b,c,d,e,f,g,h,i,j) \
-+ (FLAC__stream_decoder_init_ogg_stream(a,b,c,d,e,f,g,h,i,j) \
-+ == FLAC__STREAM_DECODER_INIT_STATUS_OK)
-+
-+# define flac_get_decode_position(x,y) \
-+ FLAC__stream_decoder_get_decode_position(x,y)
-+# define flac_get_state(x) FLAC__stream_decoder_get_state(x)
-+# define flac_process_single(x) FLAC__stream_decoder_process_single(x)
-+# define flac_process_metadata(x) \
-+ FLAC__stream_decoder_process_until_end_of_metadata(x)
-+# define flac_seek_absolute(x,y) FLAC__stream_decoder_seek_absolute(x,y)
-+# define flac_finish(x) FLAC__stream_decoder_finish(x)
-+# define flac_delete(x) FLAC__stream_decoder_delete(x)
-+
-+# define flac_decoder_eof FLAC__STREAM_DECODER_END_OF_STREAM
-+
-+# define flac_read_status FLAC__StreamDecoderReadStatus
-+# define flac_read_status_continue \
-+ FLAC__STREAM_DECODER_READ_STATUS_CONTINUE
-+# define flac_read_status_eof FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM
-+# define flac_read_status_abort FLAC__STREAM_DECODER_READ_STATUS_ABORT
-+
-+# define flac_seek_status FLAC__StreamDecoderSeekStatus
-+# define flac_seek_status_ok FLAC__STREAM_DECODER_SEEK_STATUS_OK
-+# define flac_seek_status_error FLAC__STREAM_DECODER_SEEK_STATUS_ERROR
-+# define flac_seek_status_unsupported \
-+ FLAC__STREAM_DECODER_SEEK_STATUS_UNSUPPORTED
-+
-+# define flac_tell_status FLAC__StreamDecoderTellStatus
-+# define flac_tell_status_ok FLAC__STREAM_DECODER_TELL_STATUS_OK
-+# define flac_tell_status_error FLAC__STREAM_DECODER_TELL_STATUS_ERROR
-+# define flac_tell_status_unsupported \
-+ FLAC__STREAM_DECODER_TELL_STATUS_UNSUPPORTED
-+
-+# define flac_length_status FLAC__StreamDecoderLengthStatus
-+# define flac_length_status_ok FLAC__STREAM_DECODER_LENGTH_STATUS_OK
-+# define flac_length_status_error FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR
-+# define flac_length_status_unsupported \
-+ FLAC__STREAM_DECODER_LENGTH_STATUS_UNSUPPORTED
-+
-+#endif /* FLAC_API_VERSION_CURRENT >= 7 */
-+
- #include <FLAC/metadata.h>
-
- #define FLAC_CHUNK_SIZE 4080
diff -r a7a3f531d7c4 -r ac8990a4e9b3 audio/musicpd/patches/patch-ac
--- a/audio/musicpd/patches/patch-ac Thu Aug 09 04:05:28 2007 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,581 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2007/01/09 23:19:26 wiz Exp $
-
---- src/inputPlugins/flac_plugin.c.orig 2006-10-10 23:56:56.000000000 +0000
-+++ src/inputPlugins/flac_plugin.c
-@@ -16,12 +16,10 @@
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
--#include "../inputPlugin.h"
-+#include "_flac_common.h"
-
- #ifdef HAVE_FLAC
-
--#include "_flac_common.h"
--
- #include "../utils.h"
- #include "../log.h"
- #include "../pcm_utils.h"
-@@ -33,166 +31,14 @@
- #include <stdio.h>
- #include <string.h>
- #include <unistd.h>
--#include <FLAC/seekable_stream_decoder.h>
--#include <FLAC/metadata.h>
-+#include <assert.h>
-
--/* this code is based on flac123, from flac-tools */
-+/* this code was based on flac123, from flac-tools */
-
--static void flacError(const FLAC__SeekableStreamDecoder *,
-- FLAC__StreamDecoderErrorStatus, void *);
--static void flacPrintErroredState(FLAC__SeekableStreamDecoderState state);
--static void flacMetadata(const FLAC__SeekableStreamDecoder *,
-- const FLAC__StreamMetadata *, void *);
--static FLAC__StreamDecoderWriteStatus flacWrite(const
-- FLAC__SeekableStreamDecoder *,
-- const FLAC__Frame *,
-- const FLAC__int32 * const buf[],
-- void *);
--static FLAC__SeekableStreamDecoderReadStatus flacRead(const
-- FLAC__SeekableStreamDecoder
-- *, FLAC__byte buf[],
-- unsigned *, void *);
--static FLAC__SeekableStreamDecoderSeekStatus flacSeek(const
-- FLAC__SeekableStreamDecoder
-- *, FLAC__uint64, void *);
--static FLAC__SeekableStreamDecoderTellStatus flacTell(const
-- FLAC__SeekableStreamDecoder
-- *, FLAC__uint64 *,
-- void *);
--static FLAC__SeekableStreamDecoderLengthStatus flacLength(const
-- FLAC__SeekableStreamDecoder
-- *, FLAC__uint64 *,
-- void *);
--static FLAC__bool flacEOF(const FLAC__SeekableStreamDecoder *, void *);
--
--static int flac_decode(OutputBuffer * cb, DecoderControl * dc,
-- InputStream * inStream)
--{
-- FLAC__SeekableStreamDecoder *flacDec = NULL;
-- FlacData data;
-- int status = 1;
-- int ret = 0;
--
-- init_FlacData(&data, cb, dc, inStream);
--
-- if (!(flacDec = FLAC__seekable_stream_decoder_new())) {
-- ret = -1;
-- goto fail;
-- }
-- /*status&=FLAC__file_decoder_set_md5_checking(flacDec,1); */
-- status &= FLAC__seekable_stream_decoder_set_read_callback(flacDec,
-- flacRead);
-- status &= FLAC__seekable_stream_decoder_set_seek_callback(flacDec,
-- flacSeek);
-- status &= FLAC__seekable_stream_decoder_set_tell_callback(flacDec,
-- flacTell);
-- status &= FLAC__seekable_stream_decoder_set_length_callback(flacDec,
-- flacLength);
-- status &=
-- FLAC__seekable_stream_decoder_set_eof_callback(flacDec, flacEOF);
-- status &=
-- FLAC__seekable_stream_decoder_set_write_callback(flacDec,
-- flacWrite);
-- status &=
-- FLAC__seekable_stream_decoder_set_metadata_callback(flacDec,
-- flacMetadata);
-- status &=
-- FLAC__seekable_stream_decoder_set_metadata_respond(flacDec,
-- FLAC__METADATA_TYPE_VORBIS_COMMENT);
-- status &=
-- FLAC__seekable_stream_decoder_set_error_callback(flacDec,
-- flacError);
-- status &=
-- FLAC__seekable_stream_decoder_set_client_data(flacDec,
-- (void *)&data);
-- if (!status) {
-- ERROR("flac problem before init()\n");
-- flacPrintErroredState(FLAC__seekable_stream_decoder_get_state
-- (flacDec));
-- ret = -1;
-- goto fail;
-- }
--
-- if (FLAC__seekable_stream_decoder_init(flacDec) !=
-- FLAC__SEEKABLE_STREAM_DECODER_OK) {
-- ERROR("flac problem doing init()\n");
-- flacPrintErroredState(FLAC__seekable_stream_decoder_get_state
-- (flacDec));
-- ret = -1;
-- goto fail;
-- }
--
-- if (!FLAC__seekable_stream_decoder_process_until_end_of_metadata
-- (flacDec)) {
-- ERROR("flac problem reading metadata\n");
-- flacPrintErroredState(FLAC__seekable_stream_decoder_get_state
-- (flacDec));
-- ret = -1;
-- goto fail;
-- }
--
-- dc->state = DECODE_STATE_DECODE;
--
-- while (1) {
-- FLAC__seekable_stream_decoder_process_single(flacDec);
-- if (FLAC__seekable_stream_decoder_get_state(flacDec) !=
-- FLAC__SEEKABLE_STREAM_DECODER_OK) {
-- break;
-- }
-- if (dc->seek) {
-- FLAC__uint64 sampleToSeek = dc->seekWhere *
-- dc->audioFormat.sampleRate + 0.5;
-- if (FLAC__seekable_stream_decoder_seek_absolute(flacDec,
-- sampleToSeek))
-- {
-- clearOutputBuffer(cb);
-- data.time = ((float)sampleToSeek) /
-- dc->audioFormat.sampleRate;
-- data.position = 0;
-- } else
-- dc->seekError = 1;
-- dc->seek = 0;
Home |
Main Index |
Thread Index |
Old Index