rpms/audacity/devel audacity-1.3.2-FLAC.patch, NONE, 1.1 audacity.spec, 1.33, 1.34

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/audacity/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3148

Modified Files:
	audacity.spec 
Added Files:
	audacity-1.3.2-FLAC.patch 
Log Message:
* Sat Feb 24 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3.2-14
- patch for FLAC 1.1.4 API compatibility


audacity-1.3.2-FLAC.patch:

--- NEW FILE audacity-1.3.2-FLAC.patch ---
diff -Nur audacity-src-1.3.2-beta-orig/configure audacity-src-1.3.2-beta/configure
--- audacity-src-1.3.2-beta-orig/configure	2006-10-29 01:05:36.000000000 +0200
+++ audacity-src-1.3.2-beta/configure	2007-02-24 03:12:59.000000000 +0100
@@ -5162,9 +5162,9 @@
 
 
 
-   { 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
@@ -5182,11 +5182,11 @@
 #ifdef __cplusplus
 extern "C"
 #endif
-char FLAC__file_decoder_new ();
+char FLAC__stream_decoder_init_file ();
 int
 main ()
 {
-return FLAC__file_decoder_new ();
+return FLAC__stream_decoder_init_file ();
   ;
   return 0;
 }
@@ -5225,21 +5225,21 @@
   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 core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
       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.2-beta-orig/src/export/ExportFLAC.cpp audacity-src-1.3.2-beta/src/export/ExportFLAC.cpp
--- audacity-src-1.3.2-beta-orig/src/export/ExportFLAC.cpp	2006-10-29 01:05:27.000000000 +0200
+++ audacity-src-1.3.2-beta/src/export/ExportFLAC.cpp	2007-02-24 03:09:44.000000000 +0100
@@ -58,7 +58,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));
 
@@ -72,7 +71,7 @@
     	format=int16Sample;
    	encoder->set_bits_per_sample(16);
    }
-   encoder->init();
+   encoder->init(OSFILENAME(fName));
    
    int numWaveTracks;
    WaveTrack **waveTracks;
diff -Nur audacity-src-1.3.2-beta-orig/src/import/ImportFLAC.cpp audacity-src-1.3.2-beta/src/import/ImportFLAC.cpp
--- audacity-src-1.3.2-beta-orig/src/import/ImportFLAC.cpp	2006-10-29 01:05:28.000000000 +0200
+++ audacity-src-1.3.2-beta/src/import/ImportFLAC.cpp	2007-02-24 03:04:04.000000000 +0100
@@ -264,19 +264,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
@@ -340,7 +336,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/extras/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- audacity.spec	24 Feb 2007 01:00:40 -0000	1.33
+++ audacity.spec	24 Feb 2007 02:45:39 -0000	1.34
@@ -1,6 +1,6 @@
 Name:           audacity
 Version:        1.3.2
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        A multitrack audio editor
 
 Group:          Applications/Multimedia
@@ -15,6 +15,7 @@
 Patch3:         audacity-1.3.2-exportmp3.patch
 Patch4:         audacity-1.3.2-destdir.patch
 Patch5:         audacity-1.3.2-resample.patch
+Patch6:         audacity-1.3.2-FLAC.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  alsa-lib-devel
 BuildRequires:  desktop-file-utils
@@ -55,6 +56,7 @@
 %patch3 -p1 -b .exportmp3
 %patch4 -p1 -b .destdir
 %patch5 -p1 -b .resample
+%patch6 -p1 -b .FLAC
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in help/wxhelp/audacity.hhk help/wxhelp/exportmp3.htm locale/*.po src/export/ExportMP3.cpp
@@ -137,6 +139,9 @@
 
 
 %changelog
+* Sat Feb 24 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3.2-14
+- patch for FLAC 1.1.4 API compatibility
+
 * Sat Feb 24 2007 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.3.2-13
 - patch ExportMP3.cpp (MPEG-2 Layer III bitrates resulted in
   broken/empty files)