Package: wxsvg
Version: 2:1.0.10~dfsg0-1
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu oneiric ubuntu-patch
Hi,
libavcodec 0.7 is in experimental as well as in next release of Ubuntu, and
as it deprecate several functions, wxsvg has to be patched to build correctly.
This is the patch we applied in Ubuntu to fix wxsvg:
*** /tmp/tmpv1k0RJ
The resulting package builds fine in sid: thanks for considering the patch.
Fabrice
-- 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/2 CPU cores)
Locale: LANG=es_ES.UTF8, LC_CTYPE=es_ES.UTF8 (charmap=UTF-8) (ignored: LC_ALL
set to es_ES.UTF8)
Shell: /bin/sh linked to /bin/dash
diff -Nru wxsvg-1.0.10~dfsg0/debian/patches/fix-ftbs-libav-0.7.patch wxsvg-1.0.10~dfsg0/debian/patches/fix-ftbs-libav-0.7.patch
--- wxsvg-1.0.10~dfsg0/debian/patches/fix-ftbs-libav-0.7.patch 1970-01-01 01:00:00.000000000 +0100
+++ wxsvg-1.0.10~dfsg0/debian/patches/fix-ftbs-libav-0.7.patch 2011-07-04 20:34:36.000000000 +0200
@@ -0,0 +1,47 @@
+Description: fix FTBFS with libav > 0.7
+Author: Fabrice Coutadeur <fabric...@ubuntu.com>
+
+--- wxsvg-1.0.10~dfsg0.orig/src/mediadec_ffmpeg.cpp
++++ wxsvg-1.0.10~dfsg0/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 -Nru wxsvg-1.0.10~dfsg0/debian/patches/series wxsvg-1.0.10~dfsg0/debian/patches/series
--- wxsvg-1.0.10~dfsg0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ wxsvg-1.0.10~dfsg0/debian/patches/series 2011-07-04 20:34:44.000000000 +0200
@@ -0,0 +1 @@
+fix-ftbs-libav-0.7.patch
_______________________________________________
pkg-multimedia-maintainers mailing list
pkg-multimedia-maintainers@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
