Reinhard Tartler wrote:
> Package: audacity
> Version: 2.0.2-1
> Severity: important
>
> Hi,
>
> Audacity currently FTBFS with libav 9:
>
> g++ -c -I../lib-src/portmixer/include -g -O2 -fstack-protector
> --param=ssp-buffer-size=4 -Wformat -Werror=format-security -Wall
> -I/usr/lib/x86_64-linux-gnu/wx/include/gtk2-unicode-release-2.8
> -I/usr/include/wx-2.8 -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D__WXGTK__
> -pthread -I../lib-src/FileDialog
> -I/build/buildd/audacity-2.0.2/lib-src/lib-widget-extra
> -I/usr/include/soundtouch -I../lib-src/libnyquist -g -O2 -Wall
> -I/usr/include/portSMF -pthread -fno-strict-aliasing -I./include -I.
> -DLIBDIR=\"/usr/lib\" -D__STDC_CONSTANT_MACROS -D_FORTIFY_SOURCE=2 -Wall
> -pthread -I/usr/include/gtk-2.0 -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include
> -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/gdk-pixbuf-2.0
> -I/usr/include/pango-1.0 -I/usr/include/gio-unix-2.0/ -I/usr/include/glib-2.0
> -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1
> -I/usr/include/freetype2 -I/usr/include/libpng12 AudacityApp.cpp -o
> AudacityApp.o
> In file included from AudacityApp.cpp:70:0:
> FFmpeg.h:356:4: error: 'SampleFormat' does not name a type
>
> It should use AVSampleFormat instead.
Partial patch attached.
There's more work needed, though. audacity uses URLContext, which is no longer
exported
in libav9.
Cheers,
Moritz
diff -aur audacity-2.0.3.orig/src/FFmpeg.h audacity-2.0.3/src/FFmpeg.h
--- audacity-2.0.3.orig/src/FFmpeg.h 2013-01-18 16:50:58.000000000 +0100
+++ audacity-2.0.3/src/FFmpeg.h 2013-07-23 15:36:11.900000000 +0200
@@ -353,7 +353,7 @@
int m_initialchannels; // number of channels allocated when we begin the importing. Assumes that number of channels doesn't change on the fly.
int m_samplesize; // input sample size in bytes
- SampleFormat m_samplefmt; // input sample format
+ AVSampleFormat m_samplefmt; // input sample format
int m_osamplesize; // output sample size in bytes
sampleFormat m_osamplefmt; // output sample format
Nur in audacity-2.0.3/src: FFmpeg.h~.
