[FFmpeg-devel] [PATCH] Simplify libSDL configuration

[Stefano Sabatini]

On date Wednesday 2009-12-23 23:36:26 +0000, M?ns Rullg?rd encoded:
> Diego Biurrun <diego at biurrun.de> writes:
> 
> > 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.
> 
> The intent is of course to get rid of some uglies in configure.
> 
> >> --- 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.
> 
> I bet there's at least one distro with the headers somewhere else.
> 
> >> --- 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.
> 
> See above.  Please don't apply this yet.

I wonder how may be possible to fix this upstream, apparently many
projects let the user / packager to specify where install the headers
rather than use a sensible default value, thus requiring the use of
pkg-config even for checking the presence of an header.

Patch simplified to avoid to mix many issues.

Note the temp_cflags command in:
check_lib2 SDL.h SDL_Init && temp_cflags $sdl_cflags &&

is required since check_lib2() calls restore_flags() and so the cflags
for libSDL need to be restored before the check_cpp_condition()
command.

Regards.
-- 
FFmpeg = Frenzy and Fostering Moronic Peaceful Eager Generator
-------------- next part --------------
A non-text attachment was scrubbed...
Name: simplify-libsdl-check.patch
Type: text/x-diff
Size: 1689 bytes
Desc: not available
URL: <http://lists.mplayerhq.hu/pipermail/ffmpeg-devel/attachments/20091224/0cd0e785/attachment.patch>