fix build with latest ffmpeg, bug #278947

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

4 files changed, 52 insertions, 5 deletions

diff --git a/media-plugins/vdr-graphtft/ChangeLog b/media-plugins/vdr-graphtft/ChangeLog
index 15717f5157ce..3d8bdc1c8d94 100644
--- a/media-plugins/vdr-graphtft/ChangeLog
+++ b/media-plugins/vdr-graphtft/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/vdr-graphtft
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.16 2009/07/24 18:15:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.17 2009/09/22 05:22:04 aballier Exp $
+
+  22 Sep 2009; Alexis Ballier <aballier@gentoo.org>
+  vdr-graphtft-0.2.2-r1.ebuild, +files/vdr-graphtft-0.2.2-avutil50.patch:
+  fix build with latest ffmpeg, bug #278947
 
   24 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
   vdr-graphtft-0.2.2-r1.ebuild, +files/vdr-graphtft-0.2.2-gcc44.patch,
diff --git a/media-plugins/vdr-graphtft/Manifest b/media-plugins/vdr-graphtft/Manifest
index 35fdf9f1bc39..08a896dcc93d 100644
--- a/media-plugins/vdr-graphtft/Manifest
+++ b/media-plugins/vdr-graphtft/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX confd 1233 RMD160 7b0183644d7ff2f2c0488ec10190e40afc11dab3 SHA1 803cf52c0b13cc2b110f8c8706f8fda15bd532a7 SHA256 2ddbe4e535d7f18a002df6760b41f9c24a4cb95695480a210d148bc046582063
 AUX gcc-4.3-missing_includes.diff 388 RMD160 dfe75dd41e5f7484af4a21dd90e8e3f9d35149f9 SHA1 21f9d74cfb7341b431c4599a512299e41d05990a SHA256 73aaf1ca223106be88282565167d85dc6cca67f7a1b75a648d9bcf8fb61afeae
 AUX graphtft-fe 995 RMD160 669a22a7bd3d5d7efdf7468f2f1692d118b77a09 SHA1 722a35ee6c93632d669e789897eaed2b48baec41 SHA256 1f97afe93133b38e0a0679baf7abfa85d532d1908801da1cd1c70e5104338107
@@ -5,6 +8,7 @@ AUX rc-addon.sh 319 RMD160 1d0638b87fa0c352efb6a0dcc4cedb9f45fbb29a SHA1 926fb7e
 AUX vdr-graphtft-0.1.18_alpha-ffmpeg-0.4.9_p20080326-new_header.diff 2651 RMD160 c9449b8ef2dc1d806fbcfd7ef7e95fd1defcc7a9 SHA1 316ac3e328fe4bedc9bb5dc419c9c0b2f554e8be SHA256 1d68415dd3ffafbd3735102ac2407f5b22a7361209869b6fc780d35aa27f0424
 AUX vdr-graphtft-0.1.18_alpha-imagemagick-6.4-new_header.diff 461 RMD160 4c36203c70182be9b910c801223ff3637584d059 SHA1 f17143aa4552d49aea9c72eaa25b832a040f356d SHA256 ef5eed0e2bb6518cb0b65d90dc43ba3e47a1c339159fe02ce361c9f5ac5ef4e9
 AUX vdr-graphtft-0.1.21_alpha-gentoo.diff 3908 RMD160 0b9e265ef93d8c3ace03fe5b4f5b1e182dd7ab62 SHA1 d12b8d58b36d489a8f758f3e9c48c72a46c1c9af SHA256 7b1dfb3895e11baacea28f4447eb1b2a4146c4fbe42865ac5ec1c0328870095f
+AUX vdr-graphtft-0.2.2-avutil50.patch 1448 RMD160 d4793d5fb18666876876355ea1355e9ff8c15c54 SHA1 f9a726f5067d4271c539a632b2f3761e2fb10c42 SHA256 1103ff4f6cda1ffd15a7a9e765ca293aef9c6e167ef7b6a1544afd4e424eae34
 AUX vdr-graphtft-0.2.2-gcc44.patch 372 RMD160 6bec1f1b8a927d2dcf3cc3e336d90fb89366708f SHA1 ec9bde73d449620b445dec5a7619f5fece6b78a3 SHA256 510fca8189ad25caddf0f5ab6fb1c0f96eafa80fa76bb394d48d4bec3d6028ee
 AUX vdr-graphtft-0.2.2-glibc210.patch 383 RMD160 ac86a5bee44b14ef588d36470f0476be7cd13199 SHA1 05c0397c610788b1f6c723f9c574392325e10974 SHA256 4bccc54bd40e50e318446ebd71cb9becdc6f144fbd73150e63dac39471932def
 AUX vdr-graphtft-0.2.2_gentoo.diff 4745 RMD160 d12c2534c43dcee008078efed3cea1fe2b28df46 SHA1 7972126b602cebf8838074084574c3e4db547e6c SHA256 096be610a66e32a839fdbcdc974efe8e6c19c854bda89800daa375834d943f7d
@@ -13,6 +17,13 @@ DIST DeepBlue-horchi-0.0.8.tar.bz2 1769355 RMD160 2b0db7c41d8c6a5cd08f2002a109e7
 DIST vdr-graphtft-0.1.21.alpha.tar.bz2 153233 RMD160 105c95c2f6365a3b6b27b874da5cc44133343e0e SHA1 fbd2657759828ef61b39011579049e0f85693218 SHA256 8d2566c86216c42079be3a11f082cdb87670b4eaa75d487f6a8d56d576eaff5f
 DIST vdr-graphtft-0.2.2.tar.bz2 155507 RMD160 daf31f493cc440f2345b7a63a69706b8e844a522 SHA1 a2534ad7ffe285c0757bad114f8e1e3af0ddc72d SHA256 ef68a6dda13ce54ec4d6b528b030dc080eeb009f269d8a282cce2b2bf298dbee
 EBUILD vdr-graphtft-0.1.21_alpha-r1.ebuild 2624 RMD160 88dabb36f0a45a440eba058c664e6f5562764676 SHA1 310604896be7b938e596f89907d2c1dc84194d88 SHA256 31e04250c46913987ce4e47b36d9e56972c025d542b2dca8d82d37162d690cb5
-EBUILD vdr-graphtft-0.2.2-r1.ebuild 2900 RMD160 f2fed9e4c30ae21f359883c22ee2e117fbed7595 SHA1 604d634d29efc0515be2daaf206ab3457ba5ef81 SHA256 e1beb4384516c94da1ad4b2c784c743d05baa2fc19b934fac90c397694e20081
-MISC ChangeLog 3977 RMD160 acf60cc846db78f05c80ceff227ae574288602d2 SHA1 ca301e9156783616b9d5e6292df20a6190e7eba9 SHA256 7a88132cd785405bb8a3de9fc94cbbddaec72cbcef51877cda954652a959f5a3
+EBUILD vdr-graphtft-0.2.2-r1.ebuild 2934 RMD160 8744f0c70fa3b20cf82ab5ad8dd569b370f89663 SHA1 82532cdda318d6a268bc129b08d8ec1a8dd1ea76 SHA256 d0e7b5dd8765e014babcd93d8b754f09148629f32aa4316778d2f083a46c5386
+MISC ChangeLog 4147 RMD160 184f7d3f05d4933ea26613814aa687cb72d4648d SHA1 47478e50a3f96224ec1fa6474115fc32e7736d17 SHA256 f5eea498908c1c6975ccbcc1725b81f035c872a4f8309bcdd039c48ac0850a0f
 MISC metadata.xml 348 RMD160 fe6f19f0be6387b23866a60b6dc37107d67205e5 SHA1 2b729da31705bf0b2b8ef09b265a373672510bca SHA256 85f62a664d65de9f6958acd1eb88a458bb0aa8ab9ab4f96765959c24f1102388
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkq4XwIACgkQvFcC4BYPU0rDywCfYi+s1lNCsQkcGH18MirRiuvk
+Am4An0W5PAQ4cBaPDAfj6+whSoM6LlGb
+=kPNt
+-----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2-avutil50.patch b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2-avutil50.patch
new file mode 100644
index 000000000000..dfec5ab3aee4
--- /dev/null
+++ b/media-plugins/vdr-graphtft/files/vdr-graphtft-0.2.2-avutil50.patch
@@ -0,0 +1,31 @@
+Index: graphtft-0.2.2/imlibrenderer/dvbrenderer/mpeg2encoder.c
+===================================================================
+--- graphtft-0.2.2.orig/imlibrenderer/dvbrenderer/mpeg2encoder.c
++++ graphtft-0.2.2/imlibrenderer/dvbrenderer/mpeg2encoder.c
+@@ -126,11 +126,11 @@ mpeg_frame mpeg_draw(UINT8* buf)
+    int i;
+    AVPicture avpsrc;
+ 
+-   avpicture_fill(&avpsrc, buf, PIX_FMT_RGBA32, width, height);
++   avpicture_fill(&avpsrc, buf, PIX_FMT_RGB32, width, height);
+ 
+ #ifndef HAVE_SWSCALE
+ 
+-   img_convert(&pic, PIX_FMT_YUV420P, &avpsrc, PIX_FMT_RGBA32, width, height);
++   img_convert(&pic, PIX_FMT_YUV420P, &avpsrc, PIX_FMT_RGB32, width, height);
+ 
+ #else
+ 
+Index: graphtft-0.2.2/imlibrenderer/fbrenderer/fbrenderer.c
+===================================================================
+--- graphtft-0.2.2.orig/imlibrenderer/fbrenderer/fbrenderer.c
++++ graphtft-0.2.2/imlibrenderer/fbrenderer/fbrenderer.c
+@@ -192,7 +192,7 @@ int FbRenderer::init(int devnum)
+ 
+ 	switch (fb_vinfo.bits_per_pixel) 
+    {
+-		case 32: tell(4, "fbdevout.c: using 32 bit depth"); fb_type = PIX_FMT_RGBA32; break;
++		case 32: tell(4, "fbdevout.c: using 32 bit depth"); fb_type = PIX_FMT_RGB32; break;
+ 		case 24: tell(4, "fbdevout.c: using 24 bit depth"); fb_type = PIX_FMT_RGB24;  break;
+ 		case 16: tell(4, "fbdevout.c: using 16 bit depth"); fb_type = PIX_FMT_RGB565; break;
+ 		default: tell(4, "fbdevout.c: color depth not supported -> %i bits per pixel",
diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.2.2-r1.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.2.2-r1.ebuild
index 22138c8fd3c3..4fd1ab1381cb 100644
--- a/media-plugins/vdr-graphtft/vdr-graphtft-0.2.2-r1.ebuild
+++ b/media-plugins/vdr-graphtft/vdr-graphtft-0.2.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.2.2-r1.ebuild,v 1.3 2009/07/24 18:15:15 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.2.2-r1.ebuild,v 1.4 2009/09/22 05:22:04 aballier Exp $
 
 EAPI="2"
 
@@ -30,7 +30,8 @@ RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}_gentoo.diff"
 	"${FILESDIR}/${P}-gcc44.patch"
-	"${FILESDIR}/${P}-glibc210.patch" )
+	"${FILESDIR}/${P}-glibc210.patch"
+	"${FILESDIR}/${P}-avutil50.patch" )
 
 extpatch_v_check() {