| 1 |
commit: 8068ed348f5f5654309a0442d0d677c79810a945 |
| 2 |
Author: Michael Weber <xmw <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Feb 7 23:34:59 2017 +0000 |
| 4 |
Commit: Michael Weber <xmw <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Feb 7 23:34:59 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8068ed34 |
| 7 |
|
| 8 |
x11-wm/xpra: rename ambigious USE=ffmpeg to USE=enc_ffmpeg, enc_ffmpeg supports both ffmpeg and libav. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
x11-wm/xpra/metadata.xml | 1 + |
| 13 |
x11-wm/xpra/xpra-1.0.2.ebuild | 6 +++--- |
| 14 |
2 files changed, 4 insertions(+), 3 deletions(-) |
| 15 |
|
| 16 |
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml |
| 17 |
index 1554d1e..f8a239b 100644 |
| 18 |
--- a/x11-wm/xpra/metadata.xml |
| 19 |
+++ b/x11-wm/xpra/metadata.xml |
| 20 |
@@ -14,6 +14,7 @@ |
| 21 |
<flag name="csc">Enable csc softscaler support</flag> |
| 22 |
<flag name="dec_av">Enable dec_avcodec support</flag> |
| 23 |
<flag name="dec_av2">Enable dec_avcodec2 support</flag> |
| 24 |
+ <flag name="enc_ffmpeg">Enable advanced ffmpeg/libav encoder support</flag> |
| 25 |
<flag name="lz4">Enable support for lz4 compression</flag> |
| 26 |
<flag name="rencode">Enable rencode support</flag> |
| 27 |
<flag name="server">Build server-side code</flag> |
| 28 |
|
| 29 |
diff --git a/x11-wm/xpra/xpra-1.0.2.ebuild b/x11-wm/xpra/xpra-1.0.2.ebuild |
| 30 |
index a861b71..eb8e8e1 100644 |
| 31 |
--- a/x11-wm/xpra/xpra-1.0.2.ebuild |
| 32 |
+++ b/x11-wm/xpra/xpra-1.0.2.ebuild |
| 33 |
@@ -15,7 +15,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz" |
| 34 |
LICENSE="GPL-2 BSD" |
| 35 |
SLOT="0" |
| 36 |
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" |
| 37 |
-IUSE="+client +clipboard csc cups dec_av2 ffmpeg libav lz4 lzo opengl pulseaudio server sound vpx webcam webp x264 x265" |
| 38 |
+IUSE="+client +clipboard csc cups dec_av2 enc_ffmpeg libav lz4 lzo opengl pulseaudio server sound vpx webcam webp x264 x265" |
| 39 |
|
| 40 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 41 |
clipboard? ( || ( server client ) ) |
| 42 |
@@ -42,7 +42,7 @@ COMMON_DEPEND=""${PYTHON_DEPS}" |
| 43 |
!libav? ( >=media-video/ffmpeg-2:0= ) |
| 44 |
libav? ( media-video/libav:0= ) |
| 45 |
) |
| 46 |
- ffmpeg? ( |
| 47 |
+ enc_ffmpeg? ( |
| 48 |
!libav? ( >=media-video/ffmpeg-3.2.2:0= ) |
| 49 |
libav? ( media-video/libav:0= ) |
| 50 |
) |
| 51 |
@@ -118,7 +118,7 @@ python_configure_all() { |
| 52 |
$(use_with csc csc_swscale) |
| 53 |
$(use_with cups printing) |
| 54 |
$(use_with dec_av2 dec_avcodec2) |
| 55 |
- $(use_with ffmpeg enc_ffmpeg) |
| 56 |
+ $(use_with enc_ffmpeg) |
| 57 |
$(use_with opengl) |
| 58 |
$(use_with server shadow) |
| 59 |
$(use_with server) |
Archives