[Mplayer-cvslog] CVS: main configure,1.12,1.13

[Michael Graffam]

Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv2495

Modified Files:
	configure 
Log Message:
Changes to configure to autodetect DGA 2.0 functionality, and to only use
DGA video mode switching when DGA 2.0 is present


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** configure	2001/03/28 12:08:44	1.12
--- configure	2001/03/28 19:58:45	1.13
***************
*** 168,171 ****
--- 168,172 ----
  _xmga=no
  _dga=no
+ _dga2=no
  _fbdev=no
  _lirc=no
***************
*** 394,398 ****
--- 395,411 ----
  # ---
  
+ # Check if DGA is 2.0 or greater
  cat > $TMPC << EOF
+ #include <stdio.h>
+ #include <X11/Xlib.h>
+ #include <X11/extensions/xf86dga.h>
+ int main (void) { XDGAMode mode; XDGADevice device; return 0;}
+ EOF
+ 
+ _dga2=no
+ $_cc $TMPC -o $TMPO -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lXxf86dga -lXxf86vm &> /dev/null && _dga2=yes
+ 
+ 
+ cat > $TMPC << EOF
  #include <GL/gl.h>
  int main( void ) { return 0; }
***************
*** 444,448 ****
    --enable-dga)
          _dga=yes
!         ;;	
    --enable-xv)
          _xv=yes
--- 457,464 ----
    --enable-dga)
          _dga=yes
!         ;;
!   --enable-dga2)
!         _dga2=yes
!         ;;
    --enable-xv)
          _xv=yes
***************
*** 514,517 ****
--- 530,536 ----
  	_dga=no
  	;;
+   --disable-dga2)
+         _dga2=no
+         ;;
    --disable-fbdev)
    	_fbdev=no
***************
*** 556,559 ****
--- 575,579 ----
  echo "Checking for X11 ... $_x11"
  echo "Checking for DGA ... $_dga"
+ echo "Checking for DGA 2.0 .. $_dga2"
  echo "Checking for Xf86VM ... $_vm"
  echo "Checking for FBDev ... $_fbdev"
***************
*** 728,731 ****
--- 748,758 ----
  fi
  
+ if [ $_dga2 = yes ]; then
+  _dga2='#define HAVE_DGA2'
+  _vosrc=$_vosrc' vo_dga.c vo_fsdga.c'
+ else
+  _dga2='#undef HAVE_DGA2'
+ fi
+ 
  if [ $_fbdev = yes ]; then
   _fbdev='#define HAVE_FBDEV'
***************
*** 808,811 ****
--- 835,839 ----
  $_gl
  $_dga
+ $_dga2
  $_sdldef
  $_3dfx


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog