[SCM] audacity/master: Update patches.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4e55999c86495792843dd91a3d80d846fabf045e
Author: Benjamin Drung <bdrung at debian.org>
Date:   Sat Jun 30 00:44:58 2012 +0200

    Update patches.

diff --git a/debian/patches/additional-mime-types.patch b/debian/patches/additional-mime-types.patch
index ff02466..69b6f80 100644
--- a/debian/patches/additional-mime-types.patch
+++ b/debian/patches/additional-mime-types.patch
@@ -10,7 +10,7 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=483
  StartupNotify=false
  Terminal=false
 -MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-mp3;audio/x-wav;application/x-audacity-project;
-+MimeType=application/ogg;audio/basic;audio/mpeg;audio/x-aiff;audio/x-mp3;audio/x-wav;application/x-audacity-project;@MIMETYPES@
++MimeType=application/x-audacity-project;@MIMETYPES@
 --- a/configure.in
 +++ b/configure.in
 @@ -89,6 +89,8 @@
@@ -42,3 +42,31 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=483
 +   LIBFLAC_MIMETYPES="audio/flac;audio/x-flac;"
  ])
  
+--- a/m4/audacity_checklib_libmad.m4
++++ b/m4/audacity_checklib_libmad.m4
+@@ -59,5 +59,6 @@
+       LIBMAD_LOCAL_AVAILABLE="no"
+       AC_MSG_NOTICE([libmad libraries are NOT available in the local tree])
+    fi
++   LIBMAD_MIMETYPES="audio/mpeg;audio/x-mp3;"
+ ])
+ 
+--- a/m4/audacity_checklib_libsndfile.m4
++++ b/m4/audacity_checklib_libsndfile.m4
+@@ -50,6 +50,6 @@
+       LIBSNDFILE_LOCAL_AVAILABLE="no"
+       AC_MSG_NOTICE([libsndfile libraries are NOT available in this source tree])
+    fi
+-
++   LIBSNDFILE_MIMETYPES="audio/basic;audio/x-aiff;audio/x-wav;"
+ ])
+ 
+--- a/m4/audacity_checklib_libvorbis.m4
++++ b/m4/audacity_checklib_libvorbis.m4
+@@ -64,5 +64,6 @@
+    else
+       AC_MSG_NOTICE([Vorbis libraries are NOT available in this source tree])
+    fi
++   LIBVORBIS_MIMETYPES="application/ogg;audio/x-vorbis+ogg;"
+ ])
+ 
diff --git a/debian/patches/disable-dynamic-ffmpeg.patch b/debian/patches/disable-dynamic-ffmpeg.patch
index 075a456..f56cf5c 100644
--- a/debian/patches/disable-dynamic-ffmpeg.patch
+++ b/debian/patches/disable-dynamic-ffmpeg.patch
@@ -32,6 +32,15 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
        FFMPEG_SYSTEM_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
 --- a/src/FFmpeg.cpp
 +++ b/src/FFmpeg.cpp
+@@ -481,7 +481,7 @@
+    }
+ 
+    sc->m_samplefmt = sc->m_codecCtx->sample_fmt;
+-   sc->m_samplesize = av_get_bits_per_sample_fmt(sc->m_samplefmt) / 8;
++   sc->m_samplesize = av_get_bits_per_sample_format(sc->m_samplefmt) / 8;
+ 
+    unsigned int newsize = FFMAX(sc->m_pkt.size * sc->m_samplesize, AVCODEC_MAX_AUDIO_FRAME_SIZE);
+    // Reallocate the audio sample buffer if it's smaller than the frame size.
 @@ -751,6 +751,10 @@
  
  bool FFmpegLibs::LoadLibs(wxWindow *parent, bool showerr)
@@ -51,7 +60,18 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
     FreeLibs();
  
  #if defined(__WXMSW__)
-@@ -1048,8 +1053,10 @@
+@@ -1026,9 +1031,7 @@
+    FFMPEG_INITDYN(avcodec, avcodec_version);
+    FFMPEG_INITDYN(avcodec, av_fast_realloc);
+    FFMPEG_INITDYN(avcodec, av_codec_next);
+-   FFMPEG_INITDYN(avcodec, av_get_bits_per_sample_format);
+-
+-   FFMPEG_INITALT(avcodec, av_get_bits_per_sample_fmt, av_get_bits_per_sample_format);
++   FFMPEG_INITALT(avcodec, av_get_bits_per_sample_format, av_get_bits_per_sample_fmt);
+ 
+    FFMPEG_INITDYN(avutil, av_free);
+    FFMPEG_INITDYN(avutil, av_log_set_callback);
+@@ -1048,8 +1051,10 @@
     FFMPEG_INITDYN(avutil, av_rescale_q);
     FFMPEG_INITDYN(avutil, avutil_version);
  
@@ -63,7 +83,7 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
     avcodec_init();
     avcodec_register_all();
     av_register_all();
-@@ -1088,7 +1095,11 @@
+@@ -1088,7 +1093,11 @@
        return false;
     }
  
@@ -77,15 +97,10 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
  }
 --- a/src/FFmpeg.h
 +++ b/src/FFmpeg.h
-@@ -41,6 +41,19 @@
+@@ -41,6 +41,14 @@
     #include <libavutil/fifo.h>
     #include <libavutil/mathematics.h>
  
-+   #define avio_read get_buffer
-+   #define avio_seek url_fseek
-+   #define avio_close url_fclose
-+   #define av_get_bits_per_sample_fmt av_get_bits_per_sample_format
-+
 +   #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 60, 0)
 +   #define av_match_ext match_ext
 +   #endif
@@ -97,7 +112,7 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
     #if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(52, 102, 0)
     #define AVIOContext ByteIOContext
     #endif
-@@ -367,6 +380,7 @@
+@@ -367,6 +375,7 @@
  
  int import_ffmpeg_decode_frame(streamContext *sc, bool flushing);
  
@@ -105,7 +120,7 @@ Bug: http://bugzilla.audacityteam.org/show_bug.cgi?id=233
  extern "C" {
     // A little explanation of what's going on here.
     //
-@@ -899,6 +913,7 @@
+@@ -899,6 +908,7 @@
        (protocol, size)
     );
  };

-- 
Audacity debian packaging