summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexis Ballier <aballier@gentoo.org>2015-11-16 09:28:20 +0100
committerAlexis Ballier <aballier@gentoo.org>2015-11-16 09:28:20 +0100
commit2f639c7517d38c15472ed589c75af24d37f6ea36 (patch)
tree445d34837a73eebc9700f36c7a8e9f4502b1629c /media-video/ffmpeg
parentapp-emulation/wine: Version bump to 1.7.55. Pulseaudio now mainstream. (diff)
downloadgentoo-2f639c7517d38c15472ed589c75af24d37f6ea36.tar.gz
gentoo-2f639c7517d38c15472ed589c75af24d37f6ea36.tar.bz2
gentoo-2f639c7517d38c15472ed589c75af24d37f6ea36.zip
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>
Diffstat (limited to 'media-video/ffmpeg')
-rw-r--r--media-video/ffmpeg/ffmpeg-2.8.2.ebuild2
-rw-r--r--media-video/ffmpeg/ffmpeg-9999.ebuild2
2 files changed, 2 insertions, 2 deletions
diff --git a/media-video/ffmpeg/ffmpeg-2.8.2.ebuild b/media-video/ffmpeg/ffmpeg-2.8.2.ebuild
index 2db9b73e313d..2603f85443f2 100644
--- 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 bbc2f79a8f00..464caa298670 100644
--- 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