Author: peroyvind
Date: Fri Feb 16 05:06:27 2007
New Revision: 121589
Modified:
packages/cooker/sox/current/SOURCES/sox-13.0.0-fix-build-with-new-libflac.patch
Log:
remove commented out code that was forgotten..
Modified:
packages/cooker/sox/current/SOURCES/sox-13.0.0-fix-build-with-new-libflac.patch
==============================================================================
---
packages/cooker/sox/current/SOURCES/sox-13.0.0-fix-build-with-new-libflac.patch
(original)
+++
packages/cooker/sox/current/SOURCES/sox-13.0.0-fix-build-with-new-libflac.patch
Fri Feb 16 05:06:27 2007
@@ -11,8 +11,8 @@
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
+--- sox-13.0.0/src/flac.c.newflac 2007-02-06 04:05:16.000000000 +0100
++++ sox-13.0.0/src/flac.c 2007-02-16 05:03:54.000000000 +0100
@@ -47,7 +47,7 @@ typedef struct
unsigned number_of_wide_samples;
unsigned wide_sample_number;
@@ -122,17 +122,15 @@
return ST_SUCCESS;
}
-@@ -405,11 +406,18 @@ static int st_format_start_write(ft_t co
+@@ -405,11 +406,14 @@ 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);
+- 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,
