diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2016-12-04 10:58:00 -0500 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2016-12-04 11:11:45 -0500 |
| commit | 977a01d81f75dc1e2fc0e6dc479b6ae13469aec4 (patch) | |
| tree | 7a93da05b5c73d1148ed53d30cf11152d8f7fba2 | |
| parent | net-analyzer/nagios-core: new revision and init script to fix CVE-2016-8641. (diff) | |
| download | gentoo-977a01d8.tar.gz gentoo-977a01d8.tar.bz2 gentoo-977a01d8.zip | |
net-misc/freerdp: fix ffmpeg dependency
virtual/ffmpeg is only for tools usage.
Package-Manager: portage-2.3.2_p13
4 files changed, 21 insertions, 9 deletions
diff --git a/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild b/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild index c0ba86d9a86d..f9cb9dbf4d55 100644 --- a/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild +++ b/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild @@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/" LICENSE="Apache-2.0" SLOT="0" -IUSE="alsa +client cups debug directfb doc ffmpeg gstreamer jpeg +IUSE="alsa +client cups debug directfb doc ffmpeg gstreamer jpeg libav pulseaudio server smartcard cpu_flags_x86_sse2 test usb X xinerama xv" RDEPEND=" @@ -48,7 +48,10 @@ RDEPEND=" ) ) directfb? ( dev-libs/DirectFB ) - ffmpeg? ( virtual/ffmpeg ) + ffmpeg? ( + libav? ( media-video/libav:0= ) + !libav? ( media-video/ffmpeg:0= ) + ) gstreamer? ( media-libs/gstreamer:0.10 media-libs/gst-plugins-base:0.10 diff --git a/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild index e914037665a7..b0a3f9794ab6 100644 --- a/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild +++ b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -22,7 +22,7 @@ HOMEPAGE="http://www.freerdp.com/" LICENSE="Apache-2.0" SLOT="0/1.2" -IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg +IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libav libressl neon pulseaudio server smartcard test usb wayland X xinerama xv" RDEPEND=" @@ -47,7 +47,10 @@ RDEPEND=" xv? ( x11-libs/libXv ) ) ) - ffmpeg? ( >=virtual/ffmpeg-9 ) + ffmpeg? ( + libav? ( media-video/libav:0= ) + !libav? ( media-video/ffmpeg:0= ) + ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 diff --git a/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild b/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild index 2a8b741547e6..2d1221cd0f3c 100644 --- a/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild +++ b/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild @@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/" LICENSE="Apache-2.0" SLOT="0/2" -IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libressl neon pulseaudio server smartcard systemd test usb wayland X xinerama xv" +IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libav libressl neon pulseaudio server smartcard systemd test usb wayland X xinerama xv" RDEPEND=" !libressl? ( dev-libs/openssl:0= ) @@ -47,7 +47,10 @@ RDEPEND=" xv? ( x11-libs/libXv ) ) ) - ffmpeg? ( virtual/ffmpeg ) + ffmpeg? ( + libav? ( media-video/libav:0= ) + !libav? ( media-video/ffmpeg:0= ) + ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild index 2df69d8a3a23..78307ff451a8 100644 --- a/net-misc/freerdp/freerdp-9999.ebuild +++ b/net-misc/freerdp/freerdp-9999.ebuild @@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/" LICENSE="Apache-2.0" SLOT="0/2" -IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libressl neon pulseaudio server smartcard systemd test usb wayland X xinerama xv" +IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libav libressl neon pulseaudio server smartcard systemd test usb wayland X xinerama xv" RDEPEND=" !libressl? ( dev-libs/openssl:0= ) @@ -47,7 +47,10 @@ RDEPEND=" xv? ( x11-libs/libXv ) ) ) - ffmpeg? ( virtual/ffmpeg ) + ffmpeg? ( + libav? ( media-video/libav:0= ) + !libav? ( media-video/ffmpeg:0= ) + ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 |