Author: peroyvind
Date: Fri Feb 16 04:59:35 2007
New Revision: 121588
Added:
packages/cooker/sox/current/SOURCES/sox-13.0.0-fix-build-with-new-libflac.patch
Modified:
packages/cooker/sox/current/SPECS/sox.spec
Log:
fix build with new flac version (P0)
Added:
packages/cooker/sox/current/SOURCES/sox-13.0.0-fix-build-with-new-libflac.patch
==============================================================================
--- (empty file)
+++
packages/cooker/sox/current/SOURCES/sox-13.0.0-fix-build-with-new-libflac.patch
Fri Feb 16 04:59:35 2007
@@ -0,0 +1,146 @@
+--- sox-13.0.0/configure.ac~ 2007-02-11 20:48:22.000000000 +0100
++++ sox-13.0.0/configure.ac 2007-02-16 02:46:08.000000000 +0100
+@@ -134,8 +134,8 @@ AC_ARG_WITH(flac,
+ [with_flac=$withval],
+ [with_flac=yes])
+ if test "$with_flac" = yes; then
+- AC_CHECK_HEADER(FLAC/file_encoder.h,
+- [AC_CHECK_LIB(FLAC, FLAC__file_encoder_new,,with_flac=no)],
++ AC_CHECK_HEADER(FLAC/stream_encoder.h,
++ [AC_CHECK_LIB(FLAC, FLAC__stream_encoder_new,,with_flac=no)],
+ with_flac=no)
+ fi
+
+--- sox-13.0.0/src/flac.c.orig 2007-02-16 03:55:36.000000000 +0100
++++ sox-13.0.0/src/flac.c 2007-02-16 04:54:00.000000000 +0100
+@@ -47,7 +47,7 @@ typedef struct
+ unsigned number_of_wide_samples;
+ unsigned wide_sample_number;
+
+- FLAC__FileDecoder * flac;
++ FLAC__StreamDecoder * flac;
+ FLAC__bool eof;
+ } Decoder;
+
+@@ -57,7 +57,7 @@ assert_static(sizeof(Decoder) <= ST_MAX_
+
+
+
+-static void FLAC__decoder_metadata_callback(FLAC__FileDecoder const * const
flac, FLAC__StreamMetadata const * const metadata, void * const client_data)
++static void FLAC__decoder_metadata_callback(FLAC__StreamDecoder const * const
flac, FLAC__StreamMetadata const * const metadata, void * const client_data)
+ {
+ ft_t format = (ft_t) client_data;
+ Decoder * decoder = (Decoder *) format->priv;
+@@ -106,7 +106,7 @@ static void FLAC__decoder_metadata_callb
+
+
+
+-static void FLAC__decoder_error_callback(FLAC__FileDecoder const * const
flac, FLAC__StreamDecoderErrorStatus const status, void * const client_data)
++static void FLAC__decoder_error_callback(FLAC__StreamDecoder const * const
flac, FLAC__StreamDecoderErrorStatus const status, void * const client_data)
+ {
+ ft_t format = (ft_t) client_data;
+
+@@ -117,7 +117,7 @@ static void FLAC__decoder_error_callback
+
+
+
+-static FLAC__StreamDecoderWriteStatus
FLAC__frame_decode_callback(FLAC__FileDecoder const * const flac, FLAC__Frame
const * const frame, FLAC__int32 const * const buffer[], void * const
client_data)
++static FLAC__StreamDecoderWriteStatus
FLAC__frame_decode_callback(FLAC__StreamDecoder const * const flac, FLAC__Frame
const * const frame, FLAC__int32 const * const buffer[], void * const
client_data)
+ {
+ ft_t format = (ft_t) client_data;
+ Decoder * decoder = (Decoder *) format->priv;
+@@ -143,34 +143,35 @@ static int st_format_start_read(ft_t con
+ Decoder * decoder = (Decoder *) format->priv;
+
+ memset(decoder, 0, sizeof(*decoder));
+- decoder->flac = FLAC__file_decoder_new();
++ decoder->flac = FLAC__stream_decoder_new();
+ if (decoder->flac == NULL)
+ {
+ st_fail_errno(format, ST_ENOMEM, "FLAC ERROR creating the decoder
instance");
+ return ST_EOF;
+ }
+
+- FLAC__file_decoder_set_md5_checking(decoder->flac, st_true);
+- FLAC__file_decoder_set_filename(decoder->flac, format->filename);
+- FLAC__file_decoder_set_write_callback(decoder->flac,
FLAC__frame_decode_callback);
+- FLAC__file_decoder_set_metadata_callback(decoder->flac,
FLAC__decoder_metadata_callback);
+- FLAC__file_decoder_set_error_callback(decoder->flac,
FLAC__decoder_error_callback);
+- FLAC__file_decoder_set_metadata_respond_all(decoder->flac);
+- FLAC__file_decoder_set_client_data(decoder->flac, format);
+
+- if (FLAC__file_decoder_init(decoder->flac) != FLAC__FILE_DECODER_OK)
++ FLAC__stream_decoder_set_md5_checking(decoder->flac, st_true);
++ FLAC__stream_decoder_set_metadata_respond_all(decoder->flac);
++ if(FLAC__stream_decoder_init_file(
++ decoder->flac,
++ format->filename,
++ FLAC__frame_decode_callback,
++ FLAC__decoder_metadata_callback,
++ FLAC__decoder_error_callback,
++ format
++ ) != FLAC__STREAM_DECODER_INIT_STATUS_OK)
+ {
+- st_fail_errno(format, ST_EHDR, "FLAC ERROR initialising decoder");
+- return ST_EOF;
++ st_fail_errno(format, ST_EHDR, "FLAC ERROR initialising decoder");
++ return ST_EOF;
+ }
+-
+- if (!FLAC__file_decoder_process_until_end_of_metadata(decoder->flac))
++ if (!FLAC__stream_decoder_process_until_end_of_metadata(decoder->flac))
+ {
+ st_fail_errno(format, ST_EHDR, "FLAC ERROR whilst decoding metadata");
+ return ST_EOF;
+ }
+
+- if (FLAC__file_decoder_get_state(decoder->flac) != FLAC__FILE_DECODER_OK &&
FLAC__file_decoder_get_state(decoder->flac) != FLAC__FILE_DECODER_END_OF_FILE)
++ if (FLAC__stream_decoder_get_state(decoder->flac) !=
FLAC__STREAM_DECODER_INIT_STATUS_OK &&
FLAC__stream_decoder_get_state(decoder->flac) !=
FLAC__STREAM_DECODER_END_OF_STREAM)
+ {
+ st_fail_errno(format, ST_EHDR, "FLAC ERROR during metadata decoding");
+ return ST_EOF;
+@@ -193,7 +194,7 @@ static st_size_t st_format_read(ft_t con
+ while (!decoder->eof && actual < requested)
+ {
+ if (decoder->wide_sample_number >= decoder->number_of_wide_samples)
+- FLAC__file_decoder_process_single(decoder->flac);
++ FLAC__stream_decoder_process_single(decoder->flac);
+ if (decoder->wide_sample_number >= decoder->number_of_wide_samples)
+ decoder->eof = st_true;
+ else {
+@@ -220,11 +221,11 @@ static int st_format_stop_read(ft_t cons
+ {
+ Decoder * decoder = (Decoder *) format->priv;
+
+- if (!FLAC__file_decoder_finish(decoder->flac) && decoder->eof)
++ if (!FLAC__stream_decoder_finish(decoder->flac) && decoder->eof)
+ {
+ st_warn("FLAC decoder MD5 checksum mismatch.");
+ }
+- FLAC__file_decoder_delete(decoder->flac);
++ FLAC__stream_decoder_delete(decoder->flac);
+ return ST_SUCCESS;
+ }
+
+@@ -405,11 +406,18 @@ static int st_format_start_write(ft_t co
+ free(comments);
+ }
+
+- FLAC__stream_encoder_set_write_callback(encoder->flac,
flac_stream_encoder_write_callback);
++/* FLAC__stream_encoder_set_write_callback(encoder->flac,
flac_stream_encoder_write_callback);
+ FLAC__stream_encoder_set_metadata_callback(encoder->flac,
flac_stream_encoder_metadata_callback);
+ FLAC__stream_encoder_set_client_data(encoder->flac, format);
+-
+- status = FLAC__stream_encoder_init(encoder->flac);
++*/
++ status = FLAC__stream_encoder_init_stream(
++ encoder->flac,
++ flac_stream_encoder_write_callback,
++ NULL,
++ NULL,
++ flac_stream_encoder_metadata_callback,
++ format
++ );
+ if (status != FLAC__STREAM_ENCODER_OK)
+ {
+ st_fail_errno(format, ST_EINVAL, "%s",
FLAC__StreamEncoderStateString[status]);
Modified: packages/cooker/sox/current/SPECS/sox.spec
==============================================================================
--- packages/cooker/sox/current/SPECS/sox.spec (original)
+++ packages/cooker/sox/current/SPECS/sox.spec Fri Feb 16 04:59:35 2007
@@ -15,7 +15,8 @@
License: LGPL
Group: Sound
Url: http://sox.sourceforge.net/
-Source:
http://heanet.dl.sourceforge.net/sourceforge/sox/%{name}-%{version}.tar.bz2
+Source0:
http://heanet.dl.sourceforge.net/sourceforge/sox/%{name}-%{version}.tar.bz2
+Patch0: sox-13.0.0-fix-build-with-new-libflac.patch
BuildRequires: oggvorbis-devel mad-devel gsm-devel libflac-devel
libsndfile-devel
%if %build_plf
BuildRequires: lame-devel
@@ -56,14 +57,13 @@
%prep
%setup -q
+%patch0 -p1 -b .newflac
+autoconf
%build
export CFLAGS="%{optflags} -DHAVE_SYS_SOUNDCARD_H=1 -D_FILE_OFFSET_BITS=64
-fPIC -DPIC"
-%configure2_5x --with-sndfile \
- --with-flac \
- --with-mad \
- --with-lame
+%configure2_5x
%make
