[FFmpeg-devel] [PATCH] Simplify libSDL configuration

[Diego Biurrun]

On Tue, Dec 22, 2009 at 11:31:46PM +0100, Stefano Sabatini wrote:
> Hi, this resulted harder than I thought.

What's the intention of this patch?  It seems to mix multiple issues.

> libSDL added support to SDL_VideoInfo.current_{w,h} in r1501
> 2005-01-04, and bumped minor (1.2.9 -> 1.2.10) in r1754 2006-01-04, so
> my first idea is to use the version numbers for checking that feature.
> 
> Since r1754 is a rather ancient version, I'm quite confident there
> shouldn't be many people around affected by this change.
> 
> Also I'm not sure ffplay can compile with libSDL 1.3 (I'll check if
> no-one can confirm though).

Could be, please doublecheck.

> --- ffmpeg.orig/configure	2009-12-22 21:01:10.000000000 +0100
> +++ ffmpeg/configure	2009-12-22 23:10:58.000000000 +0100
> @@ -978,8 +980,6 @@
>      roundf
> -    sdl
> -    sdl_video_size

Why is it safe to get rid of sdl_video_size?

> @@ -2392,32 +2393,9 @@
> +enabled sdl       && require libSDL SDL/SDL_version.h SDL_GetVideoInfo -lSDL &&
> +                      { check_cpp_condition SDL/SDL_version.h "(SDL_MAJOR_VERSION >= 1 && (SDL_MINOR_VERSION > 2 || (SDL_MINOR_VERSION == 2 && SDL_PATCHLEVEL >= 11)))" ||
> +                        die "ERROR: libSDL version must be >= 1.2.11"; }

That sure is ugly formatting..

> --- ffmpeg.orig/ffplay.c	2009-12-22 21:01:10.000000000 +0100
> +++ ffmpeg/ffplay.c	2009-12-22 21:07:11.000000000 +0100
> @@ -32,8 +32,8 @@
>  
> -#include <SDL.h>
> -#include <SDL_thread.h>
> +#include <SDL/SDL.h>
> +#include <SDL/SDL_thread.h>

This looks good to me.

> --- ffmpeg.orig/Makefile	2009-12-22 23:10:12.000000000 +0100
> +++ ffmpeg/Makefile	2009-12-22 23:11:37.000000000 +0100
> @@ -76,8 +75,6 @@
>  
> -ffplay.o ffplay.d: CFLAGS += $(SDL_CFLAGS)

This could probably be applied along with the #include path fix.

Diego