[FFmpeg-cvslog] configure: Handle SDL version check through pkg-config

Diego Biurrun git at videolan.org
Thu Sep 28 07:05:52 EEST 2017


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Sat Feb 11 16:51:25 2017 +0100| [d00a0d8e84fef1b9124bfaf71cc17df79ca464a6] | committer: Diego Biurrun

configure: Handle SDL version check through pkg-config

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d00a0d8e84fef1b9124bfaf71cc17df79ca464a6
---

 configure | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/configure b/configure
index b8cbe175e8..4635b73b08 100755
--- a/configure
+++ b/configure
@@ -4748,9 +4748,7 @@ if enabled nvenc; then
     require_cpp_condition nvEncodeAPI.h "NVENCAPI_MAJOR_VERSION >= 6"
 fi
 
-if check_pkg_config sdl SDL_events.h SDL_PollEvent; then
-    check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags &&
-    check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x010300" $sdl_cflags &&
+if check_pkg_config "sdl >= 1.2.1 sdl < 1.3.0" SDL_events.h SDL_PollEvent; then
     enable sdl
 fi
 



More information about the ffmpeg-cvslog mailing list