diff options
Diffstat (limited to 'audio/musicpd')
| -rw-r--r-- | audio/musicpd/DESCR | 6 | ||||
| -rw-r--r-- | audio/musicpd/Makefile | 45 | ||||
| -rw-r--r-- | audio/musicpd/PLIST | 12 | ||||
| -rw-r--r-- | audio/musicpd/distinfo | 9 | ||||
| -rw-r--r-- | audio/musicpd/files/mpd.conf | 40 | ||||
| -rw-r--r-- | audio/musicpd/files/mpd.sh | 18 | ||||
| -rw-r--r-- | audio/musicpd/options.mk | 72 | ||||
| -rw-r--r-- | audio/musicpd/patches/patch-aa | 24 | ||||
| -rw-r--r-- | audio/musicpd/patches/patch-ab | 120 | ||||
| -rw-r--r-- | audio/musicpd/patches/patch-ac | 581 | ||||
| -rw-r--r-- | audio/musicpd/patches/patch-ad | 26 |
11 files changed, 0 insertions, 953 deletions
diff --git a/audio/musicpd/DESCR b/audio/musicpd/DESCR deleted file mode 100644 index 1f058711381..00000000000 --- a/audio/musicpd/DESCR +++ /dev/null @@ -1,6 +0,0 @@ -Music Player Daemon allows remote access for playing music (MP3s, Ogg -Vorbis files, Flacs and AAC files) and managing playlists. It is -designed for integrating a computer into a stereo system that provides -control for music playback over a local network. It is also makes a -great desktop music player, especially if you're a console junkie, -like frontend options, or restart X often. diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile deleted file mode 100644 index 682d70d731b..00000000000 --- a/audio/musicpd/Makefile +++ /dev/null @@ -1,45 +0,0 @@ -# $NetBSD: Makefile,v 1.27 2007/01/09 23:19:26 wiz Exp $ - -DISTNAME= mpd-0.12.1 -PKGNAME= ${DISTNAME:S/mpd/musicpd/} -CATEGORIES= audio -MASTER_SITES= http://musicpd.org/uploads/files/ -EXTRACT_SUFX= .tar.bz2 - -CONFLICTS= mpd-[0-9]* - -MAINTAINER= simonb@NetBSD.org -HOMEPAGE= http://musicpd.org/ -COMMENT= Remote controllable audio player - -GNU_CONFIGURE= yes -USE_LIBTOOL= yes - -.include "options.mk" - -EGDIR= ${PREFIX}/share/examples/mpd -RCD_SCRIPTS= mpd - -FILES_SUBST+= DEVOSSAUDIO=${DEVOSSAUDIO:Q} -LDFLAGS+= ${LIBOSSAUDIO} - -SUBST_CLASSES+= config paths -SUBST_STAGE.config= pre-configure -SUBST_FILES.config= src/main.c -SUBST_SED.config= -e s,/etc/mpd.conf,${PKG_SYSCONFDIR}/mpd.conf, -SUBST_STAGE.paths= post-patch -SUBST_FILES.paths= mpd.conf -SUBST_SED.paths= -e 's,@DEVOSSAUDIO@,${DEVOSSAUDIO},' - -post-extract: - ${CP} ${FILESDIR}/mpd.conf ${WRKSRC}/mpd.conf - -post-install: - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/mpd.conf ${EGDIR} - -.include "../../audio/libao/buildlink3.mk" -.include "../../audio/libmad/buildlink3.mk" - -.include "../../mk/oss.buildlink3.mk" -.include "../../mk/bsd.pkg.mk" diff --git a/audio/musicpd/PLIST b/audio/musicpd/PLIST deleted file mode 100644 index 2eee0ece19a..00000000000 --- a/audio/musicpd/PLIST +++ /dev/null @@ -1,12 +0,0 @@ -@comment $NetBSD: PLIST,v 1.3 2007/01/09 23:19:26 wiz Exp $ -bin/mpd -man/man1/mpd.1 -man/man5/mpd.conf.5 -share/doc/mpd/COMMANDS -share/doc/mpd/README -share/doc/mpd/UPGRADING -share/doc/mpd/mpdconf.example -share/examples/mpd/mpd.conf -share/examples/rc.d/mpd -@dirrm share/examples/mpd -@dirrm share/doc/mpd diff --git a/audio/musicpd/distinfo b/audio/musicpd/distinfo deleted file mode 100644 index 4f05c7fd335..00000000000 --- a/audio/musicpd/distinfo +++ /dev/null @@ -1,9 +0,0 @@ -$NetBSD: distinfo,v 1.11 2007/01/09 23:19:26 wiz 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 (patch-aa) = 246424791365a3a9a29c2efe36bbbcd40416ae48 -SHA1 (patch-ab) = 3ddd0f23a9d796d4e4c428819657f9a66cf624ba -SHA1 (patch-ac) = f6876c403c1357e99534878b01044e4a22ed0a97 -SHA1 (patch-ad) = 5ba01e9b2b7f1ecca9565e0809021e47df0c4145 diff --git a/audio/musicpd/files/mpd.conf b/audio/musicpd/files/mpd.conf deleted file mode 100644 index 66a18d23ef1..00000000000 --- a/audio/musicpd/files/mpd.conf +++ /dev/null @@ -1,40 +0,0 @@ -# $NetBSD: mpd.conf,v 1.3 2004/05/02 06:28:50 grant Exp $ - -# required -port "2100" -music_directory "/mp3" -playlist_directory "/mp3" -log_file "/var/log/mpd.log" -error_file "/var/log/mpd.error" - -# optional -max_connections "5" -max_command_list_size "2048" -max_output_buffer_size "2048" -connection_timeout "60" -db_file "/mp3/.mpddb" -state_file "/mp3/.mpdstate" -save_absolute_paths_in_playlists "no" - -max_playlist_length "4096" -buffer_before_play "25%" -bind_to_address "any" - -mixer_type "oss" -mixer_device "/dev/mixer" -# mixer_control defaults to the master volume control. uncomment the -# following line to have mpd's volume control modify the "PCM" -# volume instead: -# mixer_control "Pcm" - -ao_driver "oss" -ao_driver_options "dsp=@DEVOSSAUDIO@" -audio_write_size "1024" - -#user "mp3" - -# log_level can be "default", "secure", "verbose" -log_level "default" -#password "password@read,add,control,admin" -#default_permissions "read,add,control,admin" -#filesystem_charset "UTF-8" diff --git a/audio/musicpd/files/mpd.sh b/audio/musicpd/files/mpd.sh deleted file mode 100644 index 5b2a8b765d4..00000000000 --- a/audio/musicpd/files/mpd.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: mpd.sh,v 1.2 2004/11/11 03:15:41 simonb Exp $ -# - -# PROVIDE: mpd -# REQUIRE: DAEMON -# KEYWORD: shutdown - -. /etc/rc.subr - -name="mpd" -rcvar=$name -command="@PREFIX@/bin/${name}" -required_files="@PKG_SYSCONFDIR@/mpd.conf" - -load_rc_config $name -run_rc_command "$1" diff --git a/audio/musicpd/options.mk b/audio/musicpd/options.mk deleted file mode 100644 index 99a7ea80a56..00000000000 --- a/audio/musicpd/options.mk +++ /dev/null @@ -1,72 +0,0 @@ -# $NetBSD: options.mk,v 1.7 2007/02/01 14:52:43 cbiere Exp $ - -PKG_OPTIONS_VAR= PKG_OPTIONS.musicpd -PKG_SUPPORTED_OPTIONS= aac audiofile flac iconv id3 libmikmod musepack ogg -PKG_SUGGESTED_OPTIONS= aac audiofile flac iconv id3 libmikmod musepack ogg - -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Maac) -. include "../../audio/faad2/buildlink3.mk" -CONFIGURE_ARGS+= --with-faad=${BUILDLINK_PREFIX.faad2} -.else -CONFIGURE_ARGS+= --disable-aac -.endif - -.if !empty(PKG_OPTIONS:Maudiofile) -. include "../../audio/libaudiofile/buildlink3.mk" -CONFIGURE_ARGS+= --with-audiofile=${BUILDLINK_PREFIX.audiofile} -CONFIGURE_ENV+= ac_cv_lib_iconv_iconv_open=yes -.else -CONFIGURE_ARGS+= --disable-audiofile -.endif - -.if !empty(PKG_OPTIONS:Mflac) -. include "../../audio/flac/buildlink3.mk" -CONFIGURE_ARGS+= --with-flac=${BUILDLINK_PREFIX.flac} -.else -CONFIGURE_ARGS+= --disable-flac -.endif - -.if !empty(PKG_OPTIONS:Miconv) -. include "../../converters/libiconv/buildlink3.mk" -CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_PREFIX.iconv} -.else -CONFIGURE_ARGS+= --disable-iconv -.endif - -.if !empty(PKG_OPTIONS:Mid3) -. include "../../audio/libid3tag/buildlink3.mk" -CONFIGURE_ARGS+= --with-id3tag=${BUILDLINK_PREFIX.libid3tag} -.else -CONFIGURE_ARGS+= --disable-id3 -.endif - -.if !empty(PKG_OPTIONS:Mlibmikmod) -. include "../../audio/libmikmod/buildlink3.mk" -CONFIGURE_ARGS+= --with-libmikmod=${BUILDLINK_PREFIX.libmikmod} -.else -CONFIGURE_ARGS+= --disable-libmikmod -.endif - -.if !empty(PKG_OPTIONS:Mmusepack) -. include "../../audio/libmpcdec/buildlink3.mk" -CONFIGURE_ENV+= mpcdec_prefix=${BUILDLINK_PREFIX.libmpcdec} -CONFIGURE_ARGS+= --enable-mpc -.else -CONFIGURE_ARGS+= --disable-mpc -.endif - -.if !empty(PKG_OPTIONS:Mogg) -. include "../../audio/libvorbis/buildlink3.mk" -CONFIGURE_ARGS+= --with-ogg=${BUILDLINK_PREFIX.libvorbis} -.else -CONFIGURE_ARGS+= --disable-ogg -.endif - -# when IPv6 support is enabled, mpd doesn't listen on an IPv4 address. -#.if !empty(PKG_OPTIONS:Minet6) -#CONFIGURE_ARGS+= --enable-ipv6 -#.else -CONFIGURE_ARGS+= --disable-ipv6 -#.endif diff --git a/audio/musicpd/patches/patch-aa b/audio/musicpd/patches/patch-aa deleted file mode 100644 index b2f4e0512fe..00000000000 --- a/audio/musicpd/patches/patch-aa +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-aa,v 1.4 2007/01/09 23:19:26 wiz Exp $ - -http://www.musicpd.org/mantis/view.php?id=1379 - -setenv() doesn't exist on all systems (e.g. solaris 9) - ---- src/main.c.orig 2006-10-10 23:56:58.000000000 +0000 -+++ src/main.c -@@ -279,7 +279,14 @@ static void changeToUser(void) - - /* this is needed by libs such as arts */ - if (userpwd->pw_dir) { -- setenv("HOME", userpwd->pw_dir, 1); -+ char *tmps; -+ /* HOME=%s so we need 5 for HOME= and 1 for the terminating \0 */ -+ tmps = (char *) malloc (strlen(userpwd->pw_dir) + 6); -+ if (tmps != NULL) { -+ sprintf (tmps, "HOME=%s", userpwd->pw_dir); -+ putenv (tmps); -+ free (tmps); -+ } - } - } - } diff --git a/audio/musicpd/patches/patch-ab b/audio/musicpd/patches/patch-ab deleted file mode 100644 index 453ceab45b5..00000000000 --- a/audio/musicpd/patches/patch-ab +++ /dev/null @@ -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 --git a/audio/musicpd/patches/patch-ac b/audio/musicpd/patches/patch-ac deleted file mode 100644 index 4b304abff16..00000000000 --- a/audio/musicpd/patches/patch-ac +++ /dev/null @@ -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; -- } -- } -- /* I don't think we need this bit here! -shank */ -- /*FLAC__file_decoder_process_until_end_of_file(flacDec); */ -- if (!dc->stop) { -- flacPrintErroredState(FLAC__seekable_stream_decoder_get_state -- (flacDec)); -- FLAC__seekable_stream_decoder_finish(flacDec); -- } -- /* send last little bit */ -- if (data.chunk_length > 0 && !dc->stop) { -- flacSendChunk(&data); -- flushOutputBuffer(data.cb); -- } -- -- /*if(dc->seek) { -- dc->seekError = 1; -- dc->seek = 0; -- } */ -- -- dc->state = DECODE_STATE_STOP; -- dc->stop = 0; -- --fail: -- if (data.replayGainInfo) -- freeReplayGainInfo(data.replayGainInfo); -- -- if (flacDec) -- FLAC__seekable_stream_decoder_delete(flacDec); -- -- closeInputStream(inStream); -- -- return ret; --} -- --static FLAC__SeekableStreamDecoderReadStatus flacRead(const -- FLAC__SeekableStreamDecoder -- * flacDec, -- FLAC__byte buf[], -- unsigned *bytes, -- void *fdata) -+static flac_read_status flacRead(const flac_decoder * flacDec, -+ FLAC__byte buf[], -+ unsigned *bytes, -+ void *fdata) - { - FlacData *data = (FlacData *) fdata; - size_t r; -@@ -207,55 +53,51 @@ static FLAC__SeekableStreamDecoderReadSt - } - *bytes = r; - -- if (*bytes == 0 && !inputStreamAtEOF(data->inStream) && !data->dc->stop) -- return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR; -- -- return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK; -+ if (r == 0 && !data->dc->stop) { -+ if (inputStreamAtEOF(data->inStream)) -+ return flac_read_status_eof; -+ else -+ return flac_read_status_abort; -+ } -+ return flac_read_status_continue; - } - --static FLAC__SeekableStreamDecoderSeekStatus flacSeek(const -- FLAC__SeekableStreamDecoder -- * flacDec, -- FLAC__uint64 offset, -- void *fdata) -+static flac_seek_status flacSeek(const flac_decoder * flacDec, -+ FLAC__uint64 offset, -+ void *fdata) - { - FlacData *data = (FlacData *) fdata; - - if (seekInputStream(data->inStream, offset, SEEK_SET) < 0) { -- return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR; -+ return flac_seek_status_error; - } - -- return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK; -+ return flac_tell_status_ok; - } - --static FLAC__SeekableStreamDecoderTellStatus flacTell(const -- FLAC__SeekableStreamDecoder -- * flacDec, -- FLAC__uint64 * offset, -- void *fdata) -+static flac_tell_status flacTell(const flac_decoder * flacDec, -+ FLAC__uint64 * offset, -+ void *fdata) - { - FlacData *data = (FlacData *) fdata; - - *offset = (long)(data->inStream->offset); - -- return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK; -+ return flac_tell_status_ok; - } - --static FLAC__SeekableStreamDecoderLengthStatus flacLength(const -- FLAC__SeekableStreamDecoder -- * flacDec, -- FLAC__uint64 * length, -- void *fdata) -+static flac_length_status flacLength(const flac_decoder * flacDec, -+ FLAC__uint64 * length, -+ void *fdata) - { - FlacData *data = (FlacData *) fdata; - - *length = (size_t) (data->inStream->size); - -- return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK; -+ return flac_length_status_ok; - } - --static FLAC__bool flacEOF(const FLAC__SeekableStreamDecoder * flacDec, -- void *fdata) -+static FLAC__bool flacEOF(const flac_decoder * flacDec, void *fdata) - { - FlacData *data = (FlacData *) fdata; - -@@ -264,52 +106,112 @@ static FLAC__bool flacEOF(const FLAC__Se - return false; - } - --static void flacError(const FLAC__SeekableStreamDecoder * dec, -+static void flacError(const flac_decoder *dec, - FLAC__StreamDecoderErrorStatus status, void *fdata) - { - flac_error_common_cb("flac", status, (FlacData *) fdata); - } - -+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7 - static void flacPrintErroredState(FLAC__SeekableStreamDecoderState state) - { -+ const char *str = ""; /* "" to silence compiler warning */ - switch (state) { -+ case FLAC__SEEKABLE_STREAM_DECODER_OK: -+ case FLAC__SEEKABLE_STREAM_DECODER_SEEKING: -+ case FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM: -+ return; - case FLAC__SEEKABLE_STREAM_DECODER_MEMORY_ALLOCATION_ERROR: -- ERROR("flac allocation error\n"); -+ str = "allocation error"; - break; - case FLAC__SEEKABLE_STREAM_DECODER_READ_ERROR: -- ERROR("flac read error\n"); -+ str = "read error"; - break; - case FLAC__SEEKABLE_STREAM_DECODER_SEEK_ERROR: -- ERROR("flac seek error\n"); -+ str = "seek error"; - break; - case FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR: -- ERROR("flac seekable stream error\n"); -+ str = "seekable stream error"; - break; - case FLAC__SEEKABLE_STREAM_DECODER_ALREADY_INITIALIZED: -- ERROR("flac decoder already initialized\n"); -+ str = "decoder already initialized"; - break; - case FLAC__SEEKABLE_STREAM_DECODER_INVALID_CALLBACK: -- ERROR("invalid flac callback\n"); -+ str = "invalid callback"; - break; - case FLAC__SEEKABLE_STREAM_DECODER_UNINITIALIZED: -- ERROR("flac decoder uninitialized\n"); -+ str = "decoder uninitialized"; -+ } -+ ERROR("flac %s\n", str); -+} -+ -+static int flac_init(FLAC__SeekableStreamDecoder *dec, -+ FLAC__SeekableStreamDecoderReadCallback read_cb, -+ FLAC__SeekableStreamDecoderSeekCallback seek_cb, -+ FLAC__SeekableStreamDecoderTellCallback tell_cb, -+ FLAC__SeekableStreamDecoderLengthCallback length_cb, -+ FLAC__SeekableStreamDecoderEofCallback eof_cb, -+ FLAC__SeekableStreamDecoderWriteCallback write_cb, -+ FLAC__SeekableStreamDecoderMetadataCallback metadata_cb, -+ FLAC__SeekableStreamDecoderErrorCallback error_cb, -+ void *data) -+{ -+ int s = 1; -+ s &= FLAC__seekable_stream_decoder_set_read_callback(dec, read_cb); -+ s &= FLAC__seekable_stream_decoder_set_seek_callback(dec, seek_cb); -+ s &= FLAC__seekable_stream_decoder_set_tell_callback(dec, tell_cb); -+ s &= FLAC__seekable_stream_decoder_set_length_callback(dec, length_cb); -+ s &= FLAC__seekable_stream_decoder_set_eof_callback(dec, eof_cb); -+ s &= FLAC__seekable_stream_decoder_set_write_callback(dec, write_cb); -+ s &= FLAC__seekable_stream_decoder_set_metadata_callback(dec, -+ metadata_cb); -+ s &= FLAC__seekable_stream_decoder_set_metadata_respond(dec, -+ FLAC__METADATA_TYPE_VORBIS_COMMENT); -+ s &= FLAC__seekable_stream_decoder_set_error_callback(dec, error_cb); -+ s &= FLAC__seekable_stream_decoder_set_client_data(dec, data); -+ if (!s || (FLAC__seekable_stream_decoder_init(dec) != -+ FLAC__SEEKABLE_STREAM_DECODER_OK)) -+ return 0; -+ return 1; -+} -+#else /* FLAC_API_VERSION_CURRENT >= 7 */ -+static void flacPrintErroredState(FLAC__StreamDecoderState state) -+{ -+ const char *str = ""; /* "" to silence compiler warning */ -+ switch (state) { -+ case FLAC__STREAM_DECODER_SEARCH_FOR_METADATA: -+ case FLAC__STREAM_DECODER_READ_METADATA: -+ case FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC: -+ case FLAC__STREAM_DECODER_READ_FRAME: -+ case FLAC__STREAM_DECODER_END_OF_STREAM: -+ return; -+ case FLAC__STREAM_DECODER_OGG_ERROR: -+ str = "error in the Ogg layer"; - break; -- case FLAC__SEEKABLE_STREAM_DECODER_OK: -- case FLAC__SEEKABLE_STREAM_DECODER_SEEKING: -- case FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM: -+ case FLAC__STREAM_DECODER_SEEK_ERROR: -+ str = "seek error"; -+ break; -+ case FLAC__STREAM_DECODER_ABORTED: -+ str = "decoder aborted by read"; -+ break; -+ case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR: -+ str = "allocation error"; - break; -+ case FLAC__STREAM_DECODER_UNINITIALIZED: -+ str = "decoder uninitialized"; - } -+ ERROR("flac %s\n", str); - } -+#endif /* FLAC_API_VERSION_CURRENT >= 7 */ - --static void flacMetadata(const FLAC__SeekableStreamDecoder * dec, -+static void flacMetadata(const flac_decoder * dec, - const FLAC__StreamMetadata * block, void *vdata) - { - flac_metadata_common_cb(block, (FlacData *) vdata); - } - --static FLAC__StreamDecoderWriteStatus flacWrite(const -- FLAC__SeekableStreamDecoder * -- dec, const FLAC__Frame * frame, -+static FLAC__StreamDecoderWriteStatus flacWrite(const flac_decoder *dec, -+ const FLAC__Frame * frame, - const FLAC__int32 * const buf[], - void *vdata) - { -@@ -325,7 +227,7 @@ static FLAC__StreamDecoderWriteStatus fl - timeChange = ((float)samples) / frame->header.sample_rate; - data->time += timeChange; - -- FLAC__seekable_stream_decoder_get_decode_position(dec, &newPosition); -+ flac_get_decode_position(dec, &newPosition); - if (data->position) { - data->bitRate = - ((newPosition - data->position) * 8.0 / timeChange) -@@ -438,12 +340,174 @@ static MpdTag *flacTagDup(char *file) - return ret; - } - -+static int flac_decode_internal(OutputBuffer * cb, DecoderControl * dc, -+ InputStream * inStream, int is_ogg) -+{ -+ flac_decoder *flacDec; -+ FlacData data; -+ const char *err = NULL; -+ -+ if (!(flacDec = flac_new())) -+ return -1; -+ init_FlacData(&data, cb, dc, inStream); -+ if (is_ogg) { -+ if (!flac_ogg_init(flacDec, flacRead, flacSeek, flacTell, -+ flacLength, flacEOF, flacWrite, flacMetadata, -+ flacError, (void *)&data)) { -+ err = "doing Ogg init()"; -+ goto fail; -+ } -+ } else { -+ if (!flac_init(flacDec, flacRead, flacSeek, flacTell, -+ flacLength, flacEOF, flacWrite, flacMetadata, -+ flacError, (void *)&data)) { -+ err = "doing init()"; -+ goto fail; -+ } -+ if (!flac_process_metadata(flacDec)) { -+ err = "problem reading metadata"; -+ goto fail; -+ } -+ } -+ -+ dc->state = DECODE_STATE_DECODE; -+ -+ while (1) { -+ if (!flac_process_single(flacDec)) -+ break; -+ if (flac_get_state(flacDec) == flac_decoder_eof) -+ break; -+ if (dc->seek) { -+ FLAC__uint64 sampleToSeek = dc->seekWhere * -+ dc->audioFormat.sampleRate + 0.5; -+ if (flac_seek_absolute(flacDec, sampleToSeek)) { -+ clearOutputBuffer(cb); -+ data.time = ((float)sampleToSeek) / -+ dc->audioFormat.sampleRate; -+ data.position = 0; -+ } else -+ dc->seekError = 1; -+ dc->seek = 0; -+ } -+ } -+ if (!dc->stop) { -+ flacPrintErroredState(flac_get_state(flacDec)); -+ flac_finish(flacDec); -+ } -+ /* send last little bit */ -+ if (data.chunk_length > 0 && !dc->stop) { -+ flacSendChunk(&data); -+ flushOutputBuffer(data.cb); -+ } -+ -+ /*if(dc->seek) { -+ dc->seekError = 1; -+ dc->seek = 0; -+ } */ -+ -+ dc->state = DECODE_STATE_STOP; -+ dc->stop = 0; -+ -+fail: -+ if (data.replayGainInfo) -+ freeReplayGainInfo(data.replayGainInfo); -+ -+ if (flacDec) -+ flac_delete(flacDec); -+ -+ closeInputStream(inStream); -+ -+ if (err) { -+ ERROR("flac %s\n", err); -+ return -1; -+ } -+ return 0; -+} -+ -+static int flac_decode(OutputBuffer * cb, DecoderControl * dc, -+ InputStream * inStream) -+{ -+ return flac_decode_internal(cb, dc, inStream, 0); -+} -+ -+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7 -+# define flac_plugin_init NULL -+#else /* FLAC_API_VERSION_CURRENT >= 7 */ -+/* some of this stuff is duplicated from oggflac_plugin.c */ -+extern InputPlugin oggflacPlugin; -+ -+static MpdTag *oggflac_tag_dup(char *file) -+{ -+ MpdTag *ret = NULL; -+ FLAC__Metadata_Iterator *it; -+ FLAC__StreamMetadata *block; -+ FLAC__Metadata_Chain *chain = FLAC__metadata_chain_new(); -+ -+ if (!(FLAC__metadata_chain_read_ogg(chain, file))) -+ goto out; -+ it = FLAC__metadata_iterator_new(); -+ FLAC__metadata_iterator_init(it, chain); -+ do { -+ if (!(block = FLAC__metadata_iterator_get_block(it))) -+ break; -+ if (block->type == FLAC__METADATA_TYPE_VORBIS_COMMENT) { -+ ret = copyVorbisCommentBlockToMpdTag(block, ret); -+ } else if (block->type == FLAC__METADATA_TYPE_STREAMINFO) { -+ if (!ret) -+ ret = newMpdTag(); -+ ret->time = ((float)block->data.stream_info. -+ total_samples) / -+ block->data.stream_info.sample_rate + 0.5; -+ } -+ } while (FLAC__metadata_iterator_next(it)); -+ FLAC__metadata_iterator_delete(it); -+out: -+ FLAC__metadata_chain_delete(chain); -+ return ret; -+} -+ -+static int oggflac_decode(OutputBuffer * cb, DecoderControl * dc, -+ InputStream * inStream) -+{ -+ return flac_decode_internal(cb, dc, inStream, 1); -+} -+ -+static unsigned int oggflac_try_decode(InputStream * inStream) -+{ -+ return (ogg_stream_type_detect(inStream) == FLAC) ? 1 : 0; -+} -+ -+static char *oggflac_suffixes[] = { "ogg", NULL }; -+static char *oggflac_mime_types[] = { "application/ogg", NULL }; -+ -+static int flac_plugin_init(void) -+{ -+ if (!FLAC_API_SUPPORTS_OGG_FLAC) { -+ DEBUG("libFLAC does not support OggFLAC\n"); -+ return 1; -+ } -+ DEBUG("libFLAC supports OggFLAC, initializing OggFLAC support\n"); -+ assert(oggflacPlugin.name == NULL); -+ oggflacPlugin.name = "oggflac"; -+ oggflacPlugin.tryDecodeFunc = oggflac_try_decode; -+ oggflacPlugin.streamDecodeFunc = oggflac_decode; -+ oggflacPlugin.tagDupFunc = oggflac_tag_dup; -+ oggflacPlugin.streamTypes = INPUT_PLUGIN_STREAM_URL | -+ INPUT_PLUGIN_STREAM_FILE; -+ oggflacPlugin.suffixes = oggflac_suffixes; -+ oggflacPlugin.mimeTypes = oggflac_mime_types; -+ loadInputPlugin(&oggflacPlugin); -+ return 1; -+} -+ -+#endif /* FLAC_API_VERSION_CURRENT >= 7 */ -+ - static char *flacSuffixes[] = { "flac", NULL }; - static char *flac_mime_types[] = { "application/x-flac", NULL }; - - InputPlugin flacPlugin = { - "flac", -- NULL, -+ flac_plugin_init, - NULL, - NULL, - flac_decode, diff --git a/audio/musicpd/patches/patch-ad b/audio/musicpd/patches/patch-ad deleted file mode 100644 index f99a8fcc250..00000000000 --- a/audio/musicpd/patches/patch-ad +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2007/01/09 23:19:26 wiz Exp $ - ---- src/inputPlugins/oggflac_plugin.c.orig 2006-10-10 23:56:55.000000000 +0000 -+++ src/inputPlugins/oggflac_plugin.c -@@ -19,11 +19,10 @@ - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - --#include "../inputPlugin.h" -+#include "_flac_common.h" - - #ifdef HAVE_OGGFLAC - --#include "_flac_common.h" - #include "_ogg_common.h" - - #include "../utils.h" -@@ -37,8 +36,6 @@ - #include <stdio.h> - #include <string.h> - #include <unistd.h> --#include <OggFLAC/seekable_stream_decoder.h> --#include <FLAC/metadata.h> - - static void oggflac_cleanup(InputStream * inStream, - FlacData * data, |