media-video/ffmpeg: properly disable sdl when not wanted; bug #565852

Package-Manager: portage-2.2.24
Signed-off-by: Alexis Ballier <aballier@gentoo.org>

diff --git a/media-video/ffmpeg/ffmpeg-2.8.2.ebuild b/media-video/ffmpeg/ffmpeg-2.8.2.ebuild
index 2db9b73e313d2b9d227e4307b04e6a4825bb97a3..2603f85443f27bb3c7a9690e73e1efe5b5b9dd7a 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-2.8.2.ebuild
+++ b/media-video/ffmpeg/ffmpeg-2.8.2.ebuild
@@ -65,7 +65,7 @@ fi
 FFMPEG_FLAG_MAP=(
                +bzip2:bzlib cpudetection:runtime-cpudetect debug doc gnutls +gpl
                +hardcoded-tables +iconv lzma +network openssl +postproc
-               samba:libsmbclient sdl:ffplay vaapi vdpau X:xlib xcb:libxcb
+               samba:libsmbclient sdl:ffplay sdl vaapi vdpau X:xlib xcb:libxcb
                xcb:libxcb-shm xcb:libxcb-xfixes +zlib
                # libavdevice options
                cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal

diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index bbc2f79a8f00f8ca5d4ca6e546f45f4658527bd3..464caa298670c2671826159a9d7392c4d44b2aae 100644 (file)
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -65,7 +65,7 @@ fi
 FFMPEG_FLAG_MAP=(
                +bzip2:bzlib cpudetection:runtime-cpudetect debug doc gnutls +gpl
                +hardcoded-tables +iconv lzma +network openssl +postproc
-               samba:libsmbclient sdl:ffplay vaapi vdpau X:xlib xcb:libxcb
+               samba:libsmbclient sdl:ffplay sdl vaapi vdpau X:xlib xcb:libxcb
                xcb:libxcb-shm xcb:libxcb-xfixes +zlib
                # libavdevice options
                cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal