Gentoo Archives: gentoo-commits

From: Alexis Ballier <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/
Date: Mon, 02 Sep 2019 12:00:25
Message-Id: 1567425589.cb64c106f5144092a0808f9452fa9f8798ef6beb.aballier@gentoo
1 commit: cb64c106f5144092a0808f9452fa9f8798ef6beb
2 Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 2 10:59:25 2019 +0000
4 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 2 11:59:49 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb64c106
7
8 media-video/ffmpeg: enable version3 for libaribb24.
9
10 Closes: https://bugs.gentoo.org/693216
11 Package-Manager: Portage-2.3.73, Repoman-2.3.17
12 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org>
13
14 media-video/ffmpeg/ffmpeg-4.2.ebuild | 5 +++++
15 media-video/ffmpeg/ffmpeg-9999.ebuild | 5 +++++
16 2 files changed, 10 insertions(+)
17
18 diff --git a/media-video/ffmpeg/ffmpeg-4.2.ebuild b/media-video/ffmpeg/ffmpeg-4.2.ebuild
19 index fd1cf7046f5..50796d37816 100644
20 --- a/media-video/ffmpeg/ffmpeg-4.2.ebuild
21 +++ b/media-video/ffmpeg/ffmpeg-4.2.ebuild
22 @@ -46,6 +46,10 @@ LICENSE="
23 gpl? ( GPL-3 )
24 !gpl? ( LGPL-3 )
25 )
26 + libaribb24? (
27 + gpl? ( GPL-3 )
28 + !gpl? ( LGPL-3 )
29 + )
30 encode? (
31 amrenc? (
32 gpl? ( GPL-3 )
33 @@ -364,6 +368,7 @@ multilib_src_configure() {
34 # Decoders
35 use amr && myconf+=( --enable-version3 )
36 use gmp && myconf+=( --enable-version3 )
37 + use libaribb24 && myconf+=( --enable-version3 )
38 use fdk && use gpl && myconf+=( --enable-nonfree )
39
40 for i in "${ffuse[@]#+}" ; do
41
42 diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
43 index ac797b13647..6538d98057a 100644
44 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild
45 +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
46 @@ -46,6 +46,10 @@ LICENSE="
47 gpl? ( GPL-3 )
48 !gpl? ( LGPL-3 )
49 )
50 + libaribb24? (
51 + gpl? ( GPL-3 )
52 + !gpl? ( LGPL-3 )
53 + )
54 encode? (
55 amrenc? (
56 gpl? ( GPL-3 )
57 @@ -364,6 +368,7 @@ multilib_src_configure() {
58 # Decoders
59 use amr && myconf+=( --enable-version3 )
60 use gmp && myconf+=( --enable-version3 )
61 + use libaribb24 && myconf+=( --enable-version3 )
62 use fdk && use gpl && myconf+=( --enable-nonfree )
63
64 for i in "${ffuse[@]#+}" ; do