Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv30305/main/finkinfo/sound
Modified Files:
Tag: pangocairo-branch
flac.info flac.patch ices.info jack.info libmad.info
libsndfile1.info libtunepimp3.info sdl-sound.info shntool.info
snd.info twolame.info vorbis-tools.info
Added Files:
Tag: pangocairo-branch
flac-xmms.info libsndfile1.patch libtunepimp3.patch
Removed Files:
Tag: pangocairo-branch
flac-nox.info flac-nox.patch libtunepimp2.info
Log Message:
merge from head
--- libtunepimp2.info DELETED ---
--- NEW FILE: libsndfile1.patch ---
diff -ruN libsndfile-1.0.17/patches/flac-1.1.4.dpatch
libsndfile-1.0.17.new/patches/flac-1.1.4.dpatch
--- libsndfile-1.0.17/patches/flac-1.1.4.dpatch 1969-12-31 19:00:00.000000000
-0500
+++ libsndfile-1.0.17.new/patches/flac-1.1.4.dpatch 2008-02-24
21:22:48.000000000 -0500
@@ -0,0 +1,486 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## flac-1.1.4.dpatch by Samuel Mimram <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Adapt to FLAC 1.1.4 API.
+## DP: Patch stolen from
http://cvs.archlinux.org/cgi-bin/viewcvs.cgi/lib/libsndfile/flac-1.1.4.patch.
+
[EMAIL PROTECTED]@
+diff -urNad libsndfile-1.0.17~/configure.ac libsndfile-1.0.17/configure.ac
+--- libsndfile-1.0.17~/configure.ac 2006-08-31 11:39:37.000000000 +0200
++++ libsndfile-1.0.17/configure.ac 2007-06-15 12:38:53.000000000 +0200
+@@ -339,7 +339,8 @@
+ if test "x$HAVE_FLAC_1_1_1" = xyes ; then
+ AC_DEFINE(HAVE_FLAC_1_1_1, [1], [Define to 1 if you
have libflac 1.1.1])
+ fi
+- FLAC_LIBS="-lFLAC"
++ # in FLAC 1.1.3 libOggFLAC was merged into libFLAC, hence we
need -logg
++ FLAC_LIBS="-lFLAC -logg"
+ fi
+ fi
+
+diff -urNad libsndfile-1.0.17~/src/flac.c libsndfile-1.0.17/src/flac.c
+--- libsndfile-1.0.17~/src/flac.c 2006-08-31 11:22:19.000000000 +0200
++++ libsndfile-1.0.17/src/flac.c 2007-06-15 12:38:53.000000000 +0200
+@@ -46,6 +46,13 @@
+ #include "sfendian.h"
+ #include "float_cast.h"
+
++/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
++#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
++#define LEGACY_FLAC
++#else
++#undef LEGACY_FLAC
++#endif
++
+
/*------------------------------------------------------------------------------
+ ** Private static functions.
+ */
+@@ -60,8 +67,14 @@
+ } PFLAC_PCM ;
+
+ typedef struct
+-{ FLAC__SeekableStreamDecoder *fsd ;
++{
++#ifdef LEGACY_FLAC
++ FLAC__SeekableStreamDecoder *fsd ;
+ FLAC__SeekableStreamEncoder *fse ;
++#else
++ FLAC__StreamDecoder *fsd ;
++ FLAC__StreamEncoder *fse ;
++#endif
+ PFLAC_PCM pcmtype ;
+ void* ptr ;
+ unsigned pos, len, remain ;
+@@ -108,6 +121,7 @@
+ static int flac_command (SF_PRIVATE *psf, int command, void *data, int
datasize) ;
+
+ /* Decoder Callbacks */
++#ifdef LEGACY_FLAC
+ static FLAC__SeekableStreamDecoderReadStatus sf_flac_read_callback (const
FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer [], unsigned *bytes,
void *client_data) ;
+ static FLAC__SeekableStreamDecoderSeekStatus sf_flac_seek_callback (const
FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void
*client_data) ;
+ static FLAC__SeekableStreamDecoderTellStatus sf_flac_tell_callback (const
FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void
*client_data) ;
+@@ -116,13 +130,29 @@
+ static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const
FLAC__SeekableStreamDecoder *decoder, const FLAC__Frame *frame, const
FLAC__int32 * const buffer [], void *client_data) ;
+ static void sf_flac_meta_callback (const FLAC__SeekableStreamDecoder
*decoder, const FLAC__StreamMetadata *metadata, void *client_data) ;
+ static void sf_flac_error_callback (const FLAC__SeekableStreamDecoder
*decoder, FLAC__StreamDecoderErrorStatus status, void *client_data) ;
++#else
++static FLAC__StreamDecoderReadStatus sf_flac_read_callback (const
FLAC__StreamDecoder *decoder, FLAC__byte buffer [], size_t *bytes, void
*client_data) ;
++static FLAC__StreamDecoderSeekStatus sf_flac_seek_callback (const
FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void
*client_data) ;
++static FLAC__StreamDecoderTellStatus sf_flac_tell_callback (const
FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void
*client_data) ;
++static FLAC__StreamDecoderLengthStatus sf_flac_length_callback (const
FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data) ;
++static FLAC__bool sf_flac_eof_callback (const FLAC__StreamDecoder *decoder,
void *client_data) ;
++static FLAC__StreamDecoderWriteStatus sf_flac_write_callback (const
FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 *
const buffer [], void *client_data) ;
++static void sf_flac_meta_callback (const FLAC__StreamDecoder *decoder, const
FLAC__StreamMetadata *metadata, void *client_data) ;
++static void sf_flac_error_callback (const FLAC__StreamDecoder *decoder,
FLAC__StreamDecoderErrorStatus status, void *client_data) ;
++#endif
+
+ /* Encoder Callbacks */
++#ifdef LEGACY_FLAC
+ static FLAC__SeekableStreamEncoderSeekStatus sf_flac_enc_seek_callback (const
FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void
*client_data) ;
+ #ifdef HAVE_FLAC_1_1_1
+ static FLAC__SeekableStreamEncoderTellStatus sf_flac_enc_tell_callback (const
FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void
*client_data) ;
+ #endif
+ static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const
FLAC__SeekableStreamEncoder *encoder, const FLAC__byte buffer [], unsigned
bytes, unsigned samples, unsigned current_frame, void *client_data) ;
++#else
++static FLAC__StreamEncoderSeekStatus sf_flac_enc_seek_callback (const
FLAC__StreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void
*client_data) ;
++static FLAC__StreamEncoderTellStatus sf_flac_enc_tell_callback (const
FLAC__StreamEncoder *encoder, FLAC__uint64 *absolute_byte_offset, void
*client_data) ;
++static FLAC__StreamEncoderWriteStatus sf_flac_enc_write_callback (const
FLAC__StreamEncoder *encoder, const FLAC__byte buffer [], size_t bytes,
unsigned samples, unsigned current_frame, void *client_data) ;
++#endif
+
+ static const int legal_sample_rates [] =
+ { 8000, 16000, 22050, 24000, 32000, 44100, 48000, 96000
+@@ -283,51 +313,99 @@
+ } /* flac_buffer_copy */
+
+
++#ifdef LEGACY_FLAC
+ static FLAC__SeekableStreamDecoderReadStatus
+ sf_flac_read_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder),
FLAC__byte buffer [], unsigned *bytes, void *client_data)
++#else
++static FLAC__StreamDecoderReadStatus
++sf_flac_read_callback (const FLAC__StreamDecoder * UNUSED (decoder),
FLAC__byte buffer [], size_t *bytes, void *client_data)
++#endif
+ { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
+
+ *bytes = psf_fread (buffer, 1, *bytes, psf) ;
+ if (*bytes > 0 && psf->error == 0)
++#ifdef LEGACY_FLAC
+ return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK ;
+
+ return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR ;
++#else
++ return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE ;
++
++ return FLAC__STREAM_DECODER_READ_STATUS_ABORT ;
++#endif
+ } /* sf_flac_read_callback */
+
++#ifdef LEGACY_FLAC
+ static FLAC__SeekableStreamDecoderSeekStatus
+ sf_flac_seek_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder),
FLAC__uint64 absolute_byte_offset, void *client_data)
++#else
++static FLAC__StreamDecoderSeekStatus
++sf_flac_seek_callback (const FLAC__StreamDecoder * UNUSED (decoder),
FLAC__uint64 absolute_byte_offset, void *client_data)
++#endif
+ { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
+
+ psf_fseek (psf, absolute_byte_offset, SEEK_SET) ;
+ if (psf->error)
++#ifdef LEGACY_FLAC
+ return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR ;
+
+ return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK ;
++#else
++ return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR ;
++
++ return FLAC__STREAM_DECODER_SEEK_STATUS_OK ;
++#endif
+ } /* sf_flac_seek_callback */
+
++#ifdef LEGACY_FLAC
+ static FLAC__SeekableStreamDecoderTellStatus
+ sf_flac_tell_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder),
FLAC__uint64 *absolute_byte_offset, void *client_data)
++#else
++static FLAC__StreamDecoderTellStatus
++sf_flac_tell_callback (const FLAC__StreamDecoder * UNUSED (decoder),
FLAC__uint64 *absolute_byte_offset, void *client_data)
++#endif
+ { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
+
+ *absolute_byte_offset = psf_ftell (psf) ;
+ if (psf->error)
++#ifdef LEGACY_FLAC
+ return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_ERROR ;
+
+ return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK ;
++#else
++ return FLAC__STREAM_DECODER_TELL_STATUS_ERROR ;
++
++ return FLAC__STREAM_DECODER_TELL_STATUS_OK ;
++#endif
+ } /* sf_flac_tell_callback */
+
++#ifdef LEGACY_FLAC
+ static FLAC__SeekableStreamDecoderLengthStatus
+ sf_flac_length_callback (const FLAC__SeekableStreamDecoder * UNUSED
(decoder), FLAC__uint64 *stream_length, void *client_data)
++#else
++static FLAC__StreamDecoderLengthStatus
++sf_flac_length_callback (const FLAC__StreamDecoder * UNUSED (decoder),
FLAC__uint64 *stream_length, void *client_data)
++#endif
+ { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
+
+ if ((*stream_length = psf->filelength) == 0)
++#ifdef LEGACY_FLAC
+ return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR ;
+
+ return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK ;
++#else
++ return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR ;
++
++ return FLAC__STREAM_DECODER_LENGTH_STATUS_OK ;
++#endif
+ } /* sf_flac_length_callback */
+
+ static FLAC__bool
++#ifdef LEGACY_FLAC
+ sf_flac_eof_callback (const FLAC__SeekableStreamDecoder *UNUSED (decoder),
void *client_data)
++#else
++sf_flac_eof_callback (const FLAC__StreamDecoder *UNUSED (decoder), void
*client_data)
++#endif
+ { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
+
+ if (psf_ftell (psf) == psf->filelength)
+@@ -337,7 +415,11 @@
+ } /* sf_flac_eof_callback */
+
+ static FLAC__StreamDecoderWriteStatus
++#ifdef LEGACY_FLAC
+ sf_flac_write_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder),
const FLAC__Frame *frame, const FLAC__int32 * const buffer [], void
*client_data)
++#else
++sf_flac_write_callback (const FLAC__StreamDecoder * UNUSED (decoder), const
FLAC__Frame *frame, const FLAC__int32 * const buffer [], void *client_data)
++#endif
+ { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
+ FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
+
+@@ -353,7 +435,11 @@
+ } /* sf_flac_write_callback */
+
+ static void
++#ifdef LEGACY_FLAC
+ sf_flac_meta_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder),
const FLAC__StreamMetadata *metadata, void *client_data)
++#else
++sf_flac_meta_callback (const FLAC__StreamDecoder * UNUSED (decoder), const
FLAC__StreamMetadata *metadata, void *client_data)
++#endif
+ { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
+
+ switch (metadata->type)
+@@ -387,7 +473,11 @@
+ } /* sf_flac_meta_callback */
+
+ static void
++#ifdef LEGACY_FLAC
+ sf_flac_error_callback (const FLAC__SeekableStreamDecoder * UNUSED (decoder),
FLAC__StreamDecoderErrorStatus status, void *client_data)
++#else
++sf_flac_error_callback (const FLAC__StreamDecoder * UNUSED (decoder),
FLAC__StreamDecoderErrorStatus status, void *client_data)
++#endif
+ { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
+
+ psf_log_printf (psf, "ERROR : %s\n",
FLAC__StreamDecoderErrorStatusString [status]) ;
+@@ -407,17 +497,29 @@
+ return ;
+ } /* sf_flac_error_callback */
+
++#ifdef LEGACY_FLAC
+ static FLAC__SeekableStreamEncoderSeekStatus
+ sf_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * UNUSED
(encoder), FLAC__uint64 absolute_byte_offset, void *client_data)
++#else
++static FLAC__StreamEncoderSeekStatus
++sf_flac_enc_seek_callback (const FLAC__StreamEncoder * UNUSED (encoder),
FLAC__uint64 absolute_byte_offset, void *client_data)
++#endif
+ { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
+
+ psf_fseek (psf, absolute_byte_offset, SEEK_SET) ;
+ if (psf->error)
++#ifdef LEGACY_FLAC
+ return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_ERROR ;
+
+ return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK ;
++#else
++ return FLAC__STREAM_ENCODER_SEEK_STATUS_ERROR ;
++
++ return FLAC__STREAM_ENCODER_SEEK_STATUS_OK ;
++#endif
+ } /* sf_flac_enc_seek_callback */
+
++#ifdef LEGACY_FLAC
+ #ifdef HAVE_FLAC_1_1_1
+ static FLAC__SeekableStreamEncoderTellStatus
+ sf_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder *UNUSED
(encoder), FLAC__uint64 *absolute_byte_offset, void *client_data)
+@@ -430,9 +532,25 @@
+ return FLAC__SEEKABLE_STREAM_ENCODER_TELL_STATUS_OK ;
+ } /* sf_flac_enc_tell_callback */
+ #endif
++#else
++static FLAC__StreamEncoderTellStatus
++sf_flac_enc_tell_callback (const FLAC__StreamEncoder *UNUSED (encoder),
FLAC__uint64 *absolute_byte_offset, void *client_data)
++{ SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
++
++ *absolute_byte_offset = psf_ftell (psf) ;
++ if (psf->error)
++ return FLAC__STREAM_ENCODER_TELL_STATUS_ERROR ;
++
++ return FLAC__STREAM_ENCODER_TELL_STATUS_OK ;
++} /* sf_flac_enc_tell_callback */
++#endif
+
+ static FLAC__StreamEncoderWriteStatus
++#ifdef LEGACY_FLAC
+ sf_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * UNUSED
(encoder), const FLAC__byte buffer [], unsigned bytes, unsigned UNUSED
(samples), unsigned UNUSED (current_frame), void *client_data)
++#else
++sf_flac_enc_write_callback (const FLAC__StreamEncoder * UNUSED (encoder),
const FLAC__byte buffer [], size_t bytes, unsigned UNUSED (samples), unsigned
UNUSED (current_frame), void *client_data)
++#endif
+ { SF_PRIVATE *psf = (SF_PRIVATE*) client_data ;
+
+ if (psf_fwrite (buffer, 1, bytes, psf) == bytes && psf->error == 0)
+@@ -509,15 +627,27 @@
+ return 0 ;
+
+ if (psf->mode == SFM_WRITE)
+- { FLAC__seekable_stream_encoder_finish (pflac->fse) ;
++ {
++#ifdef LEGACY_FLAC
++ FLAC__seekable_stream_encoder_finish (pflac->fse) ;
+ FLAC__seekable_stream_encoder_delete (pflac->fse) ;
++#else
++ FLAC__stream_encoder_finish (pflac->fse) ;
++ FLAC__stream_encoder_delete (pflac->fse) ;
++#endif
+ if (pflac->encbuffer)
+ free (pflac->encbuffer) ;
+ } ;
+
+ if (psf->mode == SFM_READ)
+- { FLAC__seekable_stream_decoder_finish (pflac->fsd) ;
++ {
++#ifdef LEGACY_FLAC
++ FLAC__seekable_stream_decoder_finish (pflac->fsd) ;
+ FLAC__seekable_stream_decoder_delete (pflac->fsd) ;
++#else
++ FLAC__stream_decoder_finish (pflac->fsd) ;
++ FLAC__stream_decoder_delete (pflac->fsd) ;
++#endif
+ } ;
+
+ for (k = 0 ; k < ARRAY_LEN (pflac->rbuffer) ; k++)
+@@ -546,17 +676,6 @@
+ return SFE_FLAC_BAD_SAMPLE_RATE ;
+
+ psf_fseek (psf, 0, SEEK_SET) ;
+- if ((pflac->fse = FLAC__seekable_stream_encoder_new ()) == NULL)
+- return SFE_FLAC_NEW_DECODER ;
+- FLAC__seekable_stream_encoder_set_write_callback (pflac->fse,
sf_flac_enc_write_callback) ;
+- FLAC__seekable_stream_encoder_set_seek_callback (pflac->fse,
sf_flac_enc_seek_callback) ;
+-
+-#ifdef HAVE_FLAC_1_1_1
+- FLAC__seekable_stream_encoder_set_tell_callback (pflac->fse,
sf_flac_enc_tell_callback) ;
+-#endif
+- FLAC__seekable_stream_encoder_set_client_data (pflac->fse, psf) ;
+- FLAC__seekable_stream_encoder_set_channels (pflac->fse,
psf->sf.channels) ;
+- FLAC__seekable_stream_encoder_set_sample_rate (pflac->fse,
psf->sf.samplerate) ;
+
+ switch (psf->sf.format & SF_FORMAT_SUBMASK)
+ { case SF_FORMAT_PCM_S8 :
+@@ -574,12 +693,36 @@
+ break ;
+ } ;
+
++#ifdef LEGACY_FLAC
++ if ((pflac->fse = FLAC__seekable_stream_encoder_new ()) == NULL)
++ return SFE_FLAC_NEW_DECODER ;
++ FLAC__seekable_stream_encoder_set_write_callback (pflac->fse,
sf_flac_enc_write_callback) ;
++ FLAC__seekable_stream_encoder_set_seek_callback (pflac->fse,
sf_flac_enc_seek_callback) ;
++
++#ifdef HAVE_FLAC_1_1_1
++ FLAC__seekable_stream_encoder_set_tell_callback (pflac->fse,
sf_flac_enc_tell_callback) ;
++#endif
++ FLAC__seekable_stream_encoder_set_client_data (pflac->fse, psf) ;
++ FLAC__seekable_stream_encoder_set_channels (pflac->fse,
psf->sf.channels) ;
++ FLAC__seekable_stream_encoder_set_sample_rate (pflac->fse,
psf->sf.samplerate) ;
+ FLAC__seekable_stream_encoder_set_bits_per_sample (pflac->fse, bps) ;
+
+ if ((bps = FLAC__seekable_stream_encoder_init (pflac->fse)) !=
FLAC__SEEKABLE_STREAM_DECODER_OK)
+ { psf_log_printf (psf, "Error : FLAC encoder init returned error
: %s\n", FLAC__seekable_stream_encoder_get_resolved_state_string (pflac->fse)) ;
+ return SFE_FLAC_INIT_DECODER ;
+ } ;
++#else
++ if ((pflac->fse = FLAC__stream_encoder_new ()) == NULL)
++ return SFE_FLAC_NEW_DECODER ;
++ FLAC__stream_encoder_set_channels (pflac->fse, psf->sf.channels) ;
++ FLAC__stream_encoder_set_sample_rate (pflac->fse, psf->sf.samplerate) ;
++ FLAC__stream_encoder_set_bits_per_sample (pflac->fse, bps) ;
++
++ if ((bps = FLAC__stream_encoder_init_stream (pflac->fse,
sf_flac_enc_write_callback, sf_flac_enc_seek_callback,
sf_flac_enc_tell_callback, NULL, psf)) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
++ { psf_log_printf (psf, "Error : FLAC encoder init returned error
: %s\n", FLAC__StreamEncoderInitStatusString[bps]) ;
++ return SFE_FLAC_INIT_DECODER ;
++ } ;
++#endif
+
+ if (psf->error == 0)
+ psf->dataoffset = psf_ftell (psf) ;
+@@ -593,6 +736,7 @@
+ { FLAC_PRIVATE* pflac = (FLAC_PRIVATE*) psf->codec_data ;
+
+ psf_fseek (psf, 0, SEEK_SET) ;
++#ifdef LEGACY_FLAC
+ if ((pflac->fsd = FLAC__seekable_stream_decoder_new ()) == NULL)
+ return SFE_FLAC_NEW_DECODER ;
+
+@@ -610,9 +754,22 @@
+ return SFE_FLAC_INIT_DECODER ;
+
+ FLAC__seekable_stream_decoder_process_until_end_of_metadata
(pflac->fsd) ;
++#else
++ if ((pflac->fsd = FLAC__stream_decoder_new ()) == NULL)
++ return SFE_FLAC_NEW_DECODER ;
++
++ if (FLAC__stream_decoder_init_stream (pflac->fsd,
sf_flac_read_callback, sf_flac_seek_callback, sf_flac_tell_callback,
sf_flac_length_callback, sf_flac_eof_callback, sf_flac_write_callback,
sf_flac_meta_callback, sf_flac_error_callback, psf) !=
FLAC__STREAM_DECODER_INIT_STATUS_OK)
++ return SFE_FLAC_INIT_DECODER ;
++
++ FLAC__stream_decoder_process_until_end_of_metadata (pflac->fsd) ;
++#endif
+ if (psf->error == 0)
+ { FLAC__uint64 position ;
++#ifdef LEGACY_FLAC
+ FLAC__seekable_stream_decoder_get_decode_position (pflac->fsd,
&position) ;
++#else
++ FLAC__stream_decoder_get_decode_position (pflac->fsd,
&position) ;
++#endif
+ psf->dataoffset = position ;
+ } ;
+
+@@ -676,10 +833,18 @@
+ flac_buffer_copy (psf) ;
+
+ while (pflac->pos < pflac->len)
+- { if (FLAC__seekable_stream_decoder_process_single (pflac->fsd)
== 0)
++ {
++#ifdef LEGACY_FLAC
++ if (FLAC__seekable_stream_decoder_process_single (pflac->fsd)
== 0)
+ break ;
+ if (FLAC__seekable_stream_decoder_get_state (pflac->fsd) !=
FLAC__SEEKABLE_STREAM_DECODER_OK)
+ break ;
++#else
++ if (FLAC__stream_decoder_process_single (pflac->fsd) == 0)
++ break ;
++ if (FLAC__stream_decoder_get_state (pflac->fsd) >=
FLAC__STREAM_DECODER_END_OF_STREAM)
++ break ;
++#endif
+ } ;
+
+ pflac->ptr = NULL ;
+@@ -795,7 +960,11 @@
+ while (len > 0)
+ { writecount = (len >= bufferlen) ? bufferlen : (int) len ;
+ convert (ptr + total, buffer, writecount) ;
++#ifdef LEGACY_FLAC
+ if (FLAC__seekable_stream_encoder_process_interleaved
(pflac->fse, buffer, writecount/psf->sf.channels))
++#else
++ if (FLAC__stream_encoder_process_interleaved (pflac->fse,
buffer, writecount/psf->sf.channels))
++#endif
+ thiswrite = writecount ;
+ else
+ break ;
+@@ -837,7 +1006,11 @@
+ while (len > 0)
+ { writecount = (len >= bufferlen) ? bufferlen : (int) len ;
+ convert (ptr + total, buffer, writecount) ;
++#ifdef LEGACY_FLAC
+ if (FLAC__seekable_stream_encoder_process_interleaved
(pflac->fse, buffer, writecount/psf->sf.channels))
++#else
++ if (FLAC__stream_encoder_process_interleaved (pflac->fse,
buffer, writecount/psf->sf.channels))
++#endif
+ thiswrite = writecount ;
+ else
+ break ;
+@@ -879,7 +1052,11 @@
+ while (len > 0)
+ { writecount = (len >= bufferlen) ? bufferlen : (int) len ;
+ convert (ptr + total, buffer, writecount, psf->norm_float) ;
++#ifdef LEGACY_FLAC
+ if (FLAC__seekable_stream_encoder_process_interleaved
(pflac->fse, buffer, writecount/psf->sf.channels))
++#else
++ if (FLAC__stream_encoder_process_interleaved (pflac->fse,
buffer, writecount/psf->sf.channels))
++#endif
+ thiswrite = writecount ;
+ else
+ break ;
+@@ -1011,7 +1188,11 @@
+ while (len > 0)
+ { writecount = (len >= bufferlen) ? bufferlen : (int) len ;
+ convert (ptr + total, buffer, writecount, psf->norm_double) ;
++#ifdef LEGACY_FLAC
+ if (FLAC__seekable_stream_encoder_process_interleaved
(pflac->fse, buffer, writecount/psf->sf.channels))
++#else
++ if (FLAC__stream_encoder_process_interleaved (pflac->fse,
buffer, writecount/psf->sf.channels))
++#endif
+ thiswrite = writecount ;
+ else
+ break ;
+@@ -1131,10 +1312,17 @@
+
+ if (psf->mode == SFM_READ)
+ { FLAC__uint64 position ;
++#ifdef LEGACY_FLAC
+ if (FLAC__seekable_stream_decoder_seek_absolute (pflac->fsd,
offset))
+ { FLAC__seekable_stream_decoder_get_decode_position
(pflac->fsd, &position) ;
+ return offset ;
+ } ;
++#else
++ if (FLAC__stream_decoder_seek_absolute (pflac->fsd, offset))
++ { FLAC__stream_decoder_get_decode_position (pflac->fsd,
&position) ;
++ return offset ;
++ } ;
++#endif
+
+ return ((sf_count_t) -1) ;
+ } ;
diff -ruN libsndfile-1.0.17/patches/lossy_comp_test-overflow.dpatch
libsndfile-1.0.17.new/patches/lossy_comp_test-overflow.dpatch
--- libsndfile-1.0.17/patches/lossy_comp_test-overflow.dpatch 1969-12-31
19:00:00.000000000 -0500
+++ libsndfile-1.0.17.new/patches/lossy_comp_test-overflow.dpatch
2008-02-24 21:22:48.000000000 -0500
@@ -0,0 +1,21 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## lossy_comp_test-overflow.dpatch by Martin Michlmayr <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Avoid a possible overflow in sum_abs.
+## DP: See #362414.
+
[EMAIL PROTECTED]@
+diff -urNad libsndfile-1.0.17~/tests/lossy_comp_test.c
libsndfile-1.0.17/tests/lossy_comp_test.c
+--- libsndfile-1.0.17~/tests/lossy_comp_test.c 2006-08-31 11:22:07.000000000
+0200
++++ libsndfile-1.0.17/tests/lossy_comp_test.c 2007-04-07 10:33:05.000000000
+0200
+@@ -691,7 +691,8 @@
+ lcomp_test_int (const char *filename, int filetype, int channels, double
margin)
+ { SNDFILE *file ;
+ SF_INFO sfinfo ;
+- int k, m, *orig, *data, sum_abs ;
++ int k, m, *orig, *data ;
++ long long sum_abs ;
+ long datalen, seekpos ;
+ double scale ;
+
diff -ruN libsndfile-1.0.17/patches/overflow.dpatch
libsndfile-1.0.17.new/patches/overflow.dpatch
--- libsndfile-1.0.17/patches/overflow.dpatch 1969-12-31 19:00:00.000000000
-0500
+++ libsndfile-1.0.17.new/patches/overflow.dpatch 2008-02-24
21:22:48.000000000 -0500
@@ -0,0 +1,46 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## overflow.dpatch by Samuel Mimram <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix a buffer overflow (CVE-2007-4974). See #443386.
+
[EMAIL PROTECTED]@
+diff -urNad libsndfile-1.0.17~/src/flac.c libsndfile-1.0.17/src/flac.c
+--- libsndfile-1.0.17~/src/flac.c 2007-09-20 23:38:16.000000000 +0000
++++ libsndfile-1.0.17/src/flac.c 2007-09-20 23:38:16.000000000 +0000
+@@ -57,7 +57,7 @@
+ ** Private static functions.
+ */
+
+-#define ENC_BUFFER_SIZE 4096
++#define ENC_BUFFER_SIZE 8192
+
+ typedef enum
+ { PFLAC_PCM_SHORT = 0,
+@@ -202,6 +202,17 @@
+ const FLAC__int32* const *buffer = pflac->wbuffer ;
+ unsigned i = 0, j, offset ;
+
++ /*
++ ** frame->header.blocksize is variable and we're using a constant
blocksize
++ ** of FLAC__MAX_BLOCK_SIZE.
++ ** Check our assumptions here.
++ */
++ if (frame->header.blocksize > FLAC__MAX_BLOCK_SIZE)
++ { psf_log_printf (psf, "Ooops : frame->header.blocksize (%d) >
FLAC__MAX_BLOCK_SIZE (%d)\n", __func__, __LINE__, frame->header.blocksize,
FLAC__MAX_BLOCK_SIZE) ;
++ psf->error = SFE_INTERNAL ;
++ return 0 ;
++ } ;
++
+ if (pflac->ptr == NULL)
+ { /*
+ ** Not sure why this code is here and not elsewhere.
+@@ -210,7 +221,7 @@
+ pflac->bufferbackup = SF_TRUE ;
+ for (i = 0 ; i < frame->header.channels ; i++)
+ { if (pflac->rbuffer [i] == NULL)
+- pflac->rbuffer [i] = calloc
(frame->header.blocksize, sizeof (FLAC__int32)) ;
++ pflac->rbuffer [i] = calloc
(FLAC__MAX_BLOCK_SIZE, sizeof (FLAC__int32)) ;
+ memcpy (pflac->rbuffer [i], buffer [i],
frame->header.blocksize * sizeof (FLAC__int32)) ;
+ } ;
+ pflac->wbuffer = (const FLAC__int32* const*) pflac->rbuffer ;
--- NEW FILE: libtunepimp3.patch ---
diff -Nurd libtunepimp-0.4.4/plugins/flac/flac_meta.cpp
libtunepimp-0.4.4-new/plugins/flac/flac_meta.cpp
--- libtunepimp-0.4.4/plugins/flac/flac_meta.cpp 2006-10-13
16:06:46.000000000 -0400
+++ libtunepimp-0.4.4-new/plugins/flac/flac_meta.cpp 2008-02-19
15:10:43.000000000 -0500
@@ -21,7 +21,7 @@
along with libtunepimp; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-$Id: flac_meta.cpp 1472 2006-01-22 14:26:17Z luks $
+$Id: flac_meta.cpp 7325 2006-04-25 07:57:00Z luks $
----------------------------------------------------------------------------*/
//
---------------------------------------------------------------------------
@@ -243,8 +243,6 @@
if (get_comment(tagmap, "MUSICBRAINZ_ALBUMARTISTSORTNAME", val))
metadata.albumArtistSortName = string(val.c_str());
}
- if (get_comment(tagmap, "MUSICBRAINZ_TRMID", val))
- metadata.fileTrm = string(val.c_str());
if (get_comment(tagmap, "RELEASECOUNTRY", val))
metadata.releaseCountry = string(val.c_str());
if (get_comment(tagmap, "MUSICBRAINZ_NONALBUM", val))
@@ -322,7 +320,6 @@
add_comment(tagmap, "MUSICBRAINZ_ALBUMSTATUS", temp.c_str());
}
add_comment(tagmap, "MUSICBRAINZ_ARTISTID", metadata.artistId.c_str());
- add_comment(tagmap, "MUSICBRAINZ_TRMID", metadata.fileTrm.c_str());
if (!metadata.albumArtistId.empty())
{
add_comment(tagmap, "MUSICBRAINZ_ALBUMARTISTID",
metadata.albumArtistId.c_str());
diff -Nurd libtunepimp-0.4.4/plugins/flac/flacdecode.cpp
libtunepimp-0.4.4-new/plugins/flac/flacdecode.cpp
--- libtunepimp-0.4.4/plugins/flac/flacdecode.cpp 2006-10-13
16:06:46.000000000 -0400
+++ libtunepimp-0.4.4-new/plugins/flac/flacdecode.cpp 2008-02-19
15:10:43.000000000 -0500
@@ -21,13 +21,21 @@
along with libtunepimp; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- $Id: flacdecode.cpp 1394 2005-06-16 06:44:37Z robert $
+ $Id: flacdecode.cpp 8625 2006-11-05 22:13:17Z luks $
----------------------------------------------------------------------------*/
#include <stdlib.h>
#include <string.h>
#include "flacdecode.h"
+#include <FLAC/export.h>
+/* FLAC 1.1.3 has FLAC_API_VERSION_CURRENT == 8 */
+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT < 8
+#define LEGACY_FLAC
+#else
+#undef LEGACY_FLAC
+#endif
+
void FLAC_errorcb(const FLAC__StreamDecoder * decoder,
FLAC__StreamDecoderErrorStatus status, void *client_data)
{
@@ -54,12 +62,12 @@
const FLAC__int32 * const
buffer[], void *client_data)
{
- // No idea how TRM signatures are generated for more than two
+ // No idea how PUID signatures are generated for more than two
// channels, so not going to try
if (frame->header.channels > 2)
return FLAC__STREAM_DECODER_WRITE_STATUS_ABORT;
- // TRM code doesn't support anything other than 8 and 16 bit samples
+ // PUID code doesn't support anything other than 8 and 16 bit samples
if (frame->header.bits_per_sample != 8 &&
frame->header.bits_per_sample != 16 &&
frame->header.bits_per_sample != 24)
@@ -99,7 +107,11 @@
FLAC__StreamDecoderReadStatus FLAC_readcb(const FLAC__StreamDecoder *decoder,
FLAC__byte buffer[],
+#ifdef LEGACY_FLAC
unsigned *bytes,
+#else
+ size_t *bytes,
+#endif
void *client_data)
{
clientdata_t *cd = reinterpret_cast < clientdata_t * >(client_data);
@@ -131,6 +143,7 @@
if (!cd.in)
return;
+#ifdef LEGACY_FLAC
if (!FLAC__stream_decoder_set_read_callback(decoder, &FLAC_readcb))
return;
@@ -149,6 +162,10 @@
state = FLAC__stream_decoder_init(decoder);
if (state != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA)
return;
+#else
+ if (FLAC__stream_decoder_init_stream(decoder, &FLAC_readcb, NULL, NULL,
NULL, NULL, &FLAC_writecb, &FLAC_metadatacb, &FLAC_errorcb, &cd) !=
FLAC__STREAM_DECODER_INIT_STATUS_OK)
+ return;
+#endif
FLAC__stream_decoder_process_until_end_of_metadata(decoder);
state = FLAC__stream_decoder_get_state(decoder);
@@ -221,6 +238,8 @@
break;
state = FLAC__stream_decoder_get_state(decoder);
+ if (state == FLAC__STREAM_DECODER_END_OF_STREAM)
+ break;
if (state != FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC ||
state != FLAC__STREAM_DECODER_READ_FRAME)
{
diff -Nurd libtunepimp-0.4.4/plugins/flac/flacdecode.h
libtunepimp-0.4.4-new/plugins/flac/flacdecode.h
--- libtunepimp-0.4.4/plugins/flac/flacdecode.h 2006-10-13 16:06:46.000000000
-0400
+++ libtunepimp-0.4.4-new/plugins/flac/flacdecode.h 2008-02-19
15:10:45.000000000 -0500
@@ -21,13 +21,13 @@
along with libtunepimp; if not, write to the Free Software
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- $Id: flacdecode.h 1393 2005-06-15 01:08:20Z robert $
+ $Id: flacdecode.h 8625 2006-11-05 22:13:17Z luks $
----------------------------------------------------------------------------*/
-#ifndef __VORBIS_DECODE_H
-#define __VORBIS_DECODE_H
+#ifndef __FLAC_DECODE_H
+#define __FLAC_DECODE_H
-#include <FLAC/file_decoder.h>
+#include <FLAC/stream_decoder.h>
#include <string>
#include "decode_plugin.h"
#include "fileio.h"
--- flac-nox.patch DELETED ---
Index: flac.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/flac.info,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- flac.info 11 Dec 2007 17:36:13 -0000 1.3.2.1
+++ flac.info 5 Mar 2008 03:33:40 -0000 1.3.2.2
@@ -1,85 +1,79 @@
Package: flac
-Version: 1.1.1
-Revision: 1013
-BuildDepends: xmms,popt, libtool14 (>= 1.5-1), libogg, xmms, readline (>=
4.3-1028), id3lib4-dev (>= 3.8.3-1014), glib, gtk+, libiconv-dev, gettext-dev,
gettext-bin, gettext-tools
-#automake1.6,
-Depends: %n-shlibs (= %v-%r)
-Conflicts: flac-nox
-Replaces: flac-nox
+Version: 1.2.1
+Revision: 1000
+BuildDepends: libtool14 (>= 1.5-1), libogg, readline5, id3lib4-dev (>=
3.8.3-1014), libiconv-dev, libgettext3-dev, gettext-bin, gettext-tools, fink
(>= 0.24.12)
+Depends: libflac8 (>= %v-%r)
+Conflicts: flac-nox, flac-bin, flac (<< 1.2.1)
+Replaces: flac-nox, flac-bin
Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: c6ccddccf8ad344065698047c2fc7280
+Source-MD5: 153c8b15a54da428d1f0fadc756c22c7
+PatchFile: %n.patch
+PatchFile-MD5: 7ee11e6fd7c4541d4593678306a18eb0
PatchScript: <<
-sed -e 's,@PREFIX@,%p,g' %a/%n.patch | patch -p1
-perl -pi.bak -e 's/hardcode_direct=yes/hardcode_direct=no/g' configure
-perl -pi.bak -e 's/hardcode_direct_CXX=yes/hardcode_direct_CXX=no/g' configure
+ #!/bin/sh -ex
+ patch -p1 < %{PatchFile}
+ patch -p0 < patches/ltmain.sh.patch
+ patch -p0 < patches/nasm.h.patch
<<
+
NoSetCPPFLAGS: true
SetCPPFLAGS: -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
-I%p/include
NoSetLDFLAGS: true
-#hardcode_direct avoids this:
-#SetLDFLAGS: -L%b/src/libOggFLAC/.libs -L%b/src/libOggFLAC++/.libs
-L%b/src/libFLAC/.libs -L%b/src/libFLAC++/.libs
-ConfigureParams: --mandir=%p/share/man
+ConfigureParams: --mandir='${prefix}/share/man' --disable-rpath (%m = i386)
--disable-asm-optimizations --disable-xmms-plugin
BuildDependsOnly: True
GCC: 4.0
+
CompileScript: <<
#!/bin/sh -ex
-# mkdir -p %b/src/libOggFLAC/.libs
-# mkdir -p %b/src/libFLAC/.libs
-# mkdir -p %b/src/libFLAC++/.libs
-# %p/bin/glibtoolize --force
-# ./autogen.sh
- rm -rf plugin_xmms
./configure %c
make OBJ_FORMAT=macho
<<
InstallScript: <<
#!/bin/sh -ex
+ #bd=$(cd . && pwd -P)
+ #perl -pi -e "s#\Q$bd\E/src/libFLAC#%p/lib#g" src/plugin_xmms/libxmms-flac.la
make install DESTDIR=%d
mv %i/share/doc/%n-%v %i/share/doc/%n
<<
+
SplitOff: <<
- Package: %N-shlibs
+ Package: libflac8
Conflicts: flac-nox-shlibs
Replaces: flac-nox-shlibs, flac
Depends: libogg-shlibs
- Suggests: %N-bin
- Files: lib/libFLAC.*.dylib lib/libFLAC++.*.dylib lib/libOggFLAC.*.dylib
lib/libOggFLAC++.*.dylib
+ Suggests: %N
+ Files: lib/libFLAC.*.dylib lib/libFLAC++.*.dylib
Shlibs: <<
- %p/lib/libFLAC.6.dylib 7.0.0 %n (>= 1.1.1-10)
- %p/lib/libFLAC++.4.dylib 5.0.0 %n (>= 1.1.1-10)
- %p/lib/libOggFLAC.1.dylib 3.0.0 %n (>= 1.1.1-10)
- %p/lib/libOggFLAC++.0.dylib 2.0.0 %n (>= 1.1.1-10)
+ %p/lib/libFLAC.8.dylib 11.0.0 %n (>= 1.2.1-1)
+ %p/lib/libFLAC++.6.dylib 9.0.0 %n (>= 1.2.1-1)
<<
DocFiles: README COPYING.LGPL
Description: Free lossless audio codec - shared libs
<<
-SplitOff2: <<
- Package: %N-xmms
- Depends: xmms-bin, %N-shlibs (= %v-%r), id3lib4-shlibs (>= 3.8.3-1014),
popt-shlibs
- Suggests: %N-bin
- Files: lib/xmms/Input/libxmms*
- DocFiles: README COPYING.LGPL
- Description: Free lossless audio codec - xmms plugin
-<<
SplitOff3: <<
- Package: %N-bin
- Conflicts: flac-nox-bin
- Replaces: flac-nox-bin
- Files: bin/flac bin/metaflac
- Depends: %N-shlibs, libiconv
+ Package: libflac8-dev
+ Conflicts: flac-nox-bin, flac (<< 1.2.1-1), flaci-nox (<< 1.2.1-1)
+ Replaces: flac-nox-bin, flac (<< 1.2.1-1), flaci-nox (<< 1.2.1-1)
+ Files: include lib share/aclocal
+ Depends: libflac8, libiconv
DocFiles: README COPYING.LGPL
Description: Free lossless audio codec - encoder/decoder
<<
+Splitoff4: <<
+ Package: flac-doc
+ Files: share/doc/%N/html
+ Description: HTML format docs for flac and libflac.
+<<
DocFiles: README AUTHORS COPYING.FDL COPYING.GPL COPYING.LGPL
Description: Free lossless audio codec
DescDetail: <<
FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC
is similar to MP3, but lossless. The FLAC project consists of:
* The stream format
-In the flac and flac-shlibs packages:
+In the libflacX packages:
* libFLAC, a library encoders and decoders, and a metadata interface
* libFLAC++, an object wrapper around libFLAC
-In the flac-bin package:
+In the flac package:
* flac, a CLI wrapper around libFLAC to encode/decode .flac files
* metaflac, a command-line metadata editor for .flac files
In the flac-xmms package:
@@ -91,9 +85,6 @@
the right place.
libtool relink and bash versioning patches applied.
patch to enable dynamic_lookup (for prebinding on 10.3) applied.
-
-Incorrect shlib major version corrected w/1.1.1. Next time, will
-create flacN pkg.
<<
License: GPL
Maintainer: Ben Hines <[EMAIL PROTECTED]>
Index: libtunepimp3.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/libtunepimp3.info,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- libtunepimp3.info 18 May 2006 18:43:53 -0000 1.3
+++ libtunepimp3.info 5 Mar 2008 03:33:41 -0000 1.3.2.1
@@ -1,12 +1,24 @@
Package: libtunepimp3
-Version: 0.4.2
-Revision: 1022
+Version: 0.4.4
+Revision: 1
Description: Library for musicbrainz tagging
License: LGPL
Maintainer: Benjamin Reed <[EMAIL PROTECTED]>
Depends: %N-shlibs (>= %v-%r)
-BuildDepends: expat, flac (>= 1.1.1-1011), libgettext3-dev, libiconv-dev,
libmad, libmusicbrainz4 (>= 2.1.1-1001), libogg, libvorbis0, readline5 (>=
5.0-1004), taglib (>= 1.4-1001)
+BuildDepends: <<
+ expat1,
+ fink (>= 0.26.0-1),
+ libflac8-dev,
+ libgettext3-dev,
+ libiconv-dev,
+ libmad,
+ libmusicbrainz4,
+ libogg,
+ libvorbis0,
+ readline5,
+ taglib (>= 1.4-1001)
+<<
Conflicts: libtunepimp2
Replaces: libtunepimp2
BuildDependsOnly: true
@@ -19,12 +31,15 @@
aus-AU: ftp://ftp.au.musicbrainz.org/pub/musicbrainz
<<
Source: mirror:custom:libtunepimp-%v.tar.gz
+Source-MD5: 9e66431e28fc9a8b741a4a0fa84935d0
SourceDirectory: libtunepimp-%v
-Source-MD5: 10b9e4a2f1930aed78ef7ddaebbe0fde
PatchScript: <<
+ %{default_script}
perl -pi -e 's,lib/tunepimp,lib/tunepimp3,g' lib/tunepimp.cpp
perl -pi -e 's,tunepimp/plugins,tunepimp3/plugins,g' Makefile.in
<<
+PatchFile: %n.patch
+PatchFile-MD5: 7d8306f17193c14f8d99f9b1ceaf3a76
SetCPPFLAGS: -DHAVE_SOCKLEN_T=1
ConfigureParams: --mandir='${prefix}/share/man'
@@ -32,7 +47,18 @@
SplitOff: <<
Package: %N-shlibs
Description: Shared libraries for tunepimp
- Depends: expat-shlibs, flac-shlibs (>= 1.1.1-1011), libgettext3-shlibs,
libiconv, libmad-shlibs, libmusicbrainz4-shlibs (>= 2.1.1-1001), libogg-shlibs,
libvorbis0-shlibs, readline5-shlibs (>= 5.0-1004), taglib-shlibs (>= 1.4-1001)
+ Depends: <<
+ expat1-shlibs,
+ libflac8,
+ libgettext3-shlibs,
+ libiconv,
+ libmad-shlibs,
+ libmusicbrainz4-shlibs,
+ libogg-shlibs,
+ libvorbis0-shlibs,
+ readline5-shlibs,
+ taglib-shlibs (>= 1.4-1001)
+ <<
Files: <<
lib/libtunepimp.*.dylib
lib/tunepimp3
@@ -44,7 +70,11 @@
Description: Tools for tunepimp
Depends: %N-shlibs (>= %v-%r)
Conflicts: libtunepimp2-bin
- Replaces: libtunepimp2, libtunepimp2-bin, %N
+ Replaces: <<
+ libtunepimp2,
+ libtunepimp2-bin,
+ %N
+ <<
Files: bin
<<
Index: jack.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/jack.info,v
retrieving revision 1.4.2.1
retrieving revision 1.4.2.2
diff -u -d -r1.4.2.1 -r1.4.2.2
--- jack.info 11 Dec 2007 17:36:13 -0000 1.4.2.1
+++ jack.info 5 Mar 2008 03:33:41 -0000 1.4.2.2
@@ -1,10 +1,10 @@
Package: jack
Version: 0.101.1
-Revision: 1002
+Revision: 1003
Maintainer: Nicholas J Humfrey <[EMAIL PROTECTED]>
#
-BuildDepends: readline5 (>= 5.0-1004), doxygen, portaudio, libsndfile1-dev (>=
1.0.11-2), pkgconfig, flac | flac-nox
-Depends: jack-shlibs (= %v-%r), readline5-shlibs (>= 5.0-1004),
libsndfile1-shlibs (>= 1.0.2-1), flac-shlibs | flac-nox-shlibs
+BuildDepends: readline5 (>= 5.0-1004), doxygen, portaudio, libsndfile1-dev (>=
1.0.11-2), pkgconfig, libflac8-dev
+Depends: jack-shlibs (= %v-%r), readline5-shlibs (>= 5.0-1004),
libsndfile1-shlibs (>= 1.0.2-1), libflac8
Source: mirror:sourceforge:jackit/jack-audio-connection-kit-%v.tar.gz
Source-MD5: bb25f7c1da5d488b70edcf39ff5a39b2
SourceDirectory: jack-audio-connection-kit-%v
Index: libmad.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/libmad.info,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -d -r1.1.2.2 -r1.1.2.3
--- libmad.info 4 Aug 2007 03:33:13 -0000 1.1.2.2
+++ libmad.info 5 Mar 2008 03:33:41 -0000 1.1.2.3
@@ -16,7 +16,7 @@
Package: libmad
Version: 0.15.1b
-Revision: 4
+Revision: 5
Depends: %N-shlibs (= %v-%r)
BuildDepends: libgettext3-dev, gettext-bin, gettext-tools
Replaces: mad
@@ -37,7 +37,7 @@
Replaces: mad-shlibs
Files: lib/libmad.0*.dylib
Shlibs: <<
- %p/lib/libmad.0.dylib 2.0.0 %n (>= 0.15.0b-1)
+ %p/lib/libmad.0.dylib 3.0.0 %n (>= 0.15.0b-5)
<<
DocFiles: COPYING COPYRIGHT README
<<
Index: libsndfile1.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/libsndfile1.info,v
retrieving revision 1.7.2.1
retrieving revision 1.7.2.2
diff -u -d -r1.7.2.1 -r1.7.2.2
--- libsndfile1.info 19 Jun 2007 21:17:59 -0000 1.7.2.1
+++ libsndfile1.info 5 Mar 2008 03:33:41 -0000 1.7.2.2
@@ -1,11 +1,20 @@
Package: libsndfile1
Version: 1.0.17
-Revision: 1
+Revision: 4
Maintainer: None <[EMAIL PROTECTED]>
-BuildDepends: flac | flac-nox
+BuildDepends: libflac8-dev
Depends: %N-shlibs (= %v-%r)
Source: http://www.mega-nerd.com/libsndfile/libsndfile-%v.tar.gz
Source-MD5: 2d126c35448503f6dbe33934d9581f6b
+PatchFile: %n.patch
+PatchFile-MD5: 076dae1c62c6b92fed47dc6213365e87
+PatchScript: <<
+ #!/bin/sh -ex
+ patch -p1 < %{PatchFile}
+ patch -p1 < patches/flac-1.1.4.dpatch
+ patch -p1 < patches/lossy_comp_test-overflow.dpatch
+ patch -p1 < patches/overflow.dpatch
+<<
Conflicts: libsndfile, libsndfile0
Replaces: libsndfile, libsndfile0
NoSetMAKEFLAGS: true
@@ -13,13 +22,15 @@
ConfigureParams: --mandir=%p/share/man --disable-dependency-tracking
--disable-sqlite
InstallScript: <<
make install DESTDIR=%d
+ mkdir -p %i/share/doc/%n/html
+ cp doc/*.html doc/*.jpg doc/*.css %i/share/doc/%n/html/
<<
-DocFiles: AUTHORS ChangeLog COPYING NEWS README TODO doc/*.html doc/*.jpg
doc/*.css
+DocFiles: AUTHORS ChangeLog COPYING NEWS README TODO
SplitOff: <<
Package: %N-shlibs
Conflicts: libsndfile-shlibs
Replaces: libsndfile-shlibs
- Depends: flac-shlibs | flac-nox-shlibs
+ Depends: libflac8
Files: lib/*.*.dylib
Shlibs: %p/lib/libsndfile.1.dylib 2.0.0 %n (>= 1.0.11-3)
DocFiles: COPYING README
@@ -43,9 +54,6 @@
DescPackaging: <<
Uses pkgconfig, but there are no pkgconfig-related dependencies.
- flac-shlibs does not itself depends on x11. Don't worry about diferrences
- between flac and flac-nox.
-
Originally packaged by Matt Stephenson.
Supplies C++ interface as of 1.0.17-1 in the form of sndfile.hh, which is
--- flac-nox.info DELETED ---
Index: flac.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/flac.patch,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -d -r1.2 -r1.2.2.1
--- flac.patch 10 Mar 2006 00:19:15 -0000 1.2
+++ flac.patch 5 Mar 2008 03:33:40 -0000 1.2.2.1
@@ -1,92 +1,76 @@
-diff -ru flac-1.1.1.orig/configure flac-1.1.1/configure
---- flac-1.1.1.orig/configure 2004-09-29 00:17:41.000000000 -0400
-+++ flac-1.1.1/configure 2006-03-09 18:51:05.000000000 -0500
-@@ -5858,13 +5858,13 @@
- allow_undefined_flag='-undefined suppress'
- ;;
- *) # Darwin 1.3 on
-- allow_undefined_flag='-flat_namespace -undefined suppress'
-+ allow_undefined_flag='-flat_namespace -undefined dynamic_lookup'
- ;;
- esac
- # FIXME: Relying on posixy $() will cause problems for
- # cross-compilation, but unfortunately the echo tests do not
- # yet detect zsh echo's removal of \ escapes.
-- archive_cmds='$nonopt $(test "x$module" = xyes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
-install_name $rpath/$soname $verstring'
-+ archive_cmds='$nonopt $(test x$module = xyes && echo -bundle || echo
-dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags
$(test .$module != .yes && echo -install_name $rpath/$soname $verstring)'
- # We need to add '_' to the symbols in $export_symbols first
- #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols'
- hardcode_direct=yes
-diff -ru flac-1.1.1.orig/ltmain.sh flac-1.1.1/ltmain.sh
---- flac-1.1.1.orig/ltmain.sh 2004-09-29 00:17:31.000000000 -0400
-+++ flac-1.1.1/ltmain.sh 2006-03-09 18:51:05.000000000 -0500
-@@ -54,6 +54,10 @@
- TIMESTAMP=" (1.1220.2.94 2004/04/10 16:27:27)"
-
-
-+SED=sed
-+EGREP=egrep
-+max_cmd_len=4096
+diff -ruN flac-1.2.1/patches/fixrpath.sh flac-1.2.1.new/patches/fixrpath.sh
+--- flac-1.2.1/patches/fixrpath.sh 1969-12-31 19:00:00.000000000 -0500
++++ flac-1.2.1.new/patches/fixrpath.sh 2008-02-18 10:51:07.000000000 -0500
+@@ -0,0 +1,28 @@
++#!/bin/sh
++# $Id$
++# libtool -rpath workaround based on a suggestion by Yann Dirson
++# <[EMAIL PROTECTED]>
++#
++# It is supposed to be inserted in configure.in, but I didn't want
++# to re-run autoconf (since that bloats the Debian diff unnecessarily),
++# so I just patch libtool after running configure. -- Richard Braakman
++# <[EMAIL PROTECTED]>
++#
++# The version of libtool included with LessTif unfortunately insists on
++# linking with -rpath, i.e. hardwiring locations. This is not desirable.
++#
++# The dummy define is improbable enough not to conflict with anything; it is
++# just here to fool libtool by making it believe it gave some useful info to
++# gcc.
++#
++# This will also patch the generated libtool to explicitly
++# link libraries against the libraries they depend on. (particularly libc)
+
- # Check that we have a working $echo.
- if test "X$1" = X--no-reexec; then
- # Discard the --no-reexec flag, and continue.
-@@ -2280,7 +2284,7 @@
- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
- if test "$installed" = no; then
- notinst_deplibs="$notinst_deplibs $lib"
-- need_relink=yes
-+ # need_relink=yes
- fi
- # This is a shared library
-
-@@ -3883,6 +3887,11 @@
- if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
- cmds=$archive_expsym_cmds
- else
-+ if test "x$verstring" = "x0.0"; then
-+ tmp_verstring=
-+ else
-+ tmp_verstring="$verstring"
-+ fi
- cmds=$archive_cmds
- fi
- fi
-diff -ru flac-1.1.1.orig/src/libFLAC/ia32/nasm.h
flac-1.1.1/src/libFLAC/ia32/nasm.h
---- flac-1.1.1.orig/src/libFLAC/ia32/nasm.h 2004-01-16 22:58:40.000000000
-0500
-+++ flac-1.1.1/src/libFLAC/ia32/nasm.h 2006-03-09 19:03:30.000000000 -0500
-@@ -49,6 +49,11 @@
- %idefine code_section section .text align=16
- %idefine data_section section .data align=32
- %idefine bss_section section .bss align=32
-+%elifdef OBJ_FORMAT_macho
-+ %define FLAC__PUBLIC_NEEDS_UNDERSCORE
-+ %idefine code_section section .text
-+ %idefine data_section section .data
-+ %idefine bss_section section .bss
- %else
- %error unsupported object format!
- %endif
-diff -ru flac-1.1.1.orig/src/plugin_common/canonical_tag.c
flac-1.1.1/src/plugin_common/canonical_tag.c
---- flac-1.1.1.orig/src/plugin_common/canonical_tag.c 2004-09-27
21:00:55.000000000 -0400
-+++ flac-1.1.1/src/plugin_common/canonical_tag.c 2006-03-09
18:51:05.000000000 -0500
-@@ -66,7 +66,7 @@
- wcsdup (s)
- const wchar_t *s;
- {
-- size_t len = (__wcslen (s) + 1) * sizeof (wchar_t);
-+ size_t len = (wcslen (s) + 1) * sizeof (wchar_t);
- void *new = malloc (len);
-
- if (new == NULL)
-diff -ru flac-1.1.1.orig/src/plugin_xmms/Makefile.in
flac-1.1.1/src/plugin_xmms/Makefile.in
---- flac-1.1.1.orig/src/plugin_xmms/Makefile.in 2004-09-29
00:18:47.000000000 -0400
-+++ flac-1.1.1/src/plugin_xmms/Makefile.in 2006-03-09 18:51:05.000000000
-0500
-@@ -278,7 +278,6 @@
++for i in libtool libtool-disable-static; do
++sed < $i > $i-2 \
++ -e 's/^hardcode_libdir_flag_spec.*$/hardcode_libdir_flag_spec="
-D__LIBTOOL_IS_A_FOOL__ "/' \
++ -e '/^archive_cmds="/s/"$/ \$deplibs"/'
++mv $i-2 $i
++chmod 755 $i
++done
++
+diff -ruN flac-1.2.1/patches/ltmain.sh.patch
flac-1.2.1.new/patches/ltmain.sh.patch
+--- flac-1.2.1/patches/ltmain.sh.patch 1969-12-31 19:00:00.000000000 -0500
++++ flac-1.2.1.new/patches/ltmain.sh.patch 2008-02-18 10:48:01.000000000
-0500
+@@ -0,0 +1,11 @@
++--- ltmain.sh.orig Fri Feb 4 21:22:19 2005
+++++ ltmain.sh Wed Feb 23 19:09:37 2005
++@@ -2280,7 +2280,7 @@
++ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++ if test "$installed" = no; then
++ notinst_deplibs="$notinst_deplibs $lib"
++- need_relink=yes
+++ need_relink=no
++ fi
++ # This is a shared library
++
+diff -ruN flac-1.2.1/patches/nasm.h.patch flac-1.2.1.new/patches/nasm.h.patch
+--- flac-1.2.1/patches/nasm.h.patch 1969-12-31 19:00:00.000000000 -0500
++++ flac-1.2.1.new/patches/nasm.h.patch 2007-01-25 21:34:54.000000000
-0500
+@@ -0,0 +1,14 @@
++--- src/libFLAC/ia32/nasm.h~ 2005-01-25 13:14:22.000000000 +0900
+++++ src/libFLAC/ia32/nasm.h 2006-03-15 18:07:23.000000000 +0900
++@@ -49,6 +49,11 @@
++ %idefine code_section section .text align=16
++ %idefine data_section section .data align=32
++ %idefine bss_section section .bss align=32
+++%elifdef OBJ_FORMAT_macho
+++ %define FLAC__PUBLIC_NEEDS_UNDERSCORE
+++ %idefine code_section section .text
+++ %idefine data_section section .data
+++ %idefine bss_section section .bss
++ %else
++ %error unsupported object format!
++ %endif
+diff -ruN flac-1.2.1/src/plugin_xmms/Makefile.in
flac-1.2.1.new/src/plugin_xmms/Makefile.in
+--- flac-1.2.1/src/plugin_xmms/Makefile.in 2007-09-16 16:05:18.000000000
-0400
++++ flac-1.2.1.new/src/plugin_xmms/Makefile.in 2008-02-18 19:48:45.000000000
-0500
+@@ -265,7 +265,6 @@
$(top_builddir)/src/share/replaygain_synthesis/libreplaygain_synthesis.la \
$(top_builddir)/src/share/utf8/libutf8.la \
$(top_builddir)/src/libFLAC/libFLAC.la \
- -L$(top_builddir)/src/libFLAC/.libs \
- @XMMS_LIBS@
-
- libxmms_flac_la_LDFLAGS = -module -avoid-version
+ @OGG_LIBS@ \
+ @XMMS_LIBS@ \
+ @LIBICONV@
Index: shntool.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/shntool.info,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- shntool.info 14 Feb 2008 14:07:23 -0000 1.4.2.2
+++ shntool.info 5 Mar 2008 03:33:41 -0000 1.4.2.3
@@ -1,10 +1,10 @@
Package: shntool
Version: 3.0.5
-Revision: 1
+Revision: 2
Maintainer: elcepi <[EMAIL PROTECTED]>
Source: http://etree.org/shnutils/shntool/dist/src/%n-%v.tar.gz
Source-MD5: f9b65bc23b013ab673cd4dc687343be7
-Recommends: flac-bin, shorten, sox
+Recommends: flac, shorten, sox
ConfigureParams: --mandir='${prefix}/share/man'
DocFiles: README NEWS COPYING AUTHORS
Index: twolame.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/twolame.info,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- twolame.info 31 May 2006 04:17:35 -0000 1.3
+++ twolame.info 5 Mar 2008 03:33:41 -0000 1.3.2.1
@@ -1,10 +1,10 @@
Package: twolame
Version: 0.3.6
-Revision: 1002
+Revision: 1003
Maintainer: Nicholas J Humfrey <[EMAIL PROTECTED]>
#
-BuildDepends: libsndfile1-dev (>= 1.0.11-2), pkgconfig, flac (>= 1.1.1-1011)
-Depends: libsndfile1-shlibs, %N-shlibs (=%v-%r), flac-shlibs (>= 1.1.1-1011)
+BuildDepends: libsndfile1-dev (>= 1.0.11-2), pkgconfig, libflac8-dev
+Depends: libsndfile1-shlibs, %N-shlibs (=%v-%r), libflac8
Source: mirror:sourceforge:%n/%n-%v.tar.gz
Source-MD5: cf7f79e27a03f403a7122281bf27fe95
SourceDirectory: %n-%v
Index: sdl-sound.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/sdl-sound.info,v
retrieving revision 1.4.2.2
retrieving revision 1.4.2.3
diff -u -d -r1.4.2.2 -r1.4.2.3
--- sdl-sound.info 11 Dec 2007 17:36:13 -0000 1.4.2.2
+++ sdl-sound.info 5 Mar 2008 03:33:41 -0000 1.4.2.3
@@ -1,10 +1,10 @@
Package: sdl-sound
Version: 1.0.1
-Revision: 1003
+Revision: 1004
Maintainer: Daniel Nielsen <[EMAIL PROTECTED]>
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: true
-BuildDepends: sdl (>= 1.2.9-1001), smpeg (>= 0.4.4-1025), libogg, libmikmod3,
libvorbis0, flac, physfs
+BuildDepends: sdl (>= 1.2.9-1001), smpeg (>= 0.4.4-1025), libogg, libmikmod3,
libvorbis0, libflac8-dev, physfs
Patch: %n.patch
Source: http://www.icculus.org/SDL_sound/downloads/SDL_sound-%v.tar.gz
Source-MD5: 49e197ef7c8ab623d0640dc74be43160
@@ -19,7 +19,7 @@
SplitOff: <<
Package: %N-shlibs
- Depends: sdl-shlibs (>= 1.2.9-1001), smpeg-shlibs (>= 0.4.4-1025),
libogg-shlibs, libmikmod3-shlibs, libvorbis0-shlibs, flac-shlibs
+ Depends: sdl-shlibs (>= 1.2.9-1001), smpeg-shlibs (>= 0.4.4-1025),
libogg-shlibs, libmikmod3-shlibs, libvorbis0-shlibs, libflac8
Files: lib/libSDL_sound-*.dylib
Shlibs: %p/lib/libSDL_sound-1.0.1.dylib 2.0.0 %n (>= 1.0.1-1)
Description: SDL sound library - shared libs
Index: snd.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/snd.info,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -d -r1.1.2.6 -r1.1.2.7
--- snd.info 17 Oct 2007 17:36:48 -0000 1.1.2.6
+++ snd.info 5 Mar 2008 03:33:41 -0000 1.1.2.7
@@ -1,11 +1,11 @@
Package: snd
Version: 9.1
-Revision: 2
+Revision: 3
Distribution: 10.4
Depends: <<
audiofile-shlibs,
esound-shlibs,
- flac-bin,
+ flac,
fftw3-shlibs,
gsl-shlibs,
ladspa,
Index: vorbis-tools.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/vorbis-tools.info,v
retrieving revision 1.4.2.5
retrieving revision 1.4.2.6
diff -u -d -r1.4.2.5 -r1.4.2.6
--- vorbis-tools.info 18 Sep 2007 00:27:41 -0000 1.4.2.5
+++ vorbis-tools.info 5 Mar 2008 03:33:41 -0000 1.4.2.6
@@ -16,7 +16,7 @@
Package: vorbis-tools
Version: 1.1.1
-Revision: 1003
+Revision: 1004
Source: http://downloads.xiph.org/releases/vorbis/%n-%v.tar.gz
Source-MD5: 47845fd76f5f2354a3619c4097575487
Patch: %n.patch
@@ -27,7 +27,7 @@
libao2-shlibs (>= 0.8.4),
libcurl4-shlibs (>= 7.16.3-102),
speex3-shlibs,
- flac-shlibs (>= 1.1.1-1011) | flac-nox-shlibs (>= 1.1.1-1011),
+ libflac8,
libgettext3-shlibs,
libiconv
<<
@@ -36,7 +36,7 @@
libogg (>= 1.1.0),
libao2 (>= 0.8.4),
libcurl4 (>= 7.16.3-102),
- flac (>= 1.1.1-1011) | flac-nox (>= 1.1.1-1011),
+ libflac8-dev,
speex3,
libgettext3-dev,
gettext-bin,
Index: ices.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sound/ices.info,v
retrieving revision 1.3
retrieving revision 1.3.2.1
diff -u -d -r1.3 -r1.3.2.1
--- ices.info 9 Feb 2006 01:07:36 -0000 1.3
+++ ices.info 5 Mar 2008 03:33:41 -0000 1.3.2.1
@@ -1,7 +1,7 @@
Info2: <<
Package: ices%type_pkg[-perl]%type_pkg[-nonfree]
Version: 0.4
-Revision: 1003
+Revision: 1004
Description: Source client for broadcasting in MP3
License: GPL
Source: http://downloads.xiph.org/releases/%{ni}/%{ni}-%v.tar.gz
@@ -15,13 +15,13 @@
(%type_pkg[-perl]) perl586-core | system-perl586,
(%type_pkg[-nonfree]) lame-shlibs,
(%type_pkg[-nonfree]) libvorbis0-shlibs,
- (%type_pkg[-nonfree]) flac-shlibs (>= 1.1.1-1011)
+ (%type_pkg[-nonfree]) libflac8
<<
BuildDepends: <<
pkgconfig, libshout4, python24 (>= 1:2.4.2-1004), libvorbis0, libogg,
libtheora0,
(%type_pkg[-perl]) perl586-core | system-perl586,
(%type_pkg[-nonfree]) lame-dev,
- (%type_pkg[-nonfree]) flac (>= 1.1.1-1011)
+ (%type_pkg[-nonfree]) libflac8-dev
<<
ConfigureParams: <<
--- NEW FILE: flac-xmms.info ---
Package: flac-xmms
Version: 1.2.1
Revision: 1000
BuildDepends: xmms, popt, libtool14 (>= 1.5-1), libogg, xmms, readline5,
id3lib4-dev (>= 3.8.3-1014), glib, gtk+, libiconv-dev, libgettext3-dev,
gettext-bin, gettext-tools, fink (>= 0.24.12), libflac8-dev
Depends: libflac8 (>= %v-%r), id3lib4-shlibs (>= 3.8.3-1014), popt-shlibs,
xmms-bin
Conflicts: flac-nox, flac-bin, flac (<< 1.2.1)
Replaces: flac-nox, flac-bin
Source: mirror:sourceforge:flac/flac-%v.tar.gz
Source-MD5: 153c8b15a54da428d1f0fadc756c22c7
PatchFile: flac.patch
PatchFile-MD5: 7ee11e6fd7c4541d4593678306a18eb0
PatchScript: <<
#!/bin/sh -ex
patch -p1 < %{PatchFile}
patch -p0 < patches/ltmain.sh.patch
patch -p0 < patches/nasm.h.patch
<<
NoSetCPPFLAGS: true
SetCPPFLAGS: -I$(top_builddir) -I$(srcdir)/include -I$(top_srcdir)/include
-I%p/include
NoSetLDFLAGS: true
ConfigureParams: --mandir='${prefix}/share/man' --disable-rpath (%m = i386)
--disable-asm-optimizations
BuildDependsOnly: True
GCC: 4.0
CompileScript: <<
#!/bin/sh -ex
./configure %c
#/bin/sh patches/fixrpath.sh
make OBJ_FORMAT=macho
<<
InstallScript: <<
#!/bin/sh -ex
bd=$(cd %b && pwd -P)
perl -pi -e "s#\Q$bd\E/src/libFLAC#%p/lib#g" src/plugin_xmms/libxmms-flac.la
cd src/plugin_xmms
make install DESTDIR=%d
<<
DocFiles: AUTHORS COPYING* README
Description: Free lossless audio codec - xmms plugin
DescDetail: <<
FLAC stands for Free Lossless Audio Codec. Grossly oversimplified, FLAC
is similar to MP3, but lossless. The FLAC project consists of:
* The stream format
In the libflacX packages:
* libFLAC, a library encoders and decoders, and a metadata interface
* libFLAC++, an object wrapper around libFLAC
In the flac package:
* flac, a CLI wrapper around libFLAC to encode/decode .flac files
* metaflac, a command-line metadata editor for .flac files
In the flac-xmms package:
* Input plugin for XMMS
<<
DescPackaging: <<
Does not use pbxbuild method since we want dylibs, and
the xmms plugin. Also the make/config method puts everything in
the right place.
libtool relink and bash versioning patches applied.
patch to enable dynamic_lookup (for prebinding on 10.3) applied.
<<
License: GPL
Maintainer: Ben Hines <[EMAIL PROTECTED]>
Homepage: http://flac.sourceforge.net/
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
