[Mplayer-cvslog] CVS: main help_mp.h,1.1.1.1,1.2 configure,1.10,1.11

[Michael Graffam]

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

Modified Files:
	help_mp.h configure 
Log Message:
Addes autodetection of XF86VidMode to configure, and adds a description of
the -vm option to help_mp.h -- mgraffam


Index: help_mp.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** help_mp.h	2001/02/24 20:28:35	1.1.1.1
--- help_mp.h	2001/03/24 21:37:25	1.2
***************
*** 34,37 ****
--- 34,40 ----
  "    -fs             fullscreen playing (only gl, xmga and xv drivers)\n"
  #endif
+ #ifdef HAVE_XF86VM
+ "    -vm             Use XF86VidMode for psuedo-scaling with x11 driver\n                     (requires -fs)\n"
+ #endif
  "    -x <x> -y <y>   scale image to <x> * <y> resolution [if scalable!]\n"
  "\n"

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** configure	2001/03/22 19:21:32	1.10
--- configure	2001/03/24 21:37:25	1.11
***************
*** 7,10 ****
--- 7,13 ----
  # Changes in reversed order:
  #
+ # 2001/03/24 by Mike Graffam:
+ #  - added autodetect code for XF86VidMode, along with explicit --enable-vm
+ #
  # 2001/03/22 by Bivanbi:
  #  - new option: --cc  (to specify C compiler path+name)
***************
*** 78,81 ****
--- 81,85 ----
  				if both /dev/mga_vid and x11 are available]
          --enable-xv             build with Xv render support for X 4.x [autodetect]
+ 	--enable-vm		build with XF86VidMode support for x11 driver
          --enable-x11            build with X11 render support [autodetect]
  	--enable-mlib		build with MLIB support ( only Solaris )
***************
*** 155,158 ****
--- 159,163 ----
  _sdl=no
  _xv=no
+ _vm=no
  _x11=no
  _3dfx=no
***************
*** 351,354 ****
--- 356,360 ----
  
  $_cc $TMPC -o $TMPO $_x11libdir/ -lGL &> /dev/null && _gl=yes
+ $_cc $TMPC -o $TMPO $_x11libdir/ -lXxf86vm &> /dev/null && _vm=yes
  $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext &> /dev/null && _x11=yes
  $_cc $TMPC -o $TMPO $_x11libdir -lXv &> /dev/null && _xv=yes
***************
*** 440,443 ****
--- 446,452 ----
          _xv=yes
          ;;
+   --enable-vm)
+         _vm=yes
+         ;;
    --enable-x11)
          _x11=yes
***************
*** 488,491 ****
--- 497,503 ----
          _xv=no
          ;;
+   --disable-vm)
+         _vm=no
+         ;;
    --disable-x11)
          _x11=no
***************
*** 536,540 ****
  echo "Checking for X11 ... $_x11"
  echo "Checking for DGA ... $_dga"
! 
  # write conf files.
  
--- 548,552 ----
  echo "Checking for X11 ... $_x11"
  echo "Checking for DGA ... $_dga"
! echo "Checking for Xf86VM ... $_vm"
  # write conf files.
  
***************
*** 559,562 ****
--- 571,577 ----
  fi
  
+ if [ $_vm = yes ]; then
+   _vmlib='-lXxf86vm'
+ fi
  
  if [ "$_termcap" = "yes" ]; then
***************
*** 595,599 ****
  OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -ffast-math
  # LIBS=-L/usr/lib -L/usr/local/lib $_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib
! X_LIBS=$_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib
  TERMCAP_LIB=$_libtermcap
  XMM_LIBS = $_xmmplibs
--- 610,614 ----
  OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -ffast-math
  # LIBS=-L/usr/lib -L/usr/local/lib $_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib
! X_LIBS=$_x11libdir $_gllib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib
  TERMCAP_LIB=$_libtermcap
  XMM_LIBS = $_xmmplibs
***************
*** 665,668 ****
--- 680,689 ----
  fi
  
+ if [ $_vm = yes ]; then
+  _vm='#define HAVE_XF86VM'
+ else
+  _vm='#undef HAVE_XF86VM'
+ fi
+ 
  # ---
  
***************
*** 768,771 ****
--- 789,793 ----
  $_x11
  $_xv
+ $_vm
  $_gl
  $_dga


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