From ec0c6d2a912af5df21b455b12f12408c1e1ae858 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 3 Jan 2010 01:00:21 +0000 Subject: Change fribidi check to also work without fribidi-config. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30175 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 622a48983e..92e40880e5 100755 --- a/configure +++ b/configure @@ -6218,8 +6218,9 @@ echores "$_ass" echocheck "fribidi with charsets" +_inc_tmp="" +_ld_tmp="" if test "$_fribidi" = auto ; then - if ( $_fribidiconfig --version ) >/dev/null 2>&1 ; then cat > $TMPC << EOF #include /* workaround for fribidi 0.10.4 and below */ @@ -6234,15 +6235,19 @@ int main(void) { } EOF _fribidi=no - cc_check $($_fribidiconfig --cflags) $($_fribidiconfig --libs) && _fribidi=yes - else - _fribidi=no - fi + _inc_tmp="" + _ld_tmp="-lfribidi" + cc_check $_inc_tmp $_ld_tmp && _fribidi=yes + if test "$_fribidi" = no ; then + _inc_tmp="$($_fribidiconfig --cflags)" + _ld_tmp="$($_fribidiconfig --libs)" + cc_check $_inc_tmp $_ld_tmp && _fribidi=yes + fi fi if test "$_fribidi" = yes ; then def_fribidi='#define CONFIG_FRIBIDI 1' - extra_cflags="$extra_cflags $($_fribidiconfig --cflags)" - extra_ldflags="$extra_ldflags $($_fribidiconfig --libs)" + extra_cflags="$extra_cflags $_inc_tmp" + extra_ldflags="$extra_ldflags $_ld_tmp" else def_fribidi='#undef CONFIG_FRIBIDI' fi -- cgit v1.2.3 From 4a981bf09aa13f3165e715ebe2c2658ce14d8aff Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 3 Jan 2010 09:11:20 +0000 Subject: Also detect fontconfig when it requires -liconv git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30176 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure') diff --git a/configure b/configure index 92e40880e5..46e5776ff0 100755 --- a/configure +++ b/configure @@ -6158,7 +6158,7 @@ int main(void) { } EOF _fontconfig=no - for _ld_tmp in "" "-lexpat -lfreetype" "-lexpat -lfreetype -lz" ; do + for _ld_tmp in "" "-lexpat -lfreetype" "-lexpat -lfreetype -lz" "-lexpat -lfreetype -lz -liconv" ; do _ld_tmp="-lfontconfig $_ld_tmp" cc_check $_ld_tmp && _fontconfig=yes && extra_ldflags="$extra_ldflags $_ld_tmp" && break done -- cgit v1.2.3 From c23a01e2600ec77f857bcfb3459a9138baea8aff Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 3 Jan 2010 11:33:33 +0000 Subject: Fixup SDL configure check: - Make it work without sdl-config which adds at least useless or even hurtful cflags and also does not work for cross-compiling - If using sdl-config, make it use the CFLAGS we actually use for compiling instead of something else. Thus #undef main is needed in the test program. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30178 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 45 +++++++++++++++++++++++++++++++++------------ 1 file changed, 33 insertions(+), 12 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 46e5776ff0..af59c8013d 100755 --- a/configure +++ b/configure @@ -5192,6 +5192,9 @@ echores "$_vesa" echocheck "SDL" +_inc_tmp="" +_ld_tmp="" +def_sdl_sdl_h="#undef CONFIG_SDL_SDL_H" if test -z "$_sdlconfig" ; then if ( sdl-config --version ) >>"$TMPLOG" 2>&1 ; then _sdlconfig="sdl-config" @@ -5203,15 +5206,40 @@ if test -z "$_sdlconfig" ; then fi if test "$_sdl" = auto || test "$_sdl" = yes ; then cat > $TMPC << EOF +#ifdef CONFIG_SDL_SDL_H +#include +#else #include +#endif +#ifndef __APPLE__ +// we allow SDL hacking our main() only on OSX +#undef main +#endif int main(int argc, char *argv[]) { SDL_Init(SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE); return 0; } EOF _sdl=no - if "$_sdlconfig" --version >>"$TMPLOG" 2>&1 ; then - if cc_check $($_sdlconfig --cflags) $($_sdlconfig --libs) >>"$TMPLOG" 2>&1 ; then + for _ld_tmp in "-lSDL" "-lSDL -lpthread" "-lSDL -lwinmm -lgdi32" ; do + if cc_check -DCONFIG_SDL_SDL_H $_inc_tmp $_ld_tmp ; then + _sdl=yes + def_sdl_sdl_h="#define CONFIG_SDL_SDL_H 1" + break + fi + done + if test "$_sdl" = no && "$_sdlconfig" --version >>"$TMPLOG" 2>&1 ; then + if cygwin ; then + _inc_tmp="$($_sdlconfig --cflags | cut -d " " -f 1,5,6 | sed s/no-cygwin/cygwin/)" + _ld_tmp="$($_sdlconfig --libs | cut -d " " -f 1,4,6 | sed s/no-cygwin/cygwin/)" + elif mingw32 ; then + _inc_tmp=$($_sdlconfig --cflags | sed s/-Dmain=SDL_main//) + _ld_tmp=$($_sdlconfig --libs | sed -e s/-mwindows// -e s/-lmingw32//) + else + _inc_tmp="$($_sdlconfig --cflags)" + _ld_tmp="$($_sdlconfig --libs)" + fi + if cc_check $_inc_tmp $_ld_tmp >>"$TMPLOG" 2>&1 ; then _sdlversion=$($_sdlconfig --version | sed 's/[^0-9]//g') if test "$_sdlversion" -gt 116 ; then if test "$_sdlversion" -lt 121 ; then @@ -5226,16 +5254,8 @@ EOF fi if test "$_sdl" = yes ; then def_sdl='#define CONFIG_SDL 1' - if cygwin ; then - libs_mplayer="$libs_mplayer $($_sdlconfig --libs | cut -d " " -f 1,4,6 | sed s/no-cygwin/cygwin/)" - extra_cflags="$extra_cflags $($_sdlconfig --cflags | cut -d " " -f 1,5,6 | sed s/no-cygwin/cygwin/)" - elif mingw32 ; then - libs_mplayer="$libs_mplayer $($_sdlconfig --libs | sed -e s/-mwindows// -e s/-lmingw32//)" - extra_cflags="$extra_cflags $($_sdlconfig --cflags | sed s/-Dmain=SDL_main//)" - else - libs_mplayer="$libs_mplayer $($_sdlconfig --libs)" - extra_cflags="$extra_cflags $($_sdlconfig --cflags | sed s/-D_GNU_SOURCE=1//)" - fi + extra_cflags="$extra_cflags $_inc_tmp" + libs_mplayer="$libs_mplayer $_ld_tmp" _vomodules="sdl $_vomodules" _aomodules="sdl $_aomodules" _res_comment="using $_sdlconfig" @@ -8874,6 +8894,7 @@ $def_pnm $def_quartz $def_s3fb $def_sdl +$def_sdl_sdl_h $def_sdlbuggy $def_svga $def_tdfxfb -- cgit v1.2.3 From a7be2e180bedebbf684514155869982ae72254c3 Mon Sep 17 00:00:00 2001 From: reimar Date: Sun, 3 Jan 2010 14:54:51 +0000 Subject: Finally add matrixview vo. Heavily cleaned up/fixed etc. by me, improvements are still possible though. Patch originally by Pigeon git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30182 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'configure') diff --git a/configure b/configure index af59c8013d..7beee59bc9 100755 --- a/configure +++ b/configure @@ -366,6 +366,7 @@ Video output: --enable-dhahelper enable VIDIX dhahelper support --enable-svgalib_helper enable VIDIX svgalib_helper support --enable-gl enable OpenGL video output [autodetect] + --disable-matrixview disable OpenGL MatrixView video output [autodetect] --enable-dga2 enable DGA 2 support [autodetect] --enable-dga1 enable DGA 1 support [autodetect] --enable-vesa enable VESA video output [autodetect] @@ -589,6 +590,7 @@ _md5sum=yes _yuv4mpeg=yes _gif=auto _gl=auto +matrixview=yes _ggi=auto _ggiwmh=auto _aa=auto @@ -951,6 +953,8 @@ for ac_option do --disable-gif) _gif=no ;; --enable-gl) _gl=yes ;; --disable-gl) _gl=no ;; + --enable-matrixview) matrixview=yes ;; + --disable-matrixview) matrixview=no ;; --enable-ggi) _ggi=yes ;; --disable-ggi) _ggi=no ;; --enable-ggiwmh) _ggiwmh=yes ;; @@ -4603,6 +4607,18 @@ else fi echores "$_mga" +echocheck "MatrixView" +if test "$_gl" = no ; then + matrixview=no +fi +if test "$matrixview" = yes ; then + _vomodules="matrixview $_vomodules" + def_matrixview='#define CONFIG_MATRIXVIEW 1' +else + _novomodules="matrixview $_novomodules" + def_matrixview='#undef CONFIG_MATRIXVIEW' +fi +echores "$matrixview" echocheck "xmga" if test "$_xmga" = auto ; then @@ -8356,6 +8372,7 @@ GGI = $_ggi GL = $_gl GL_WIN32 = $_gl_win32 GL_X11 = $_gl_x11 +MATRIXVIEW = $matrixview GUI = $_gui GUI_GTK = $_gui_gtk GUI_WIN32 = $_gui_win32 @@ -8883,6 +8900,7 @@ $def_gif_tvt_hack $def_gl $def_gl_win32 $def_gl_x11 +$def_matrixview $def_ivtv $def_jpeg $def_kva -- cgit v1.2.3