Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/gpac/
Date: Sun, 26 Apr 2020 09:06:11
Message-Id: 1587891952.5023c0ba9ffbbc2bb74c523b5aae8fce5f6d6919.zlogene@gentoo
1 commit: 5023c0ba9ffbbc2bb74c523b5aae8fce5f6d6919
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sun Apr 26 09:05:52 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 26 09:05:52 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5023c0ba
7
8 media-video/gpac: migrate from libav
9
10 Package-Manager: Portage-2.3.89, Repoman-2.3.20
11 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
12
13 media-video/gpac/gpac-0.7.1-r1.ebuild | 7 ++-----
14 media-video/gpac/gpac-9999.ebuild | 9 +++------
15 2 files changed, 5 insertions(+), 11 deletions(-)
16
17 diff --git a/media-video/gpac/gpac-0.7.1-r1.ebuild b/media-video/gpac/gpac-0.7.1-r1.ebuild
18 index 3266238bf22..bdac8071f89 100644
19 --- a/media-video/gpac/gpac-0.7.1-r1.ebuild
20 +++ b/media-video/gpac/gpac-0.7.1-r1.ebuild
21 @@ -19,7 +19,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/"
22 LICENSE="GPL-2"
23 # subslot == libgpac major
24 SLOT="0/7"
25 -IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png
26 +IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
27 pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
28
29 RDEPEND="
30 @@ -27,10 +27,7 @@ RDEPEND="
31 a52? ( media-libs/a52dec )
32 aac? ( media-libs/faad2 )
33 alsa? ( media-libs/alsa-lib )
34 - ffmpeg? (
35 - !libav? ( media-video/ffmpeg:0= )
36 - libav? ( media-video/libav:0= )
37 - )
38 + ffmpeg? ( media-video/ffmpeg:0= )
39 jack? ( virtual/jack )
40 jpeg? ( virtual/jpeg:0 )
41 jpeg2k? ( media-libs/openjpeg:0 )
42
43 diff --git a/media-video/gpac/gpac-9999.ebuild b/media-video/gpac/gpac-9999.ebuild
44 index c39142d9017..5c4fcbaddd1 100644
45 --- a/media-video/gpac/gpac-9999.ebuild
46 +++ b/media-video/gpac/gpac-9999.ebuild
47 @@ -1,4 +1,4 @@
48 -# Copyright 1999-2018 Gentoo Authors
49 +# Copyright 1999-2020 Gentoo Authors
50 # Distributed under the terms of the GNU General Public License v2
51
52 EAPI=6
53 @@ -19,7 +19,7 @@ HOMEPAGE="https://gpac.wp.imt.fr/"
54 LICENSE="GPL-2"
55 # subslot == libgpac major
56 SLOT="0/7"
57 -IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libav libressl mad opengl oss png
58 +IUSE="a52 aac alsa debug dvb ffmpeg ipv6 jack jpeg jpeg2k libressl mad opengl oss png
59 pulseaudio sdl ssl static-libs theora truetype vorbis xml xvid X"
60
61 RDEPEND="
62 @@ -27,10 +27,7 @@ RDEPEND="
63 a52? ( media-libs/a52dec )
64 aac? ( media-libs/faad2 )
65 alsa? ( media-libs/alsa-lib )
66 - ffmpeg? (
67 - !libav? ( media-video/ffmpeg:0= )
68 - libav? ( media-video/libav:0= )
69 - )
70 + ffmpeg? ( media-video/ffmpeg:0= )
71 jack? ( virtual/jack )
72 jpeg? ( virtual/jpeg:0 )
73 jpeg2k? ( media-libs/openjpeg:0 )