Update libav support, thanks to Charlie Gehlin <charlie@gehlin.com> for the patch and the report in bug #390067

Package-Manager: portage-2.1.10.34/cvs/Linux x86_64

4 files changed, 71 insertions, 18 deletions

diff --git a/media-video/kino/ChangeLog b/media-video/kino/ChangeLog
index 0f8cc739e35f..381e8668d48b 100644
--- a/media-video/kino/ChangeLog
+++ b/media-video/kino/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-video/kino
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.128 2011/10/16 19:24:27 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/ChangeLog,v 1.129 2011/11/15 10:35:46 lu_zero Exp $
+
+  15 Nov 2011; Luca Barbato <lu_zero@gentoo.org> kino-1.3.4.ebuild,
+  +files/kino-1.3.4-libav-0.7.patch:
+  Update libav support, thanks to Charlie Gehlin <charlie@gehlin.com> for the
+  patch and the report in bug #390067
 
   16 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -kino-1.3.3.ebuild,
   -files/kino-1.3.3-avutil.patch:
diff --git a/media-video/kino/Manifest b/media-video/kino/Manifest
index 4873bbdd33f3..18f7bb3fc172 100644
--- a/media-video/kino/Manifest
+++ b/media-video/kino/Manifest
@@ -1,19 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX kino-1.3.4-libav-0.7.patch 2001 RMD160 43e1b450336183d0c1aea40532183f69a28291b7 SHA1 cc83da04b044a688306bdc496d136627de85884b SHA256 8397b6ca5abd86683a3998d6b283875cd49de64c99a79478549d01b518af0c3d
 AUX kino-1.3.4-v4l1.patch 635 RMD160 827091e417d0732275fdcc97858a5523e0096cb4 SHA1 2e22828f88b657ff372ee519b7e388ead42558e3 SHA256 1987582a359314203a3c56982e640d9f26baf53c7c78655e2f47f510c3f2fb06
 DIST kino-1.3.4.tar.gz 11090771 RMD160 ed335116c2ee4e1749000a64f8e09827a0e56855 SHA1 81ebfee07521307f80f8c04aa0bb515d1c833720 SHA256 114d046d76ad9980180e28ababd3c58a457cc9211d693705ce03a90a66011a08
-EBUILD kino-1.3.4.ebuild 3362 RMD160 2d852078686b4614a618a176f23ed4b0339675d6 SHA1 fc36ff8c0713236e9bf2dbfbbe9f81b8561247ad SHA256 97c9745a31f1c3b680d91cc270c7eaf767f8aba46815c4a0349aeed924f3674e
-MISC ChangeLog 15932 RMD160 fb82ccf37371f2c2a5c211cedec758d6bebefee6 SHA1 ab5ad515a3f87cb43f53e14f08eadcc30642ec5b SHA256 33c75809f5cfcc70e1e6083f6c9b1b4e60f8e9ec1d87ddc39d58e69be0d055fa
+EBUILD kino-1.3.4.ebuild 3403 RMD160 46686e6632a936776c700f05ed8ed4f8081127c9 SHA1 341f492cc34814a1e74f4ba85965c2919e721934 SHA256 b17e0d0a8a65df3898d0c790e68e694ea71470d240eb334afd88a267a567556a
+MISC ChangeLog 16152 RMD160 c70f6af0a4de6c736729ce319c2efda5f2ad98f7 SHA1 97187f56ea50e6e8829512950de418a549bc2ab8 SHA256 a28200fe2bace0e73defd4b099cee246f4749d88afeab799c26204db609fc991
 MISC metadata.xml 357 RMD160 dd1c7bc14c6911c1d29578d5b6046afbb5c07465 SHA1 b25dcc68c187c3712dc29bcf8d423635ffc24beb SHA256 52f4fba0d026c7f3bb1247fdec2fb26a581206fd44c764234e41609aafb460eb
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iQEcBAEBAgAGBQJOmy9gAAoJEEdUh39IaPFNTYMH/ih/jy95YJz1/PpWimGlr4/v
-qz14SihEwmlKlIs224icSUNMae7aUTNWiHlvC7XVACXz9bJ9qQCzxxl0voMH+h5X
-gQqY6mbLpOlixQJ+RsMVIWmGErQAEVkoXUU2873T3GFaZH67HKXwlv9FHd2r65Vb
-aubNssBwnjQUpsJ2qQSITv8rf0qPbAYVunDqxZ0E2B8CSDf5S5HpRPzEdViuQL5R
-zXH3Dqps9U+g4mTut6K6g/0neVOQSvEojFZs8UB+KUDOD2orXkTJ67R9wZbDyRUm
-iotS2vywtDQNhyfiIEu745zUDM5lL9e4L9OyQnE30Kgjq8lwYY/nhMK7pTCs93s=
-=SmI/
------END PGP SIGNATURE-----
diff --git a/media-video/kino/files/kino-1.3.4-libav-0.7.patch b/media-video/kino/files/kino-1.3.4-libav-0.7.patch
new file mode 100644
index 000000000000..65c5bc38276d
--- /dev/null
+++ b/media-video/kino/files/kino-1.3.4-libav-0.7.patch
@@ -0,0 +1,60 @@
+--- kino-1.3.4.orig/src/frame.cc	2011-07-17 14:54:59.089481638 +0200
++++ kino-1.3.4/src/frame.cc	2011-07-17 15:09:23.199481714 +0200
+@@ -1063,7 +1063,12 @@
+ 	AVPicture dest;
+ 	int got_picture;
+ 
+-	avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() );
++	AVPacket pkt;
++	av_init_packet(&pkt);
++	pkt.data = data;
++	pkt.size = GetFrameSize();
++
++	avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt );
+ 	if ( got_picture )
+ 	{
+ 		avpicture_fill( &dest, static_cast<uint8_t*>( rgb ), PIX_FMT_RGB24, GetWidth(), GetHeight() );
+@@ -1123,7 +1128,12 @@
+ 	AVPicture output;
+ 	int got_picture;
+ 
+-	avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() );
++	AVPacket pkt;
++	av_init_packet(&pkt);
++	pkt.data = data;
++	pkt.size = GetFrameSize();
++
++	avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt );
+ 	if ( got_picture )
+ 	{
+ 		avpicture_fill( &output, static_cast<uint8_t*>( yuv ), PIX_FMT_YUV422, GetWidth(), GetHeight() );
+@@ -1156,7 +1166,12 @@
+ 	AVFrame *frame = avcodec_alloc_frame();
+ 	int got_picture;
+ 
+-	avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() );
++        AVPacket pkt;
++        av_init_packet(&pkt);
++        pkt.data = data;
++        pkt.size = GetFrameSize();
++
++        avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt );
+ 
+ 	int width = GetWidth(), height = GetHeight();
+ 
+@@ -1319,12 +1334,12 @@
+ #if defined(HAVE_LIBAVCODEC)
+ 	if ( avformatEncoder == NULL )
+ 	{
+-		avformatEncoder = av_alloc_format_context();
++		avformatEncoder = avformat_alloc_context();
+ 		if ( avformatEncoder )
+ 		{
+-			avformatEncoder->oformat = guess_format( "dv", NULL, NULL );
++			avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL );
+ 			AVStream* vst = av_new_stream( avformatEncoder, 0 );
+-			vst->codec->codec_type = CODEC_TYPE_VIDEO;
++			vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+ 			vst->codec->codec_id = CODEC_ID_DVVIDEO;
+ 			vst->codec->bit_rate = 25000000;
+			vst->start_time = 0;
diff --git a/media-video/kino/kino-1.3.4.ebuild b/media-video/kino/kino-1.3.4.ebuild
index 40133b122c0f..b0179a8fa214 100644
--- a/media-video/kino/kino-1.3.4.ebuild
+++ b/media-video/kino/kino-1.3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-1.3.4.ebuild,v 1.5 2011/10/16 19:22:42 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/kino/kino-1.3.4.ebuild,v 1.6 2011/11/15 10:35:46 lu_zero Exp $
 
 EAPI="4"
 
@@ -84,6 +84,7 @@ src/page_bttv.cc' po/POTFILES.in || die "sed failed"
 	sed -i -e 's:^#include <quicktime.h>:#include <lqt/quicktime.h>:' \
 		src/filehandler.h || die "sed failed"
 	epatch "${FILESDIR}/${P}-v4l1.patch"
+	epatch "${FILESDIR}/${P}-libav-0.7.patch"
 }
 
 src_configure() {