diff options
| author |   Michael Weber <xmw@gentoo.org> | 2017-02-08 00:34:59 +0100 |
|---|---|---|
| committer | Michael Weber <xmw@gentoo.org> | 2017-02-08 00:34:59 +0100 |
| commit | 8068ed348f5f5654309a0442d0d677c79810a945 (patch) | |
| tree | 512dfef527c97c18c1c78585e88104f810e2d3f9 | |
| parent | x11-wm/xpra: Revert 6d788217d3. (diff) | |
| download | gentoo-8068ed34.tar.gz gentoo-8068ed34.tar.bz2 gentoo-8068ed34.zip | |
x11-wm/xpra: rename ambigious USE=ffmpeg to USE=enc_ffmpeg, enc_ffmpeg supports both ffmpeg and libav.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
| -rw-r--r-- | x11-wm/xpra/metadata.xml | 1 | ||||
| -rw-r--r-- | x11-wm/xpra/xpra-1.0.2.ebuild | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml index 1554d1e1109a..f8a239bbf460 100644 --- a/x11-wm/xpra/metadata.xml +++ b/x11-wm/xpra/metadata.xml @@ -14,6 +14,7 @@ <flag name="csc">Enable csc softscaler support</flag> <flag name="dec_av">Enable dec_avcodec support</flag> <flag name="dec_av2">Enable dec_avcodec2 support</flag> + <flag name="enc_ffmpeg">Enable advanced ffmpeg/libav encoder support</flag> <flag name="lz4">Enable support for lz4 compression</flag> <flag name="rencode">Enable rencode support</flag> <flag name="server">Build server-side code</flag> diff --git a/x11-wm/xpra/xpra-1.0.2.ebuild b/x11-wm/xpra/xpra-1.0.2.ebuild index a861b7165f9e..eb8e8e175a9b 100644 --- a/x11-wm/xpra/xpra-1.0.2.ebuild +++ b/x11-wm/xpra/xpra-1.0.2.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz" LICENSE="GPL-2 BSD" SLOT="0" KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+client +clipboard csc cups dec_av2 ffmpeg libav lz4 lzo opengl pulseaudio server sound vpx webcam webp x264 x265" +IUSE="+client +clipboard csc cups dec_av2 enc_ffmpeg libav lz4 lzo opengl pulseaudio server sound vpx webcam webp x264 x265" REQUIRED_USE="${PYTHON_REQUIRED_USE} clipboard? ( || ( server client ) ) @@ -42,7 +42,7 @@ COMMON_DEPEND=""${PYTHON_DEPS}" !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) - ffmpeg? ( + enc_ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.2.2:0= ) libav? ( media-video/libav:0= ) ) @@ -118,7 +118,7 @@ python_configure_all() { $(use_with csc csc_swscale) $(use_with cups printing) $(use_with dec_av2 dec_avcodec2) - $(use_with ffmpeg enc_ffmpeg) + $(use_with enc_ffmpeg) $(use_with opengl) $(use_with server shadow) $(use_with server) |