diff options
author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-06-01 22:20:19 +0000 |
---|---|---|
committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-06-01 22:20:19 +0000 |
commit | 0afd67891e1537a617c32cb9dcc9824480b62d54 (patch) | |
tree | 762ecbefd4c6c741c115ae016285a8ae9b2fe358 /configure | |
parent | 920b85eebd05d195a00910c472a3901b87a0799e (diff) | |
download | mpv-0afd67891e1537a617c32cb9dcc9824480b62d54.tar.bz2 mpv-0afd67891e1537a617c32cb9dcc9824480b62d54.tar.xz |
-updates vo_directfb (+configure&makefile) according to planned changes
in dfb interface v. 0.9.11 (by Sven Neumann)
-misstyped VEQ_CAP_HUE comparism fix (by Antonio Daplas)
-videomode change support working (me)
patch by Jiri.Svoboda@seznam.cz
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6263 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 49 |
1 files changed, 46 insertions, 3 deletions
@@ -1845,6 +1845,31 @@ fi echores "$_tdfxfb" +echocheck "DirectFB headers presence" +if test -z "$_inc_directfb" ; then + for I in /usr/include /usr/local/include; do + if test -d "$I/directfb" && test -f "$I/directfb/directfb.h" ; then + _inc_directfb="-I$I/directfb" + echores "yes (using $_inc_directfb)" + break + fi + if test -d "$I" && test -f "$I/directfb.h" ; then + _inc_directfb="-I$I" + echores "yes (using $_inc_directfb)" + break + fi + done + if test -z "$_inc_directfb" ; then + _directfb=no + echores "not found" + fi +else + echores "yes (using $_inc_directfb)" +fi +if test "$_inc_directfb" = "-I/usr/include" ; then + _inc_directfb="" +fi + echocheck "DirectFB" if test "$_directfb" = auto ; then _directfb=no @@ -1852,7 +1877,7 @@ if test "$_directfb" = auto ; then #include <directfb.h> int main(void) { IDirectFB *foo; return 0; } EOF - linux && test -c /dev/fb0 && cc_check -ldirectfb && _directfb=yes + linux && test -c /dev/fb0 && cc_check $_inc_directfb -ldirectfb && _directfb=yes fi if test "$_directfb" = yes ; then _def_directfb='#define HAVE_DIRECTFB 1' @@ -1862,6 +1887,7 @@ if test "$_directfb" = yes ; then else _def_directfb='#undef HAVE_DIRECTFB' _novomodules="directfb $_novomodules" + _inc_directfb="" fi echores "$_directfb" @@ -1872,7 +1898,7 @@ echocheck "DirectFB >= 0.9.9" #include <directfb.h> int main(void) { IDirectFBEventBuffer *foo; return 0; } EOF - cc_check -ldirectfb && _directfb099=yes + cc_check $_inc_directfb -ldirectfb && _directfb099=yes if test "$_directfb099" = yes ; then _def_directfb099='#define HAVE_DIRECTFB099 1' else @@ -1887,7 +1913,7 @@ echocheck "DirectFB >= 0.9.10" #include <directfb.h> int main(void) { DFBDisplayLayerCapabilities caps=DLCAPS_DST_COLORKEY; return 0; } EOF - cc_check -ldirectfb && _directfb0910=yes + cc_check $_inc_directfb -ldirectfb && _directfb0910=yes if test "$_directfb0910" = yes ; then _def_directfb0910='#define HAVE_DIRECTFB0910 1' else @@ -1895,6 +1921,21 @@ else fi echores "$_directfb0910" fi +if test "$_directfb" = yes; then +echocheck "DirectFB >= 0.9.11" + _directfb0911=no + cat > $TMPC <<EOF +#include <directfb.h> +int main(void) { DFBInputEvent *foo; return foo->key_symbol; } +EOF + cc_check $_inc_directfb -ldirectfb && _directfb0911=yes +if test "$_directfb0911" = yes ; then + _def_directfb0911='#define HAVE_DIRECTFB0911 1' +else + _def_directfb0911='#undef HAVE_DIRECTFB0911' +fi +echores "$_directfb0911" +fi echocheck "X11 headers presence" @@ -3872,6 +3913,7 @@ XVID = $_xvid DECORE_LIB = $_ld_decore MENCODER = $_mencoder ENCORE_LIB = $_ld_encore $_ld_mp3lame $_ld_libdv +DIRECTFB_INC = $_inc_directfb DIRECTFB_LIB = $_ld_directfb NEW_INPUT_LIB = $_ld_new_input @@ -4235,6 +4277,7 @@ $_def_tdfxfb $_def_directfb $_def_directfb099 $_def_directfb0910 +$_def_directfb0911 $_def_zr $_def_mga $_def_xmga |