x11-wm/xpra: rename ambigious USE=ffmpeg to USE=enc_ffmpeg, enc_ffmpeg supports both...

Package-Manager: Portage-2.3.3, Repoman-2.3.1

diff --git a/x11-wm/xpra/metadata.xml b/x11-wm/xpra/metadata.xml
index 1554d1e1109a27ca3ce030c1a6558227c3de4324..f8a239bbf460839fc5e1253903e5ea8fbd06255d 100644 (file)
--- 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 a861b7165f9e4a5440f5d95426b0f49cd54ca573..eb8e8e175a9b5717a68e634375a07b2cfe8e7574 100644 (file)
--- 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)