Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/freerdp/
Date: Sat, 25 Apr 2020 18:40:25
Message-Id: 1587839983.d888a61effcc5c76dd6bdc00eb5884387fe458d5.zlogene@gentoo
1 commit: d888a61effcc5c76dd6bdc00eb5884387fe458d5
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Sat Apr 25 18:39:43 2020 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 25 18:39:43 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d888a61e
7
8 net-misc/freerdp: 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 net-misc/freerdp/freerdp-2.0.0-r1.ebuild | 7 ++-----
14 net-misc/freerdp/freerdp-2.0.0_rc4.ebuild | 7 ++-----
15 net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild | 9 +++------
16 net-misc/freerdp/freerdp-2.9999.ebuild | 7 ++-----
17 net-misc/freerdp/freerdp-9999.ebuild | 7 ++-----
18 5 files changed, 11 insertions(+), 26 deletions(-)
19
20 diff --git a/net-misc/freerdp/freerdp-2.0.0-r1.ebuild b/net-misc/freerdp/freerdp-2.0.0-r1.ebuild
21 index 2ea42012517..d4c577fb18e 100644
22 --- a/net-misc/freerdp/freerdp-2.0.0-r1.ebuild
23 +++ b/net-misc/freerdp/freerdp-2.0.0-r1.ebuild
24 @@ -20,7 +20,7 @@ HOMEPAGE="http://www.freerdp.com/"
25
26 LICENSE="Apache-2.0"
27 SLOT="0/2"
28 -IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
29 +IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
30 RESTRICT="!test? ( test )"
31
32 RDEPEND="
33 @@ -45,10 +45,7 @@ RDEPEND="
34 xv? ( x11-libs/libXv )
35 )
36 )
37 - ffmpeg? (
38 - libav? ( media-video/libav:0= )
39 - !libav? ( media-video/ffmpeg:0= )
40 - )
41 + ffmpeg? ( media-video/ffmpeg:0= )
42 !ffmpeg? (
43 x11-libs/cairo:0=
44 )
45
46 diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
47 index 5bd7f37650e..862fb22e38c 100644
48 --- a/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
49 +++ b/net-misc/freerdp/freerdp-2.0.0_rc4.ebuild
50 @@ -22,7 +22,7 @@ HOMEPAGE="http://www.freerdp.com/"
51
52 LICENSE="Apache-2.0"
53 SLOT="0/2"
54 -IUSE="alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
55 +IUSE="alsa +client cpu_flags_arm_neon cups debug doc ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
56 RESTRICT="!test? ( test )"
57
58 RDEPEND="
59 @@ -47,10 +47,7 @@ RDEPEND="
60 xv? ( x11-libs/libXv )
61 )
62 )
63 - ffmpeg? (
64 - libav? ( media-video/libav:0= )
65 - !libav? ( media-video/ffmpeg:0= )
66 - )
67 + ffmpeg? ( media-video/ffmpeg:0= )
68 gstreamer? (
69 media-libs/gstreamer:1.0
70 media-libs/gst-plugins-base:1.0
71
72 diff --git a/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild b/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild
73 index 4ef50289d0b..81fe15dcd97 100644
74 --- a/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild
75 +++ b/net-misc/freerdp/freerdp-2.0.0_rc4_p1129.ebuild
76 @@ -1,4 +1,4 @@
77 -# Copyright 2011-2019 Gentoo Authors
78 +# Copyright 2011-2020 Gentoo Authors
79 # Distributed under the terms of the GNU General Public License v2
80
81 EAPI=7
82 @@ -20,7 +20,7 @@ HOMEPAGE="http://www.freerdp.com/"
83
84 LICENSE="Apache-2.0"
85 SLOT="0/2"
86 -IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
87 +IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
88 RESTRICT="!test? ( test )"
89
90 RDEPEND="
91 @@ -45,10 +45,7 @@ RDEPEND="
92 xv? ( x11-libs/libXv )
93 )
94 )
95 - ffmpeg? (
96 - libav? ( media-video/libav:0= )
97 - !libav? ( media-video/ffmpeg:0= )
98 - )
99 + ffmpeg? ( media-video/ffmpeg:0= )
100 !ffmpeg? (
101 x11-libs/cairo:0=
102 )
103
104 diff --git a/net-misc/freerdp/freerdp-2.9999.ebuild b/net-misc/freerdp/freerdp-2.9999.ebuild
105 index 48ee51c9277..b541ab6af7c 100644
106 --- a/net-misc/freerdp/freerdp-2.9999.ebuild
107 +++ b/net-misc/freerdp/freerdp-2.9999.ebuild
108 @@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/"
109
110 LICENSE="Apache-2.0"
111 SLOT="0/2"
112 -IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
113 +IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
114 RESTRICT="!test? ( test )"
115
116 RDEPEND="
117 @@ -48,10 +48,7 @@ RDEPEND="
118 xv? ( x11-libs/libXv )
119 )
120 )
121 - ffmpeg? (
122 - libav? ( media-video/libav:0= )
123 - !libav? ( media-video/ffmpeg:0= )
124 - )
125 + ffmpeg? ( media-video/ffmpeg:0= )
126 !ffmpeg? (
127 x11-libs/cairo:0=
128 )
129
130 diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild
131 index 48ee51c9277..b541ab6af7c 100644
132 --- a/net-misc/freerdp/freerdp-9999.ebuild
133 +++ b/net-misc/freerdp/freerdp-9999.ebuild
134 @@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/"
135
136 LICENSE="Apache-2.0"
137 SLOT="0/2"
138 -IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libav libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
139 +IUSE="alsa +client cpu_flags_arm_neon cups debug doc +ffmpeg gstreamer jpeg libressl openh264 pulseaudio server smartcard systemd test usb wayland X xinerama xv"
140 RESTRICT="!test? ( test )"
141
142 RDEPEND="
143 @@ -48,10 +48,7 @@ RDEPEND="
144 xv? ( x11-libs/libXv )
145 )
146 )
147 - ffmpeg? (
148 - libav? ( media-video/libav:0= )
149 - !libav? ( media-video/ffmpeg:0= )
150 - )
151 + ffmpeg? ( media-video/ffmpeg:0= )
152 !ffmpeg? (
153 x11-libs/cairo:0=
154 )