Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dolphin/
Date: Sat, 25 Apr 2020 20:03:43
Message-Id: 1587845006.cffb28923edf23bdb14f2e330e9efb82dabb0feb.zlogene@gentoo
1 commit: cffb28923edf23bdb14f2e330e9efb82dabb0feb
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 25 20:03:26 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 25 20:03:26 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cffb2892
7
8 games-emulation/dolphin: 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 games-emulation/dolphin/dolphin-5.0.ebuild | 7 ++-----
14 games-emulation/dolphin/dolphin-9999.ebuild | 7 ++-----
15 2 files changed, 4 insertions(+), 10 deletions(-)
16
17 diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild
18 index 153155a8a7a..156b83d9fd2 100644
19 --- a/games-emulation/dolphin/dolphin-5.0.ebuild
20 +++ b/games-emulation/dolphin/dolphin-5.0.ebuild
21 @@ -17,7 +17,7 @@ HOMEPAGE="https://www.dolphin-emu.org/"
22
23 LICENSE="GPL-2"
24 SLOT="0"
25 -IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
26 +IUSE="alsa ao bluetooth doc egl +evdev ffmpeg log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
27
28 RESTRICT=test
29
30 @@ -42,10 +42,7 @@ RDEPEND="
31 dev-libs/libevdev
32 virtual/udev
33 )
34 - ffmpeg? (
35 - libav? ( media-video/libav:= )
36 - !libav? ( media-video/ffmpeg:= )
37 - )
38 + ffmpeg? ( media-video/ffmpeg:= )
39 openal? (
40 media-libs/openal
41 media-libs/libsoundtouch
42
43 diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
44 index ba80667dcd7..30c89c3c2a9 100644
45 --- a/games-emulation/dolphin/dolphin-9999.ebuild
46 +++ b/games-emulation/dolphin/dolphin-9999.ebuild
47 @@ -22,7 +22,7 @@ HOMEPAGE="https://www.dolphin-emu.org/"
48
49 LICENSE="GPL-2"
50 SLOT="0"
51 -IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg libav log lto profile pulseaudio +qt5 systemd upnp"
52 +IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg log lto profile pulseaudio +qt5 systemd upnp"
53
54 RDEPEND="
55 dev-libs/hidapi:0=
56 @@ -48,10 +48,7 @@ RDEPEND="
57 dev-libs/libevdev
58 virtual/udev
59 )
60 - ffmpeg? (
61 - libav? ( media-video/libav:= )
62 - !libav? ( media-video/ffmpeg:= )
63 - )
64 + ffmpeg? ( media-video/ffmpeg:= )
65 profile? ( dev-util/oprofile )
66 pulseaudio? ( media-sound/pulseaudio )
67 qt5? (