| 1 |
commit: 977a01d81f75dc1e2fc0e6dc479b6ae13469aec4 |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Dec 4 15:58:00 2016 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Dec 4 16:11:45 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=977a01d8 |
| 7 |
|
| 8 |
net-misc/freerdp: fix ffmpeg dependency |
| 9 |
|
| 10 |
virtual/ffmpeg is only for tools usage. |
| 11 |
|
| 12 |
Package-Manager: portage-2.3.2_p13 |
| 13 |
|
| 14 |
net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild | 7 +++++-- |
| 15 |
net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild | 9 ++++++--- |
| 16 |
net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild | 7 +++++-- |
| 17 |
net-misc/freerdp/freerdp-9999.ebuild | 7 +++++-- |
| 18 |
4 files changed, 21 insertions(+), 9 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
index c0ba86d..f9cb9db 100644 |
| 22 |
--- a/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild |
| 23 |
+++ b/net-misc/freerdp/freerdp-1.1.0_beta1_p20130710-r2.ebuild |
| 24 |
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/" |
| 25 |
|
| 26 |
LICENSE="Apache-2.0" |
| 27 |
SLOT="0" |
| 28 |
-IUSE="alsa +client cups debug directfb doc ffmpeg gstreamer jpeg |
| 29 |
+IUSE="alsa +client cups debug directfb doc ffmpeg gstreamer jpeg libav |
| 30 |
pulseaudio server smartcard cpu_flags_x86_sse2 test usb X xinerama xv" |
| 31 |
|
| 32 |
RDEPEND=" |
| 33 |
@@ -48,7 +48,10 @@ RDEPEND=" |
| 34 |
) |
| 35 |
) |
| 36 |
directfb? ( dev-libs/DirectFB ) |
| 37 |
- ffmpeg? ( virtual/ffmpeg ) |
| 38 |
+ ffmpeg? ( |
| 39 |
+ libav? ( media-video/libav:0= ) |
| 40 |
+ !libav? ( media-video/ffmpeg:0= ) |
| 41 |
+ ) |
| 42 |
gstreamer? ( |
| 43 |
media-libs/gstreamer:0.10 |
| 44 |
media-libs/gst-plugins-base:0.10 |
| 45 |
|
| 46 |
diff --git a/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild |
| 47 |
index e914037..b0a3f97 100644 |
| 48 |
--- a/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild |
| 49 |
+++ b/net-misc/freerdp/freerdp-1.2.1_pre20150326-r1.ebuild |
| 50 |
@@ -1,4 +1,4 @@ |
| 51 |
-# Copyright 1999-2015 Gentoo Foundation |
| 52 |
+# Copyright 1999-2016 Gentoo Foundation |
| 53 |
# Distributed under the terms of the GNU General Public License v2 |
| 54 |
# $Id$ |
| 55 |
|
| 56 |
@@ -22,7 +22,7 @@ HOMEPAGE="http://www.freerdp.com/" |
| 57 |
|
| 58 |
LICENSE="Apache-2.0" |
| 59 |
SLOT="0/1.2" |
| 60 |
-IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg |
| 61 |
+IUSE="alsa +client cpu_flags_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libav |
| 62 |
libressl neon pulseaudio server smartcard test usb wayland X xinerama xv" |
| 63 |
|
| 64 |
RDEPEND=" |
| 65 |
@@ -47,7 +47,10 @@ RDEPEND=" |
| 66 |
xv? ( x11-libs/libXv ) |
| 67 |
) |
| 68 |
) |
| 69 |
- ffmpeg? ( >=virtual/ffmpeg-9 ) |
| 70 |
+ ffmpeg? ( |
| 71 |
+ libav? ( media-video/libav:0= ) |
| 72 |
+ !libav? ( media-video/ffmpeg:0= ) |
| 73 |
+ ) |
| 74 |
gstreamer? ( |
| 75 |
media-libs/gstreamer:1.0 |
| 76 |
media-libs/gst-plugins-base:1.0 |
| 77 |
|
| 78 |
diff --git a/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild b/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild |
| 79 |
index 2a8b741..2d1221c 100644 |
| 80 |
--- a/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild |
| 81 |
+++ b/net-misc/freerdp/freerdp-2.0.0_pre20160722.ebuild |
| 82 |
@@ -23,7 +23,7 @@ HOMEPAGE="http://www.freerdp.com/" |
| 83 |
|
| 84 |
LICENSE="Apache-2.0" |
| 85 |
SLOT="0/2" |
| 86 |
-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" |
| 87 |
+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" |
| 88 |
|
| 89 |
RDEPEND=" |
| 90 |
!libressl? ( dev-libs/openssl:0= ) |
| 91 |
@@ -47,7 +47,10 @@ RDEPEND=" |
| 92 |
xv? ( x11-libs/libXv ) |
| 93 |
) |
| 94 |
) |
| 95 |
- ffmpeg? ( virtual/ffmpeg ) |
| 96 |
+ ffmpeg? ( |
| 97 |
+ libav? ( media-video/libav:0= ) |
| 98 |
+ !libav? ( media-video/ffmpeg:0= ) |
| 99 |
+ ) |
| 100 |
gstreamer? ( |
| 101 |
media-libs/gstreamer:1.0 |
| 102 |
media-libs/gst-plugins-base:1.0 |
| 103 |
|
| 104 |
diff --git a/net-misc/freerdp/freerdp-9999.ebuild b/net-misc/freerdp/freerdp-9999.ebuild |
| 105 |
index 2df69d8..78307ff 100644 |
| 106 |
--- a/net-misc/freerdp/freerdp-9999.ebuild |
| 107 |
+++ b/net-misc/freerdp/freerdp-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_x86_sse2 cups debug doc ffmpeg gstreamer jpeg libressl neon pulseaudio server smartcard systemd test usb wayland X xinerama xv" |
| 113 |
+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" |
| 114 |
|
| 115 |
RDEPEND=" |
| 116 |
!libressl? ( dev-libs/openssl:0= ) |
| 117 |
@@ -47,7 +47,10 @@ RDEPEND=" |
| 118 |
xv? ( x11-libs/libXv ) |
| 119 |
) |
| 120 |
) |
| 121 |
- ffmpeg? ( virtual/ffmpeg ) |
| 122 |
+ ffmpeg? ( |
| 123 |
+ libav? ( media-video/libav:0= ) |
| 124 |
+ !libav? ( media-video/ffmpeg:0= ) |
| 125 |
+ ) |
| 126 |
gstreamer? ( |
| 127 |
media-libs/gstreamer:1.0 |
| 128 |
media-libs/gst-plugins-base:1.0 |
Archives