rpms/audacity/devel audacity-1.3.3-FLAC.patch, NONE, 1.1.2.1 audacity.spec, 1.35.2.2, 1.35.2.3 audacity-1.3.2-FLAC.patch, 1.1, NONE
Michael Schwendt (mschwendt)
fedora-extras-commits at redhat.com
Sun May 27 08:49:14 UTC 2007
Author: mschwendt
Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9836
Modified Files:
Tag: audacity-1_3_3-test
audacity.spec
Added Files:
Tag: audacity-1_3_3-test
audacity-1.3.3-FLAC.patch
Removed Files:
Tag: audacity-1_3_3-test
audacity-1.3.2-FLAC.patch
Log Message:
audacity-1.3.3-FLAC.patch:
--- NEW FILE audacity-1.3.3-FLAC.patch ---
diff -Nur audacity-src-1.3.3-beta-orig/configure audacity-src-1.3.3-beta/configure
--- audacity-src-1.3.3-beta-orig/configure 2007-05-18 06:56:02.000000000 +0200
+++ audacity-src-1.3.3-beta/configure 2007-05-27 10:45:37.000000000 +0200
@@ -4316,9 +4316,9 @@
fi;
- echo "$as_me:$LINENO: checking for FLAC__file_decoder_new in -lFLAC" >&5
-echo $ECHO_N "checking for FLAC__file_decoder_new in -lFLAC... $ECHO_C" >&6
-if test "${ac_cv_lib_FLAC_FLAC__file_decoder_new+set}" = set; then
+ echo "$as_me:$LINENO: checking for FLAC__stream_decoder_init_file in -lFLAC" >&5
+echo $ECHO_N "checking for FLAC__stream_decoder_init_file in -lFLAC... $ECHO_C" >&6
+if test "${ac_cv_lib_FLAC_FLAC__stream_decoder_init_file+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@@ -4336,11 +4336,11 @@
#endif
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char FLAC__file_decoder_new ();
+char FLAC__stream_decoder_init_file ();
int
main ()
{
-FLAC__file_decoder_new ();
+FLAC__stream_decoder_init_file ();
;
return 0;
}
@@ -4367,20 +4367,20 @@
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
- ac_cv_lib_FLAC_FLAC__file_decoder_new=yes
+ ac_cv_lib_FLAC_FLAC__stream_decoder_init_file=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-ac_cv_lib_FLAC_FLAC__file_decoder_new=no
+ac_cv_lib_FLAC_FLAC__stream_decoder_init_file=no
fi
rm -f conftest.err conftest.$ac_objext \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__file_decoder_new" >&5
-echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__file_decoder_new" >&6
-if test $ac_cv_lib_FLAC_FLAC__file_decoder_new = yes; then
+echo "$as_me:$LINENO: result: $ac_cv_lib_FLAC_FLAC__stream_decoder_init_file" >&5
+echo "${ECHO_T}$ac_cv_lib_FLAC_FLAC__stream_decoder_init_file" >&6
+if test $ac_cv_lib_FLAC_FLAC__stream_decoder_init_file = yes; then
lib_found="yes"
else
lib_found="no"
diff -Nur audacity-src-1.3.3-beta-orig/src/export/ExportFLAC.cpp audacity-src-1.3.3-beta/src/export/ExportFLAC.cpp
--- audacity-src-1.3.3-beta-orig/src/export/ExportFLAC.cpp 2007-05-18 06:55:50.000000000 +0200
+++ audacity-src-1.3.3-beta/src/export/ExportFLAC.cpp 2007-05-27 10:41:10.000000000 +0200
@@ -229,7 +229,6 @@
gPrefs->Read(wxT("/FileFormats/FLACBitDepth"), wxT("16"));
FLAC::Encoder::File *encoder= new FLAC::Encoder::File();
- encoder->set_filename(OSFILENAME(fName));
encoder->set_channels(numChannels);
encoder->set_sample_rate(int(rate + 0.5));
@@ -264,7 +263,7 @@
encoder->set_rice_parameter_search_dist(flacLevels[levelPref].rice_parameter_search_dist);
encoder->set_max_lpc_order(flacLevels[levelPref].max_lpc_order);
- encoder->init();
+ encoder->init(OSFILENAME(fName));
int numWaveTracks;
WaveTrack **waveTracks;
diff -Nur audacity-src-1.3.3-beta-orig/src/import/ImportFLAC.cpp audacity-src-1.3.3-beta/src/import/ImportFLAC.cpp
--- audacity-src-1.3.3-beta-orig/src/import/ImportFLAC.cpp 2007-05-18 06:55:53.000000000 +0200
+++ audacity-src-1.3.3-beta/src/import/ImportFLAC.cpp 2007-05-27 10:40:31.000000000 +0200
@@ -273,19 +273,15 @@
bool FLACImportFileHandle::Init()
{
- bool success = mFile->set_filename(OSFILENAME(mName));
- if (!success) {
- return false;
- }
- FLAC::Decoder::File::State state = mFile->init();
- if (state != FLAC__FILE_DECODER_OK) {
+ FLAC__StreamDecoderInitStatus state = mFile->init(OSFILENAME(mName));
+ if (state != FLAC__STREAM_DECODER_INIT_STATUS_OK) {
return false;
}
mFile->process_until_end_of_metadata();
- state = mFile->get_state();
- if (state != FLAC__FILE_DECODER_OK) {
- return false;
- }
+ // FLAC__StreamDecoderState decstate = mFile->get_state();
+ // if (state != FLAC__STREAM_DECODER_FILE_DECODER_OK) {
+ // return false;
+ // }
if (!mFile->is_valid() || mFile->get_was_error())
{
// This probably is not a FLAC file at all
@@ -349,7 +345,7 @@
mChannels[1]->SetTeamed(true);
}
- mFile->process_until_end_of_file();
+ mFile->process_until_end_of_stream();
*outTracks = new Track *[*outNumTracks];
for(c = 0; c < *outNumTracks; c++) {
Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.35.2.2
retrieving revision 1.35.2.3
diff -u -r1.35.2.2 -r1.35.2.3
--- audacity.spec 27 May 2007 08:35:30 -0000 1.35.2.2
+++ audacity.spec 27 May 2007 08:48:39 -0000 1.35.2.3
@@ -15,8 +15,7 @@
Patch4: audacity-1.3.2-destdir.patch
# TODO: verify 1st half, 2nd part merged upstream
#Patch5: audacity-1.3.2-resample.patch
-# TODO: rewrite/rediff
-#Patch6: audacity-1.3.2-FLAC.patch
+Patch6: audacity-1.3.3-FLAC.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
@@ -58,7 +57,7 @@
#%patch3 -p1 -b .exportmp3
%patch4 -p1 -b .destdir
#%patch5 -p1 -b .resample
-#%patch6 -p1 -b .FLAC
+%patch6 -p1 -b .FLAC
# Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
for i in locale/*.po src/export/ExportMP3.cpp
--- audacity-1.3.2-FLAC.patch DELETED ---
More information about the fedora-extras-commits
mailing list