Gentoo Archives: gentoo-commits

From: Craig Andrews <candrews@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/kino/, media-video/kino/files/
Date: Thu, 15 Nov 2018 15:08:48
Message-Id: 1542294512.9e7a311df544bb3ac6d2753b549f1d2732f50cac.candrews@gentoo
1 commit: 9e7a311df544bb3ac6d2753b549f1d2732f50cac
2 Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 12 03:59:26 2018 +0000
4 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
5 CommitDate: Thu Nov 15 15:08:32 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e7a311d
7
8 media-video/kino: ffmpeg 4 compatible
9
10 Closes: https://bugs.gentoo.org/670660
11 Package-Manager: Portage-2.3.51, Repoman-2.3.12
12 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
13
14 media-video/kino/files/kino-1.3.4-ffmpeg4.patch | 13 +++++++++++++
15 media-video/kino/kino-1.3.4-r1.ebuild | 3 ++-
16 2 files changed, 15 insertions(+), 1 deletion(-)
17
18 diff --git a/media-video/kino/files/kino-1.3.4-ffmpeg4.patch b/media-video/kino/files/kino-1.3.4-ffmpeg4.patch
19 new file mode 100644
20 index 00000000000..b0f359f06ba
21 --- /dev/null
22 +++ b/media-video/kino/files/kino-1.3.4-ffmpeg4.patch
23 @@ -0,0 +1,13 @@
24 +diff --git a/old/frame.cc b/src/frame.cc
25 +index c88508f..1e2573a 100644
26 +--- a/old/frame.cc
27 ++++ b/src/frame.cc
28 +@@ -1367,7 +1367,7 @@ bool Frame::CreateEncoder( bool isPAL, bool isWide )
29 + avcodecEncoder->thread_count = 2;
30 + avcodecEncoder->time_base= isPAL ? ( AVRational ){ 1, 25 } : ( AVRational ){ 1001, 30000 };
31 + avcodecEncoder->pix_fmt = isPAL ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUV411P;
32 +- avcodecEncoder->flags |= CODEC_FLAG_INTERLACED_DCT;
33 ++ avcodecEncoder->flags |= AV_CODEC_FLAG_INTERLACED_DCT;
34 + avcodec_open2( avcodecEncoder, avcodec_find_encoder( AV_CODEC_ID_DVVIDEO ), NULL );
35 + av_new_packet( &avpacketEncoder, 144000 );
36 + tempImage = ( uint8_t* ) av_malloc(
37
38 diff --git a/media-video/kino/kino-1.3.4-r1.ebuild b/media-video/kino/kino-1.3.4-r1.ebuild
39 index cb82c2338e3..9fc8dbb085a 100644
40 --- a/media-video/kino/kino-1.3.4-r1.ebuild
41 +++ b/media-video/kino/kino-1.3.4-r1.ebuild
42 @@ -1,4 +1,4 @@
43 -# Copyright 1999-2018 Gentoo Foundation
44 +# Copyright 1999-2018 Gentoo Authors
45 # Distributed under the terms of the GNU General Public License v2
46
47 EAPI=6
48 @@ -81,6 +81,7 @@ src/page_bttv.cc' po/POTFILES.in || die
49 eapply "${FILESDIR}/${P}-libav-0.8.patch"
50 eapply "${FILESDIR}/${P}-libavcodec-pkg-config.patch"
51 eapply "${FILESDIR}/${P}-ffmpeg3.patch"
52 + eapply "${FILESDIR}/${P}-ffmpeg4.patch"
53
54 mv configure.in configure.ac || die
55 eautoreconf