Mercurial > mplayer.hg

comparison configure @ 19052:6866e768aef8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Streamline GUI build.
author diego
date Thu, 13 Jul 2006 03:05:08 +0000
parents 9b3a8b48e5b3
children b508e7ef1ea8
comparison
equal deleted inserted replaced
19051:7d1896a52428 19052:6866e768aef8
329 --enable-xv build with Xv render support for X 4.x [autodetect] 329 --enable-xv build with Xv render support for X 4.x [autodetect]
330 --enable-xvmc build with XvMC acceleration for X 4.x [disable] 330 --enable-xvmc build with XvMC acceleration for X 4.x [disable]
331 --enable-vm build with XF86VidMode support for X11 [autodetect] 331 --enable-vm build with XF86VidMode support for X11 [autodetect]
332 --enable-xinerama build with Xinerama support for X11 [autodetect] 332 --enable-xinerama build with Xinerama support for X11 [autodetect]
333 --enable-x11 build with X11 render support [autodetect] 333 --enable-x11 build with X11 render support [autodetect]
334 --enable-xshape build with XShape support [autodetect]
334 --enable-fbdev build with FBDev render support [autodetect] 335 --enable-fbdev build with FBDev render support [autodetect]
335 --enable-mlib build with mediaLib support (Solaris only) [disable] 336 --enable-mlib build with mediaLib support (Solaris only) [disable]
336 --enable-3dfx build with obsolete /dev/3dfx support [disable] 337 --enable-3dfx build with obsolete /dev/3dfx support [disable]
337 --enable-tdfxfb build with tdfxfb (Voodoo 3/banshee) support [disable] 338 --enable-tdfxfb build with tdfxfb (Voodoo 3/banshee) support [disable]
338 --enable-s3fb build with s3fb (S3 ViRGE) support [disable] 339 --enable-s3fb build with s3fb (S3 ViRGE) support [disable]
1571 _libpostproc=auto 1572 _libpostproc=auto
1572 _libpostproc_so=auto 1573 _libpostproc_so=auto
1573 _libfame=auto 1574 _libfame=auto
1574 _mencoder=yes 1575 _mencoder=yes
1575 _x11=auto 1576 _x11=auto
1577 _xshape=auto
1576 _dga=auto # 1 2 no auto 1578 _dga=auto # 1 2 no auto
1577 _xv=auto 1579 _xv=auto
1578 _xvmc=no #auto when complete 1580 _xvmc=no #auto when complete
1579 _sdl=auto 1581 _sdl=auto
1580 _directx=auto 1582 _directx=auto
1736 --disable-mencoder) _mencoder=no ;; 1738 --disable-mencoder) _mencoder=no ;;
1737 --enable-dynamic-plugins) _dynamic_plugins=yes ;; 1739 --enable-dynamic-plugins) _dynamic_plugins=yes ;;
1738 --disable-dynamic-plugins) _dynamic_plugins=no ;; 1740 --disable-dynamic-plugins) _dynamic_plugins=no ;;
1739 --enable-x11) _x11=yes ;; 1741 --enable-x11) _x11=yes ;;
1740 --disable-x11) _x11=no ;; 1742 --disable-x11) _x11=no ;;
1743 --enable-xshape) _xshape=yes ;;
1744 --disable-xshape) _xshape=no ;;
1741 --enable-xv) _xv=yes ;; 1745 --enable-xv) _xv=yes ;;
1742 --disable-xv) _xv=no ;; 1746 --disable-xv) _xv=no ;;
1743 --enable-xvmc) _xvmc=yes ;; 1747 --enable-xvmc) _xvmc=yes ;;
1744 --disable-xvmc) _xvmc=no ;; 1748 --disable-xvmc) _xvmc=no ;;
1745 --enable-sdl) _sdl=yes ;; 1749 --enable-sdl) _sdl=yes ;;
7006 else 7010 else
7007 _def_gethostbyname2='#undef HAVE_GETHOSTBYNAME2' 7011 _def_gethostbyname2='#undef HAVE_GETHOSTBYNAME2'
7008 fi 7012 fi
7009 echores "$_gethostbyname2" 7013 echores "$_gethostbyname2"
7010 7014
7015
7011 # --------------- GUI specific tests begin ------------------- 7016 # --------------- GUI specific tests begin -------------------
7012 echocheck "GUI" 7017 echocheck "GUI"
7013 echo "$_gui" 7018 echo "$_gui"
7014 if test "$_gui" = yes ; then 7019 if test "$_gui" = yes ; then
7015 7020
7016 # Required libraries 7021 # Required libraries
7017 test "$_png" != yes && die "PNG support required for GUI compilation, please install libpng and libpng-dev packages." 7022 test "$_png" != yes && die "The GUI requires PNG support, please install libpng and libpng-dev packages."
7018 if not win32 ; then 7023 if not win32 ; then
7019 test "$_x11" != yes && die "X11 support required for GUI compilation" 7024 test "$_x11" != yes && die "X11 support required for GUI compilation."
7020 7025
7021 echocheck "XShape extension" 7026 echocheck "XShape extension"
7022 _xshape=no 7027 if test "$_xshape" = auto ; then
7023 if test "$_x11" = yes ; then 7028 _xshape=no
7024 cat > $TMPC << EOF 7029 cat > $TMPC << EOF
7025 #include <X11/Xlib.h> 7030 #include <X11/Xlib.h>
7026 #include <X11/Xproto.h> 7031 #include <X11/Xproto.h>
7027 #include <X11/Xutil.h> 7032 #include <X11/Xutil.h>
7028 #include <X11/extensions/shape.h> 7033 #include <X11/extensions/shape.h>
7063 7068
7064 # Check for GLIB2 7069 # Check for GLIB2
7065 if pkg-config glib-2.0 --exists ; then 7070 if pkg-config glib-2.0 --exists ; then
7066 echocheck "glib version" 7071 echocheck "glib version"
7067 _glib=`pkg-config glib-2.0 --modversion 2>/dev/null` 7072 _glib=`pkg-config glib-2.0 --modversion 2>/dev/null`
7068 _inc_glib=`pkg-config glib-2.0 --cflags 2>/dev/null`
7069 _ld_glib=`pkg-config glib-2.0 --libs 2>/dev/null` 7073 _ld_glib=`pkg-config glib-2.0 --libs 2>/dev/null`
7070 echores "$_glib" 7074 echores "$_glib"
7071 7075
7072 _def_gui='#define HAVE_NEW_GUI 1' 7076 _def_gui='#define HAVE_NEW_GUI 1'
7073 _def_gtk2_gui='#define HAVE_GTK2_GUI 1' 7077 _def_gtk2_gui='#define HAVE_GTK2_GUI 1'
7074 _ld_gui='$(GTKLIB) $(GLIBLIB)'
7075 else 7078 else
7076 _gtk1=yes 7079 _gtk1=yes
7077 echo "GLIB-2 devel packages were not found, trying GTK 1.2" 7080 echo "GLIB-2 devel packages were not found, trying GTK 1.2"
7078 fi 7081 fi
7079 else 7082 else
7105 if ( glib-config --version ) >/dev/null 2>&1 ; then 7108 if ( glib-config --version ) >/dev/null 2>&1 ; then
7106 _glibconfig="glib-config" 7109 _glibconfig="glib-config"
7107 elif ( glib12-config --version ) >/dev/null 2>&1 ; then 7110 elif ( glib12-config --version ) >/dev/null 2>&1 ; then
7108 _glibconfig="glib12-config" 7111 _glibconfig="glib12-config"
7109 else 7112 else
7110 die "The GUI requires GLib devel packages (which were not found)" 7113 die "The GUI requires GLIB devel packages (which were not found)"
7111 fi 7114 fi
7112 fi 7115 fi
7113 _glib=`$_glibconfig --version 2>&1` 7116 _glib=`$_glibconfig --version 2>&1`
7114 _inc_glib=`$_glibconfig --cflags 2>&1`
7115 _ld_glib=`$_glibconfig --libs 2>&1` 7117 _ld_glib=`$_glibconfig --libs 2>&1`
7116 echores "$_glib (using $_glibconfig)" 7118 echores "$_glib (using $_glibconfig)"
7117 7119
7118 _def_gui='#define HAVE_NEW_GUI 1' 7120 _def_gui='#define HAVE_NEW_GUI 1'
7119 _def_gtk2_gui='#undef HAVE_GTK2_GUI' 7121 _def_gtk2_gui='#undef HAVE_GTK2_GUI'
7120 _ld_gui='$(GTKLIB) $(GLIBLIB)' 7122 fi
7121 fi 7123
7122 7124 else #if not win32
7123 else
7124 _ld_win32libs="-lcomdlg32 -lcomctl32 -lshell32 -lkernel32 $_ld_win32libs" 7125 _ld_win32libs="-lcomdlg32 -lcomctl32 -lshell32 -lkernel32 $_ld_win32libs"
7125 _def_gui='#define HAVE_NEW_GUI 1' 7126 _def_gui='#define HAVE_NEW_GUI 1'
7126 _def_gtk2_gui='#undef HAVE_GTK2_GUI' 7127 _def_gtk2_gui='#undef HAVE_GTK2_GUI'
7127 _ld_gui='$(GTKLIB) $(GLIBLIB)' 7128 fi #if not win32
7128 fi 7129
7129 7130 else #if test "$_gui"
7130 else
7131 _def_gui='#undef HAVE_NEW_GUI' 7131 _def_gui='#undef HAVE_NEW_GUI'
7132 _def_gtk2_gui='#undef HAVE_GTK2_GUI' 7132 _def_gtk2_gui='#undef HAVE_GTK2_GUI'
7133 fi 7133 fi #if test "$_gui"
7134 # --------------- GUI specific tests end ------------------- 7134 # --------------- GUI specific tests end -------------------
7135
7135 7136
7136 if test "$_charset" = "noconv" ; then 7137 if test "$_charset" = "noconv" ; then
7137 _charset="" 7138 _charset=""
7138 elif test -z "$_charset" ; then 7139 elif test -z "$_charset" ; then
7139 if test "$_gtk1" = yes ; then 7140 if test "$_gtk1" = yes ; then
7631 TARGET_VIS = $_vis 7632 TARGET_VIS = $_vis
7632 TARGET_BUILTIN_VECTOR = $_builtin_vector 7633 TARGET_BUILTIN_VECTOR = $_builtin_vector
7633 TARGET_BUILTIN_3DNOW = $_mm3dnow 7634 TARGET_BUILTIN_3DNOW = $_mm3dnow
7634 7635
7635 # --- GUI stuff --- 7636 # --- GUI stuff ---
7636 GTKINC = $_inc_gtk 7637 GTK_INC = $_inc_gtk
7637 GTKLIB = $_ld_static $_ld_gtk 7638 GTKLIB = $_ld_gtk
7638 GTKLIBS = $_ld_gtk 7639 GLIBLIB = $_ld_glib
7639 GLIBLIB = $_ld_static $_ld_glib 7640 GTK_LIBS = $_ld_static \$(GTKLIB) \$(GLIBLIB)
7640 GLIBLIBS = $_ld_glib
7641 GLIBINC = $_inc_glib
7642 GTK_LIBS = $_ld_static $_ld_gui
7643 GUI = $_gui 7641 GUI = $_gui
7644 DEBUG = -DDEBUG
7645 7642
7646 # --- libvo stuff --- 7643 # --- libvo stuff ---
7647 VO_SRCS = $_vosrc 7644 VO_SRCS = $_vosrc
7648 7645
7649 # --- libao2 stuff --- 7646 # --- libao2 stuff ---