Author: peroyvind
Date: Fri Feb 16 19:58:22 2007
New Revision: 122017
Added:
packages/cooker/sox/current/SOURCES/sox-13.0.0-flac-decoder-hack.patch
Modified:
packages/cooker/sox/current/SPECS/sox.spec
Log:
flac decoding seems broken, might be due to my flac patch, work around
for now (P1)
Added: packages/cooker/sox/current/SOURCES/sox-13.0.0-flac-decoder-hack.patch
==============================================================================
--- (empty file)
+++ packages/cooker/sox/current/SOURCES/sox-13.0.0-flac-decoder-hack.patch
Fri Feb 16 19:58:22 2007
@@ -0,0 +1,16 @@
+--- sox-13.0.0/src/flac.c~ 2007-02-16 19:50:21.000000000 +0100
++++ sox-13.0.0/src/flac.c 2007-02-16 19:50:49.000000000 +0100
+@@ -171,11 +171,11 @@ static int st_format_start_read(ft_t con
+ return ST_EOF;
+ }
+
+- 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)
++/* 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;
+- }
++ }*/
+
+ format->signal.encoding = ST_ENCODING_FLAC;
+ format->signal.rate = decoder->sample_rate;
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 19:58:22 2007
@@ -11,12 +11,13 @@
Summary: A general purpose sound file conversion tool
Name: sox
Version: 13.0.0
-Release: %mkrel 3
+Release: %mkrel 4
License: LGPL
Group: Sound
Url: http://sox.sourceforge.net/
Source0:
http://heanet.dl.sourceforge.net/sourceforge/sox/%{name}-%{version}.tar.bz2
Patch0: sox-13.0.0-fix-build-with-new-libflac.patch
+Patch1: sox-13.0.0-flac-decoder-hack.patch
BuildRequires: oggvorbis-devel mad-devel gsm-devel libflac-devel
libsndfile-devel
%if %build_plf
BuildRequires: lame-devel
@@ -58,13 +59,12 @@
%prep
%setup -q
%patch0 -p1 -b .newflac
+%patch1 -p1 -b .flac_decoder_hack
autoconf
%build
-export CFLAGS="%{optflags} -DHAVE_SYS_SOUNDCARD_H=1 -D_FILE_OFFSET_BITS=64
-fPIC -DPIC"
-
+CFLAGS="%{optflags} -DHAVE_SYS_SOUNDCARD_H=1 -D_FILE_OFFSET_BITS=64 -fPIC
-DPIC" \
%configure2_5x
-
%make
%install
