Commit a86b921c authored by Fabrice Bellard's avatar Fabrice Bellard

SDL probe - ffplay build option

Originally committed as revision 1935 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 067cbf31
...@@ -83,6 +83,7 @@ SHFLAGS=-shared ...@@ -83,6 +83,7 @@ SHFLAGS=-shared
netserver="no" netserver="no"
need_inet_aton="no" need_inet_aton="no"
ffserver="yes" ffserver="yes"
ffplay="yes"
LDFLAGS=-Wl,--warn-common LDFLAGS=-Wl,--warn-common
FFSLDFLAGS=-Wl,-E FFSLDFLAGS=-Wl,-E
LIBPREF="lib" LIBPREF="lib"
...@@ -317,6 +318,8 @@ for opt do ...@@ -317,6 +318,8 @@ for opt do
;; ;;
--disable-ffserver) ffserver="no" --disable-ffserver) ffserver="no"
;; ;;
--disable-ffplay) ffplay="no"
;;
--disable-risky) risky="no" --disable-risky) risky="no"
;; ;;
--enable-small) small="yes" --enable-small) small="yes"
...@@ -588,6 +591,9 @@ if test "$vhook" = "default" ; then ...@@ -588,6 +591,9 @@ if test "$vhook" = "default" ; then
vhook="$dlopen" vhook="$dlopen"
fi fi
##########################################
# imlib probe
cat > $TMPC << EOF cat > $TMPC << EOF
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <Imlib2.h> #include <Imlib2.h>
...@@ -599,6 +605,9 @@ if $cc -o $TMPE $TMPC -lImlib2 2> /dev/null ; then ...@@ -599,6 +605,9 @@ if $cc -o $TMPE $TMPC -lImlib2 2> /dev/null ; then
imlib2=yes imlib2=yes
fi fi
##########################################
# freetype probe
cat > $TMPC << EOF cat > $TMPC << EOF
#include <ft2build.h> #include <ft2build.h>
int main( void ) { return (int) FT_Init_FreeType(0); } int main( void ) { return (int) FT_Init_FreeType(0); }
...@@ -613,6 +622,25 @@ if test "x$targetos" != "xBeOS" && test "$os2" != "yes"; then ...@@ -613,6 +622,25 @@ if test "x$targetos" != "xBeOS" && test "$os2" != "yes"; then
fi fi
fi fi
##########################################
# SDL probe
cat > $TMPC << EOF
#include <SDL.h>
int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
EOF
sdl_too_old=no
sdl=no
if $cc -o $TMPE `sdl-config --cflags` $TMPC `sdl-config --libs` 2> /dev/null ; then
_sdlversion=`sdl-config --version | sed 's/[^0-9]//g'`
if test "$_sdlversion" -lt 121 ; then
sdl_too_old=yes
else
sdl=yes
fi
fi
if test "$small" = "yes"; then if test "$small" = "yes"; then
# CFLAGS=${CFLAGS//-O3/-Os} # CFLAGS=${CFLAGS//-O3/-Os}
CFLAGS="$CFLAGS -Os" CFLAGS="$CFLAGS -Os"
...@@ -665,6 +693,7 @@ echo " --enable-gprof enable profiling with gprof [$gprof]" ...@@ -665,6 +693,7 @@ echo " --enable-gprof enable profiling with gprof [$gprof]"
echo " --disable-mpegaudio-hp faster (but less accurate)" echo " --disable-mpegaudio-hp faster (but less accurate)"
echo " mpegaudio decoding [default=no]" echo " mpegaudio decoding [default=no]"
echo " --disable-ffserver disable ffserver build" echo " --disable-ffserver disable ffserver build"
echo " --disable-ffplay disable ffplay build"
echo " --disable-risky disables patent encumbered codecs" echo " --disable-risky disables patent encumbered codecs"
echo " --enable-small optimize for size instead of speed" echo " --enable-small optimize for size instead of speed"
echo "" echo ""
...@@ -699,6 +728,10 @@ echo "a52 dlopened $a52bin" ...@@ -699,6 +728,10 @@ echo "a52 dlopened $a52bin"
echo "pp support $pp" echo "pp support $pp"
echo "shared pp $shared_pp" echo "shared pp $shared_pp"
echo "Video hooking $vhook" echo "Video hooking $vhook"
echo "SDL support $sdl"
if test $sdl_too_old = "yes"; then
echo "-> Your SDL version is too old - please upgrade to have FFplay/SDL support"
fi
echo "risky / patent encumbered codecs $risky" echo "risky / patent encumbered codecs $risky"
echo "optimize for size $small" echo "optimize for size $small"
...@@ -795,6 +828,11 @@ fi ...@@ -795,6 +828,11 @@ fi
if test "$freetype2" = "yes" ; then if test "$freetype2" = "yes" ; then
echo "HAVE_FREETYPE2=yes" >> config.mak echo "HAVE_FREETYPE2=yes" >> config.mak
fi fi
if test "$sdl" = "yes" ; then
echo "CONFIG_SDL=yes" >> config.mak
echo "SDL_LIBS=`sdl-config --libs`" >> config.mak
echo "SDL_CFLAGS=`sdl-config --cflags`" >> config.mak
fi
if test "$have_lrintf" = "yes" ; then if test "$have_lrintf" = "yes" ; then
echo "#define HAVE_LRINTF 1" >> $TMPH echo "#define HAVE_LRINTF 1" >> $TMPH
fi fi
...@@ -964,6 +1002,10 @@ if test "$ffserver" = "yes" ; then ...@@ -964,6 +1002,10 @@ if test "$ffserver" = "yes" ; then
echo "CONFIG_FFSERVER=yes" >> config.mak echo "CONFIG_FFSERVER=yes" >> config.mak
fi fi
if test "$ffplay" = "yes" ; then
echo "CONFIG_FFPLAY=yes" >> config.mak
fi
if test "$risky" = "yes" ; then if test "$risky" = "yes" ; then
echo "#define CONFIG_RISKY 1" >> $TMPH echo "#define CONFIG_RISKY 1" >> $TMPH
echo "CONFIG_RISKY=yes" >> config.mak echo "CONFIG_RISKY=yes" >> config.mak
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment