fix build with latest ffmpeg

Package-Manager: portage-2.2_rc41/cvs/Linux x86_64

4 files changed, 67 insertions, 6 deletions

diff --git a/media-plugins/vdr-osdpip/ChangeLog b/media-plugins/vdr-osdpip/ChangeLog
index 41c01ac5ced7..20ca079b9eaf 100644
--- a/media-plugins/vdr-osdpip/ChangeLog
+++ b/media-plugins/vdr-osdpip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-osdpip
-# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/ChangeLog,v 1.9 2008/12/17 06:28:21 ssuominen Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/ChangeLog,v 1.10 2009/09/22 05:28:32 aballier Exp $
+
+  22 Sep 2009; Alexis Ballier <aballier@gentoo.org>
+  vdr-osdpip-0.0.10.ebuild, +files/vdr-osdpip-0.0.10-avutil50.patch:
+  fix build with latest ffmpeg
 
   17 Dec 2008; <ssuominen@gentoo.org> vdr-osdpip-0.0.10.ebuild:
   x86 stable, because current stable doesn't link against -lswscale.
diff --git a/media-plugins/vdr-osdpip/Manifest b/media-plugins/vdr-osdpip/Manifest
index c36eb4b5fc0b..f5973ef195cd 100644
--- a/media-plugins/vdr-osdpip/Manifest
+++ b/media-plugins/vdr-osdpip/Manifest
@@ -1,4 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX vdr-osdpip-0.0.10-avutil50.patch 2241 RMD160 4d5a2372ae1552aa82b2ed460fc2404e4c343598 SHA1 75d0b21d2936638b64dcd706719f17b845b34b8a SHA256 35ad245582793adbc66374ef5ee236913d1f1a251f7d24856e5b5bfbf618a7b5
 DIST vdr-osdpip-0.0.10.tgz 32703 RMD160 70e2fbffd15ea4d0b1b8899cbf27d93c5591751f SHA1 1a4d02236dd021d522a32e2d9863e4d6950f7ad7 SHA256 b324f99d178c30dc13b56d522998dd666eafa2f65a67c90d6221fe8e4058e378
-EBUILD vdr-osdpip-0.0.10.ebuild 1022 RMD160 13554ba88f8b5fa76dfadee7916f97afe1a21ed8 SHA1 2a4bfe8dcf3d1988ce8e2017695bb5fe30d50ebc SHA256 c1ee7c735651443c75d958d5839b9bb97a3c0094d25b42a7e5c330c144dd41fd
-MISC ChangeLog 1828 RMD160 dd14a5ec14715d7ecaa490f364e9221bbc0dc3c9 SHA1 99c216282ebf3f16117ff44bc57ffd5417d91a76 SHA256 d95255391ec740b0e3973754a37cdecda0da4f4bc06863af5b1c647e413894ef
+EBUILD vdr-osdpip-0.0.10.ebuild 1067 RMD160 ced91f990a79d55967dca496a5ddc3fc4a2a11e4 SHA1 f71f9695d499196393cfef4cad9a3e162d4710ce SHA256 1bef1ed1c5a9ea546d2e978aaf1f7c1952ef569c3b7663076ad009c177586bca
+MISC ChangeLog 1981 RMD160 fbd6dc82193a37b04b535411f4cc5436051fa9b2 SHA1 af11c5365b7e7cb5c7bafb7d65e94cbb45b20a7b SHA256 a43afb195c83f810a7109f52dded050f09bea942f640fa8e8119115b7dab7002
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq4YIUACgkQvFcC4BYPU0opuwCfRjN8Eb9Rie1m5WzB1Jb6jFa3
+oy8AoMdhLg2fNRkKflTHosnUs/DsQgLF
+=8+mY
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-osdpip/files/vdr-osdpip-0.0.10-avutil50.patch b/media-plugins/vdr-osdpip/files/vdr-osdpip-0.0.10-avutil50.patch
new file mode 100644
index 000000000000..822957030442
--- /dev/null
+++ b/media-plugins/vdr-osdpip/files/vdr-osdpip-0.0.10-avutil50.patch
@@ -0,0 +1,45 @@
+Index: osdpip-0.0.10/decoder.c
+===================================================================
+--- osdpip-0.0.10.orig/decoder.c
++++ osdpip-0.0.10/decoder.c
+@@ -27,10 +27,10 @@ int cDecoder::Open()
+     }
+     m_PicDecoded = avcodec_alloc_frame();
+     m_PicResample = avcodec_alloc_frame();
+-    m_BufferResample = new unsigned char[400 * 300 * 4]; // size for RGBA32
++    m_BufferResample = new unsigned char[400 * 300 * 4]; // size for RGB32
+ #ifndef USE_SWSCALE
+     m_PicConvert = avcodec_alloc_frame();
+-    m_BufferConvert = new unsigned char[400 * 300 * 4]; // size for RGBA32
++    m_BufferConvert = new unsigned char[400 * 300 * 4]; // size for RGB32
+ #endif
+ 
+     return 0;
+@@ -82,14 +82,14 @@ int cDecoder::Resample(int width, int he
+     context = sws_getContext(m_Context->width - (OsdPipSetup.CropLeft + OsdPipSetup.CropRight),
+                              m_Context->height - (OsdPipSetup.CropTop + OsdPipSetup.CropBottom),
+                              PIX_FMT_YUV420P,
+-                             m_Width, m_Height, ConvertToRGB ? PIX_FMT_RGBA32 : PIX_FMT_YUV420P,
++                             m_Width, m_Height, ConvertToRGB ? PIX_FMT_RGB32 : PIX_FMT_YUV420P,
+                              SWS_LANCZOS, NULL, NULL, NULL);
+     if (!context) {
+         printf("Error initializing scale context.\n");
+         return -1;
+     }
+     avpicture_fill((AVPicture *) m_PicResample, m_BufferResample,
+-                   ConvertToRGB ? PIX_FMT_RGBA32 : PIX_FMT_YUV420P,
++                   ConvertToRGB ? PIX_FMT_RGB32 : PIX_FMT_YUV420P,
+                    m_Width, m_Height);
+     sws_scale(context, pic_crop.data, pic_crop.linesize,
+               0, m_Context->height - (OsdPipSetup.CropTop + OsdPipSetup.CropBottom),
+@@ -121,8 +121,8 @@ int cDecoder::Resample(int width, int he
+     if (ConvertToRGB)
+     {
+         avpicture_fill((AVPicture *) m_PicConvert, m_BufferConvert,
+-                PIX_FMT_RGBA32, m_Width, m_Height);
+-        img_convert((AVPicture *) m_PicConvert, PIX_FMT_RGBA32,
++                PIX_FMT_RGB32, m_Width, m_Height);
++        img_convert((AVPicture *) m_PicConvert, PIX_FMT_RGB32,
+                 (AVPicture *) m_PicResample, PIX_FMT_YUV420P,
+                 m_Width, m_Height);
+     }
diff --git a/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild b/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild
index 21dcef85e025..eac8961c492b 100644
--- a/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild
+++ b/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2003-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild,v 1.2 2008/12/17 06:28:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild,v 1.3 2009/09/22 05:28:32 aballier Exp $
 
 inherit vdr-plugin
 
@@ -19,6 +19,7 @@ DEPEND=">=media-video/vdr-1.4.0
 	"
 
 #PATCHES=("${FILESDIR}/${P}-vdr-1.5.0.diff")
+PATCHES=( "${FILESDIR}/${P}-avutil50.patch" )
 
 src_unpack() {
 	vdr-plugin_src_unpack