Updated to 1.5.5-2. Fixed compilation with ffmpeg>=2.9.

Thanks to the Gentoo guys for the patch.

3 files changed, 28 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 32729730dd31..c563113d3492 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Mon Mar  7 10:21:20 UTC 2016
 pkgbase = wxsvg
 	pkgdesc = C++ library to create, manipulate and render SVG files
 	pkgver = 1.5.5
-	pkgrel = 1
+	pkgrel = 2
 	url = http://wxsvg.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -12,7 +14,9 @@ pkgbase = wxsvg
 	depends = webkitgtk2
 	options = !libtool
 	source = http://downloads.sourceforge.net/project/wxsvg/wxsvg/1.5.5/wxsvg-1.5.5.tar.bz2
+	source = ffmpeg29.patch
 	md5sums = 0aadf0a5ad80c19c003013ba63358d53
+	md5sums = 7d22d946b9d8d56e8db67085a75b9cb0
 
 pkgname = wxsvg
 
diff --git a/PKGBUILD b/PKGBUILD
index 93c165f8818c..0854a99ad442 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,15 +5,22 @@
 
 pkgname=wxsvg
 pkgver=1.5.5
-pkgrel=1
+pkgrel=2
 pkgdesc="C++ library to create, manipulate and render SVG files"
 arch=('i686' 'x86_64')
 url="http://wxsvg.sourceforge.net/"
 license=('custom:wxWindows')
 depends=('wxgtk' 'ffmpeg' 'ffmpeg-compat' 'webkitgtk2')
 options=('!libtool')
-source=("http://downloads.sourceforge.net/project/wxsvg/wxsvg/${pkgver}/wxsvg-${pkgver}.tar.bz2")
-md5sums=('0aadf0a5ad80c19c003013ba63358d53')
+source=("http://downloads.sourceforge.net/project/wxsvg/wxsvg/${pkgver}/wxsvg-${pkgver}.tar.bz2"
+		"ffmpeg29.patch")
+md5sums=('0aadf0a5ad80c19c003013ba63358d53'
+         '7d22d946b9d8d56e8db67085a75b9cb0')
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p1 < ../ffmpeg29.patch
+}
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/ffmpeg29.patch b/ffmpeg29.patch
new file mode 100644
index 000000000000..5f191025fea5
--- /dev/null
+++ b/ffmpeg29.patch
@@ -0,0 +1,13 @@
+Index: wxsvg-1.5.5/src/mediadec_ffmpeg.cpp
+===================================================================
+--- wxsvg-1.5.5.orig/src/mediadec_ffmpeg.cpp
++++ wxsvg-1.5.5/src/mediadec_ffmpeg.cpp
+@@ -263,7 +263,7 @@ wxImage wxFfmpegMediaDecoder::GetNextFra
+ 			avcodec_decode_video2(m_codecCtx, m_frame, &frameFinished, &packet);
+ 			if (frameFinished) {
+ 				SwsContext* imgConvertCtx = sws_getContext(m_codecCtx->width, m_codecCtx->height, m_codecCtx->pix_fmt,
+-						m_width, m_height, PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
++						m_width, m_height, AV_PIX_FMT_RGB24, SWS_BICUBIC, NULL, NULL, NULL);
+ 				if (imgConvertCtx == NULL) {
+ 					av_free_packet(&packet);
+ 					return wxImage();