Your message dated Sat, 28 May 2011 16:32:24 +0000
with message-id <e1qqmr6-0003yd...@franck.debian.org>
and subject line Bug#628201: fixed in audacity 1.3.13-4
has caused the Debian Bug report #628201,
regarding audacity: FTBFS against Libav 0.7
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
628201: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628201
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: audacity
Version: 1.3.13-3
Severity: important

I've made a preliminary patch to allow building against Libav 0.7. It
requires a bit polishing and upstreaming!

Libav 0.7 is currently in experimental and awaits the release team's OK
to be uploaded to unstable.

-- System Information:
Debian Release: squeeze/sid
  APT prefers natty-updates
  APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.38-8-generic (SMP w/4 CPU cores)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
--- Begin Message ---
Note: The change in src/export/ExportFFmpeg.cpp is incomplete, as it
disables functionality!

Index: audacity-1.3.13/src/FFmpeg.cpp
===================================================================
--- audacity-1.3.13.orig/src/FFmpeg.cpp 2011-05-28 10:31:34.000899463 +0200
+++ audacity-1.3.13/src/FFmpeg.cpp      2011-05-28 10:38:01.490923503 +0200
@@ -316,7 +316,7 @@
    pd.buf_size = 0;
    pd.buf = (unsigned char *) av_malloc(PROBE_BUF_MAX + AVPROBE_PADDING_SIZE);
    if (pd.buf == NULL) {
-      err = AVERROR_NOMEM;
+      err = AVERROR(ENOMEM);
       goto fail;
    }
 
@@ -381,7 +381,7 @@
 
    // Didn't find a suitable format, so bail
    if (!fmt) {
-      err = AVERROR_NOFMT;
+      err = AVERROR(EILSEQ);
       goto fail;
    }
 
Index: audacity-1.3.13/src/export/ExportFFmpeg.cpp
===================================================================
--- audacity-1.3.13.orig/src/export/ExportFFmpeg.cpp    2011-05-28 
10:41:06.200916455 +0200
+++ audacity-1.3.13/src/export/ExportFFmpeg.cpp 2011-05-28 10:45:40.950922555 
+0200
@@ -352,7 +352,7 @@
    avcodec_get_context_defaults(mEncAudioCodecCtx);
 
    mEncAudioCodecCtx->codec_id = ExportFFmpegOptions::fmts[mSubFormat].codecid;
-   mEncAudioCodecCtx->codec_type = CODEC_TYPE_AUDIO;
+   mEncAudioCodecCtx->codec_type = AVMEDIA_TYPE_AUDIO;
    mEncAudioCodecCtx->codec_tag = av_codec_get_tag((const AVCodecTag 
**)mEncFormatCtx->oformat->codec_tag,mEncAudioCodecCtx->codec_id);
    mSampleRate = (int)project->GetRate();
    mEncAudioCodecCtx->global_quality = -99999; //quality mode is off by 
default;
@@ -403,7 +403,8 @@
       mEncAudioCodecCtx->flags2 = 0;
       if (gPrefs->Read(wxT("/FileFormats/FFmpegBitReservoir"),true)) 
mEncAudioCodecCtx->flags2 |= CODEC_FLAG2_BIT_RESERVOIR;
       if (gPrefs->Read(wxT("/FileFormats/FFmpegVariableBlockLen"),true)) 
mEncAudioCodecCtx->flags2 |= 0x0004; //WMA only?
-      mEncAudioCodecCtx->use_lpc = 
gPrefs->Read(wxT("/FileFormats/FFmpegUseLPC"),true);
+      // Fixme: This needs UI changes so that the user can select the number 
of passes and type!
+      // mEncAudioCodecCtx->use_lpc = 
gPrefs->Read(wxT("/FileFormats/FFmpegUseLPC"),true);
       mEncAudioCodecCtx->compression_level = 
gPrefs->Read(wxT("/FileFormats/FFmpegCompLevel"),-1);
       mEncAudioCodecCtx->frame_size = 
gPrefs->Read(wxT("/FileFormats/FFmpegFrameSize"),(long)0);
       mEncAudioCodecCtx->lpc_coeff_precision = 
gPrefs->Read(wxT("/FileFormats/FFmpegLPCCoefPrec"),(long)0);
@@ -569,7 +570,7 @@
       pkt.stream_index = mEncAudioStream->index;
       pkt.data = mEncAudioEncodedBuf;
       pkt.size = nEncodedBytes;
-      pkt.flags |= PKT_FLAG_KEY;
+      pkt.flags |= AV_PKT_FLAG_KEY;
 
       // Set presentation time of frame (currently in the codec's timebase) in 
the stream timebase.
       if(mEncAudioCodecCtx->coded_frame && mEncAudioCodecCtx->coded_frame->pts 
!= int64_t(AV_NOPTS_VALUE))
@@ -656,7 +657,7 @@
 
       pkt.stream_index = mEncAudioStream->index;
       pkt.data = mEncAudioEncodedBuf;
-      pkt.flags |= PKT_FLAG_KEY;
+      pkt.flags |= AV_PKT_FLAG_KEY;
 
       // Write the encoded audio frame to the output file.
       if ((ret = av_interleaved_write_frame(mEncFormatCtx, &pkt)) != 0)
Index: audacity-1.3.13/src/export/ExportFFmpegDialogs.cpp
===================================================================
--- audacity-1.3.13.orig/src/export/ExportFFmpegDialogs.cpp     2011-05-28 
10:41:19.140922960 +0200
+++ audacity-1.3.13/src/export/ExportFFmpegDialogs.cpp  2011-05-28 
10:46:04.050922730 +0200
@@ -1288,7 +1288,7 @@
    while ((codec = av_codec_next(codec)))
    {
       // We're only interested in audio and only in encoders
-      if (codec->type == CODEC_TYPE_AUDIO && codec->encode)
+      if (codec->type == AVMEDIA_TYPE_AUDIO && codec->encode)
       {
          mCodecNames.Add(wxString::FromUTF8(codec->name));
          mCodecLongNames.Add(wxString::Format(wxT("%s - 
%s"),mCodecNames.Last().c_str(),wxString::FromUTF8(codec->long_name).c_str()));
@@ -1528,7 +1528,7 @@
          // Find the codec, that is claimed to be compatible
          AVCodec *codec = avcodec_find_encoder(CompatibilityList[i].codec);
          // If it exists, is audio and has encoder
-         if (codec != NULL && (codec->type == CODEC_TYPE_AUDIO) && 
codec->encode)
+         if (codec != NULL && (codec->type == AVMEDIA_TYPE_AUDIO) && 
codec->encode)
          {
             // If it was selected - remember it's new index
             if ((id >= 0) && codec->id == id) index = 
mShownCodecNames.GetCount();
@@ -1543,7 +1543,7 @@
       AVCodec *codec = NULL;
       while ((codec = av_codec_next(codec)))
       {
-         if (codec->type == CODEC_TYPE_AUDIO && codec->encode)
+         if (codec->type == AVMEDIA_TYPE_AUDIO && codec->encode)
          {
             if (mShownCodecNames.Index(wxString::FromUTF8(codec->name)) < 0)
             {
@@ -1563,7 +1563,7 @@
       if (format != NULL)
       {
          AVCodec *codec = avcodec_find_encoder(format->audio_codec);
-         if (codec != NULL && (codec->type == CODEC_TYPE_AUDIO) && 
codec->encode)
+         if (codec != NULL && (codec->type == AVMEDIA_TYPE_AUDIO) && 
codec->encode)
          {
             if ((id >= 0) && codec->id == id) index = 
mShownCodecNames.GetCount();
             mShownCodecNames.Add(wxString::FromUTF8(codec->name));
Index: audacity-1.3.13/src/import/ImportFFmpeg.cpp
===================================================================
--- audacity-1.3.13.orig/src/import/ImportFFmpeg.cpp    2011-05-28 
10:41:46.970935543 +0200
+++ audacity-1.3.13/src/import/ImportFFmpeg.cpp 2011-05-28 10:42:18.180922961 
+0200
@@ -416,7 +416,7 @@
    // Fill the stream contexts
    for (unsigned int i = 0; i < mFormatContext->nb_streams; i++)
    {
-      if (mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
+      if (mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
       {
          //Create a context
          streamContext *sc = new streamContext;

--- End Message ---

--- End Message ---
--- Begin Message ---
Source: audacity
Source-Version: 1.3.13-4

We believe that the bug you reported is fixed in the latest version of
audacity, which is due to be installed in the Debian FTP archive:

audacity-data_1.3.13-4_all.deb
  to main/a/audacity/audacity-data_1.3.13-4_all.deb
audacity-dbg_1.3.13-4_amd64.deb
  to main/a/audacity/audacity-dbg_1.3.13-4_amd64.deb
audacity_1.3.13-4.debian.tar.gz
  to main/a/audacity/audacity_1.3.13-4.debian.tar.gz
audacity_1.3.13-4.dsc
  to main/a/audacity/audacity_1.3.13-4.dsc
audacity_1.3.13-4_amd64.deb
  to main/a/audacity/audacity_1.3.13-4_amd64.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 628...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Benjamin Drung <bdr...@debian.org> (supplier of updated audacity package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Sat, 28 May 2011 13:41:09 +0200
Source: audacity
Binary: audacity audacity-data audacity-dbg
Architecture: source amd64 all
Version: 1.3.13-4
Distribution: unstable
Urgency: low
Maintainer: Debian Multimedia Maintainers 
<pkg-multimedia-maintainers@lists.alioth.debian.org>
Changed-By: Benjamin Drung <bdr...@debian.org>
Description: 
 audacity   - fast, cross-platform audio editor
 audacity-data - fast, cross-platform audio editor (data)
 audacity-dbg - fast, cross-platform audio editor (debug)
Closes: 628138 628201
Changes: 
 audacity (1.3.13-4) unstable; urgency=low
 .
   * libav-0.7.patch: Unbreak compilation against libav 0.7.
     Thanks to Reinhard Tartler for the patch (Closes: #628201)
   * Bump required libav version to 0.6 (Closes: #628138)
Checksums-Sha1: 
 6d3ecb2183f4847338455f9433336ca12bd427cd 2608 audacity_1.3.13-4.dsc
 9d480599a489a8e33e3adf4d9e83c754c1949c6d 24918 audacity_1.3.13-4.debian.tar.gz
 187c22862a719c2e3eccd26e9b7f2b50b3d7a580 2620726 audacity_1.3.13-4_amd64.deb
 9f1f4102b67151aff76926222c71c0cf91c4558a 2531324 audacity-data_1.3.13-4_all.deb
 9174cc5945c0cb30263bc55de935f1828bfbb7e9 19898350 
audacity-dbg_1.3.13-4_amd64.deb
Checksums-Sha256: 
 d4e231bf7f832cd54f3a005c61452ca89dfb13287c09624df1bbd1278bc13227 2608 
audacity_1.3.13-4.dsc
 213f570b301ba7e2a62e7c51e5f682600cc0b524bfe1ef14029e599a4a6b4000 24918 
audacity_1.3.13-4.debian.tar.gz
 68bee5185f81256a7ac7988de14a7cbc7969b2f938888df3ed42154ac3d9cd20 2620726 
audacity_1.3.13-4_amd64.deb
 4042ceeb673e93b2280eb10a539520ddb4001e62cf63f21e2add6755574bc1e8 2531324 
audacity-data_1.3.13-4_all.deb
 04885871fcbdf25869eb2b2523713c72569fda4eadf30ca91a84c78dc9038e48 19898350 
audacity-dbg_1.3.13-4_amd64.deb
Files: 
 bbfad99e195c691d395c478ff4ef8f77 2608 sound optional audacity_1.3.13-4.dsc
 490c75ca4493d9deb558cf2f4c0df542 24918 sound optional 
audacity_1.3.13-4.debian.tar.gz
 b54a41fad45d609b7a81a134691bd2df 2620726 sound optional 
audacity_1.3.13-4_amd64.deb
 055fd517bc66365e858d0c52d9e19e0b 2531324 sound optional 
audacity-data_1.3.13-4_all.deb
 28d869aa7a00f5f822e215c46398200c 19898350 debug extra 
audacity-dbg_1.3.13-4_amd64.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)

iQIcBAEBCgAGBQJN4SANAAoJEBWetcTvyHdMQ7QP/j5qZJgYkEjJdV32M78fES+C
8y9Ssyc+nzcuwQt0LiQ44PBiRAMPi7jJc4yONISYtXAKcFQ7KX9tBq7kOdSUqyrb
HLgx+HPnGBL20z0Zh3DiUdxQbPAg4CXIjU/tmyq0PHI9Dh5VM5N6YWu3n8dco3/0
gOgVWpSQ38Ils0bEIeV/hX3TCnUGv5NxycGK4oI7xeUl5csvMi2FneWijJSlbSnt
uwI8B7/nonLs5LD4WQiuZfFX64fQ6a1YUd/TZFbYK7/AHhIyr8NfsByR+ONEy6ZU
yk2bzsZsuZZnnEy5Xqwl7zg8ScciVeDwTSu5e/Ye0hza2b11p2VwSY8ZIZqQKqlR
6qNBuJ+/BA04qoMMULJoLlUI+1TFvS/4vv3+F01DRDyZ1fe0QzRIyhPBb+1g0G27
90VzQjN6ZcTXaWwIXofydXiSi38c1vITgqVkrvqiN3DzNkBkXsBnqdMrIH5upupS
U/3jvAsxMh1X7Wq4+iW1iwu7Au8usuw2IXYvRR9sVSeQywwg8aEtDMAebj0VKt9A
m9dDIKs8xtOcBVI9hf2wkp20KojigXa8M4xLMu4Rnfdi2jgys9ZZuF6PLFro4h+a
2UiZhCxs2L2Cab8OaOg+XZNi9azPIw5k8RP5w0qlr/wHPMNdOhC4u9diZpgvPDHH
z45A/vjysjD9VFe/ykPC
=maWS
-----END PGP SIGNATURE-----



--- End Message ---
_______________________________________________
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Reply via email to