[SCM] wxsvg/master: Fix FTBFS with libav (Closes: #632679).

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7170971d6d711bc407a198c2ede63c10142560a6
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Jul 5 09:18:00 2011 +0200

    Fix FTBFS with libav (Closes: #632679).

diff --git a/debian/patches/0001-fix_ftbs_libav.patch b/debian/patches/0001-fix_ftbs_libav.patch
new file mode 100644
index 0000000..7b93163
--- /dev/null
+++ b/debian/patches/0001-fix_ftbs_libav.patch
@@ -0,0 +1,52 @@
+Description: Fix FTBFS with libav > 0.7
+Author: Fabrice Coutadeur <fabricesp at ubuntu.com>
+Origin: Ubuntu
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632679
+---
+ src/mediadec_ffmpeg.cpp |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- wxsvg.orig/src/mediadec_ffmpeg.cpp
++++ wxsvg/src/mediadec_ffmpeg.cpp
+@@ -50,7 +50,7 @@ void PrintError(const wxString& msg, int
+ 	case AVERROR_INVALIDDATA:
+ 		wxLogError(wxT("%s: Error while parsing header"), msg.c_str());
+ 		break;
+-	case AVERROR_NOFMT:
++	case AVERROR(EILSEQ):
+ 		wxLogError(wxT("%s: Unknown format"), msg.c_str());
+ 		break;
+ 	case AVERROR(EIO):
+@@ -106,7 +106,7 @@ float wxFfmpegMediaDecoder::GetFrameAspe
+ 	for (int i=0; i<(int)m_formatCtx->nb_streams; i++) {
+ 		AVStream *st = m_formatCtx->streams[i];
+ 		AVCodecContext *enc = st->codec;
+-		if (enc->codec_type == CODEC_TYPE_VIDEO) {
++		if (enc->codec_type == AVMEDIA_TYPE_VIDEO) {
+ 			if (st->sample_aspect_ratio.num)
+ 				frame_aspect_ratio = av_q2d(st->sample_aspect_ratio);
+ 			else if (enc->sample_aspect_ratio.num)
+@@ -124,11 +124,11 @@ StreamType wxFfmpegMediaDecoder::GetStre
+ 	if (m_formatCtx == NULL || streamIndex >= m_formatCtx->nb_streams)
+ 		return stUNKNOWN;
+ 	switch (m_formatCtx->streams[streamIndex]->codec->codec_type) {
+-	case CODEC_TYPE_VIDEO:
++	case AVMEDIA_TYPE_VIDEO:
+ 		return stVIDEO;
+-	case CODEC_TYPE_AUDIO:
++	case AVMEDIA_TYPE_AUDIO:
+ 		return stAUDIO;
+-	case CODEC_TYPE_SUBTITLE:
++	case AVMEDIA_TYPE_SUBTITLE:
+ 		return stSUBTITLE;
+ 	default:
+ 		break;
+@@ -167,7 +167,7 @@ bool wxFfmpegMediaDecoder::OpenVideoDeco
+ 	// find the first video stream
+ 	m_videoStream = -1;
+ 	for (int i=0; i<(int)m_formatCtx->nb_streams; i++) {
+-		if (m_formatCtx->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) {
++		if (m_formatCtx->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+ 			m_videoStream = i;
+ 			break;
+ 		}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..4243d78
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-fix_ftbs_libav.patch

-- 
wxsvg packaging