Bug#739454: FTBFS with libav10

2014-02-24 Thread anton

Hi,
the attached patch should fix this bug.

-- 
Anton KhirnovIndex: wxsvg-1.2~dfsg0/src/mediadec_ffmpeg.cpp
===
--- wxsvg-1.2~dfsg0.orig/src/mediadec_ffmpeg.cpp	2013-02-13 14:38:11.0 +
+++ wxsvg-1.2~dfsg0/src/mediadec_ffmpeg.cpp	2014-02-25 06:48:23.341289700 +
@@ -108,8 +108,8 @@
 	float result = -1;
 	for (unsigned int i = 0; i  m_formatCtx-nb_streams; i++) {
 		AVStream* st = m_formatCtx-streams[i];
-		if (st-codec-codec_type == AVMEDIA_TYPE_VIDEO  st-r_frame_rate.num  st-r_frame_rate.den) {
-			result = ((float) st-r_frame_rate.num) / st-r_frame_rate.den;
+		if (st-codec-codec_type == AVMEDIA_TYPE_VIDEO  st-avg_frame_rate.num  st-avg_frame_rate.den) {
+			result = ((float) st-avg_frame_rate.num) / st-avg_frame_rate.den;
 			break;
 		}
 	}
___
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers

Bug#739454: FTBFS with libav10

2014-02-18 Thread Moritz Muehlenhoff
Source: wxsvg
Severity: important

Hi,
your package fails to build from source against libav 10 (currently
packaged in experimental). This bug will become release-critical
at some point when the libav10 transition starts.

Migration documentation can be found at
https://wiki.libav.org/Migration/10

Cheers,
Moritz


 -I../include/wxSVG -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector 
--param=ssp-buffer-size=4 -Wformat -Werror=format-security -I/usr/include/cairo 
-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 
-I/usr/include/libdrm -DUSE_RENDER_CAIRO -pthread -I/usr/include/pango-1.0 
-I/usr/include/cairo -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 -I/usr/include/libdrm 
-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 -DUSE_LIBAV -c mediadec_ffmpeg.cpp  -fPIC -DPIC -o 
.libs/mediadec_ffmpeg.o
mediadec_ffmpeg.cpp: In member function 'virtual float 
wxFfmpegMediaDecoder::GetFps()':
mediadec_ffmpeg.cpp:111:58: error: 'AVStream' has no member named 'r_frame_rate'
   if (st-codec-codec_type == AVMEDIA_TYPE_VIDEO  st-r_frame_rate.num  
st-r_frame_rate.den) {
  ^
mediadec_ffmpeg.cpp:111:82: error: 'AVStream' has no member named 'r_frame_rate'
   if (st-codec-codec_type == AVMEDIA_TYPE_VIDEO  st-r_frame_rate.num  
st-r_frame_rate.den) {

  ^
mediadec_ffmpeg.cpp:112:26: error: 'AVStream' has no member named 'r_frame_rate'
result = ((float) st-r_frame_rate.num) / st-r_frame_rate.den;
  ^
mediadec_ffmpeg.cpp:112:50: error: 'AVStream' has no member named 'r_frame_rate'
result = ((float) st-r_frame_rate.num) / st-r_frame_rate.den;
  ^
mediadec_ffmpeg.cpp: In member function 'virtual bool 
wxFfmpegMediaDecoder::BeginDecode(int, int)':
mediadec_ffmpeg.cpp:208:15: warning: 'AVFrame* avcodec_alloc_frame()' is 
deprecated (declared at /usr/include/libavcodec/avcodec.h:3110) 
[-Wdeprecated-declarations]
 m_frame = avcodec_alloc_frame();
   ^
mediadec_ffmpeg.cpp:208:35: warning: 'AVFrame* avcodec_alloc_frame()' is 
deprecated (declared at /usr/include/libavcodec/avcodec.h:3110) 
[-Wdeprecated-declarations]
 m_frame = avcodec_alloc_frame();
   ^
make[3]: *** [mediadec_ffmpeg.lo] Error 1
make[3]: Leaving directory `/home/jmm/av10/wxsvg-1.2~dfsg0/src'
make[2]: *** [all-recursive] Error 1
make[2]: Leaving directory `/home/jmm/av10/wxsvg-1.2~dfsg0/src'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/home/jmm/av10/wxsvg-1.2~dfsg0'
dh_auto_build: make -j1 returned exit code 2
make: *** [build] Error 2
dpkg-buildpackage: error: debian/rules build gave error exit status 2

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