[FFmpeg-devel] configure: add missing optional SDL2 dependency to OpenGL outdev

Submitted by James Almer on Oct. 19, 2018, 4:26 a.m.

Details

Message ID 20181019042652.10672-1-jamrial@gmail.com
State Accepted
Headers show

Commit Message

James Almer Oct. 19, 2018, 4:26 a.m.
Signed-off-by: James Almer <jamrial@gmail.com>
---
 configure | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

James Almer Oct. 25, 2018, 12:15 a.m.
On 10/19/2018 1:26 AM, James Almer wrote:
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>  configure | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index 85d5dd5962..c91e37a75d 100755
> --- a/configure
> +++ b/configure
> @@ -3267,6 +3267,7 @@ libcdio_indev_deps="libcdio"
>  libdc1394_indev_deps="libdc1394"
>  openal_indev_deps="openal"
>  opengl_outdev_deps="opengl"
> +opengl_outdev_suggest="sdl2"
>  oss_indev_deps_any="sys_soundcard_h"
>  oss_outdev_deps_any="sys_soundcard_h"
>  pulse_indev_deps="libpulse"
> @@ -6903,7 +6904,7 @@ enabled zoompan_filter      && prepend avfilter_deps "swscale"
>  enabled lavfi_indev         && prepend avdevice_deps "avfilter"
>  
>  #FIXME
> -enabled sdl2_outdev     && add_cflags $(filter_out '-Dmain=SDL_main' $sdl2_cflags)
> +enabled_any sdl2_outdev opengl_outdev && enabled sdl2 && add_cflags $(filter_out '-Dmain=SDL_main' $sdl2_cflags)
>  
>  enabled opus_decoder    && prepend avcodec_deps "swresample"

Pushed.

Patch hide | download patch | download mbox

diff --git a/configure b/configure
index 85d5dd5962..c91e37a75d 100755
--- a/configure
+++ b/configure
@@ -3267,6 +3267,7 @@  libcdio_indev_deps="libcdio"
 libdc1394_indev_deps="libdc1394"
 openal_indev_deps="openal"
 opengl_outdev_deps="opengl"
+opengl_outdev_suggest="sdl2"
 oss_indev_deps_any="sys_soundcard_h"
 oss_outdev_deps_any="sys_soundcard_h"
 pulse_indev_deps="libpulse"
@@ -6903,7 +6904,7 @@  enabled zoompan_filter      && prepend avfilter_deps "swscale"
 enabled lavfi_indev         && prepend avdevice_deps "avfilter"
 
 #FIXME
-enabled sdl2_outdev     && add_cflags $(filter_out '-Dmain=SDL_main' $sdl2_cflags)
+enabled_any sdl2_outdev opengl_outdev && enabled sdl2 && add_cflags $(filter_out '-Dmain=SDL_main' $sdl2_cflags)
 
 enabled opus_decoder    && prepend avcodec_deps "swresample"