[Mplayer-cvslog] CVS: main Makefile,1.14,1.15 cfg-mplayer.h,1.19,1.20 configure,1.20,1.21 help_mp.h,1.6,1.7 lirc_mp.c,1.1.1.1,1.2 mplayer.c,1.64,1.65

Berczi Gabor gabucino at users.sourceforge.net
Sun Apr 15 20:35:19 CEST 2001


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

Modified Files:
	Makefile cfg-mplayer.h configure help_mp.h lirc_mp.c mplayer.c 
Log Message:

Pontscho's mixer, select, and hell-a-lot-of-stuff patch ;)


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** Makefile	2001/04/14 22:37:35	1.14
--- Makefile	2001/04/15 18:35:16	1.15
***************
*** 23,28 ****
  BINDIR = ${prefix}/bin
  # BINDIR = /usr/local/bin
! SRCS = codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c
! OBJS = codec-cfg.o subreader.o linux/getch2.o linux/timer-lx.o linux/shmem.o xa/xa_gsm.o lirc_mp.o cfgparser.o
  CFLAGS = $(OPTFLAGS) -Iloader -Ilibvo # -Wall
  A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3
--- 23,28 ----
  BINDIR = ${prefix}/bin
  # BINDIR = /usr/local/bin
! SRCS = codec-cfg.c subreader.c linux/getch2.c linux/timer-lx.c linux/shmem.c xa/xa_gsm.c lirc_mp.c cfgparser.c mixer.c
! OBJS = codec-cfg.o subreader.o linux/getch2.o linux/timer-lx.o linux/shmem.o xa/xa_gsm.o lirc_mp.o cfgparser.o mixer.o
  CFLAGS = $(OPTFLAGS) -Iloader -Ilibvo # -Wall
  A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3
***************
*** 33,37 ****
  # .PHONY: all clean
  
! all:	version.h $(PRG) $(PRG_CFG)
  # $(PRG_AVIP)
  
--- 33,37 ----
  # .PHONY: all clean
  
! all:	$(PRG) $(PRG_CFG)
  # $(PRG_AVIP)
  
***************
*** 66,69 ****
--- 66,70 ----
  
  $(PRG):	.depend mplayer.o $(OBJS) loader/libloader.a loader/DirectShow/libDS_Filter.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a
+ 	@for a in mp3lib libac3 libmpeg2 opendivx encore libvo loader loader/DirectShow drivers drivers/syncfb ; do $(MAKE) -C $$a; done
  	$(CC) $(CFLAGS) -o $(PRG) mplayer.o $(OBJS) $(XMM_LIBS) $(LIRC_LIBS) $(A_LIBS) -lm $(TERMCAP_LIB) -Lloader -lloader -Lloader/DirectShow -lDS_Filter -ldl -Llibmpeg2 -lmpeg2 -Lopendivx -ldecore $(VO_LIBS) -Lencore -lencore -lpthread -lstdc++
  
***************
*** 77,81 ****
  	$(CC) $(CFLAGS) -o $(PRG_TV) tvision.o $(OBJS) -lm $(TERMCAP_LIB) $(VO_LIBS)
  
! $(PRG_CFG):        .depend codec-cfg.c codec-cfg.h
  	$(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DTESTING
  
--- 78,82 ----
  	$(CC) $(CFLAGS) -o $(PRG_TV) tvision.o $(OBJS) -lm $(TERMCAP_LIB) $(VO_LIBS)
  
! $(PRG_CFG):        codec-cfg.c codec-cfg.h
  	$(CC) $(CFLAGS) -g codec-cfg.c -o $(PRG_CFG) -DTESTING
  
***************
*** 99,112 ****
  	makedepend -f- -- $(CFLAGS) -- mplayer.c mplayerHQ.c aviparse.c tvision.c $(SRCS) 1>.depend 2>/dev/null
  
- # rebuild at every config.h/config.mak change:
- version.h: config.h config.mak Makefile
- 	$(MAKE) distclean
- 	./version.sh
- 
- # rebuild at every CVS update:
- ifneq ($(wildcard CVS/Entries),)
- version.h: CVS/Entries
- endif
- 
  #
  # include dependency files if they exist
--- 100,103 ----
***************
*** 115,117 ****
  include .depend
  endif
- 
--- 106,107 ----

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** cfg-mplayer.h	2001/04/14 21:23:29	1.19
--- cfg-mplayer.h	2001/04/15 18:35:16	1.20
***************
*** 7,83 ****
  extern char *fb_mode_cfgfile;
  extern char *fb_mode_name;
! extern char *monitor_hfreq_str;
! extern char *monitor_vfreq_str;
! extern char *monitor_dotclock_str;
  #endif
  
  struct config conf[]={
! 	/* name, pointer, type, flags, min, max */
! 	{"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0}, /* this must be the first!!! */
! 	{"o", "Option -o has been renamed to -vo (video-out), use -vo !\n",
              CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
! 	{"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0},
! 	{"dsp", &dsp, CONF_TYPE_STRING, 0, 0, 0},
  #ifdef HAVE_FBDEV
! 	{"fb", &fb_dev_name, CONF_TYPE_STRING, 0, 0, 0},
! 	{"fbmode", &fb_mode_name, CONF_TYPE_STRING, 0, 0, 0},
! 	{"fbmodeconfig", &fb_mode_cfgfile, CONF_TYPE_STRING, 0, 0, 0},
! 	{"monitor_hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0},
! 	{"monitor_vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0},
! 	{"monitor_dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0},
  #endif
! 	{"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0},
! 	{"sub", &sub_name, CONF_TYPE_STRING, 0, 0, 0},
! 	{"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0},
! 	{"subfps", &sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0},
! 	{"font", &font_name, CONF_TYPE_STRING, 0, 0, 0},
! 	{"ffactor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0},
! 	{"bg", &play_in_bg, CONF_TYPE_FLAG, 0, 0, 1},
! 	{"nobg", &play_in_bg, CONF_TYPE_FLAG, 0, 1, 0},
! 	{"sb", &seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0},
! //	{"ss", &seek_to_sec, CONF_TYPE_INT, CONF_MIN, 0, 0},
! 	{"sound", &has_audio, CONF_TYPE_FLAG, 0, 0, 1},
! 	{"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0},
! 	{"abs", &audio_buffer_size, CONF_TYPE_INT, CONF_MIN, 0, 0},
! 	{"delay", &audio_delay, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0},
! 	{"bps", &pts_from_bps, CONF_TYPE_FLAG, 0, 0, 1},
! 	{"nobps", &pts_from_bps, CONF_TYPE_FLAG, 0, 1, 0},
! 	{"alsa", &alsa, CONF_TYPE_FLAG, 0, 0, 1},
! 	{"noalsa", &alsa, CONF_TYPE_FLAG, 0, 1, 0},
! 	{"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1},
! 	{"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0},
! 	{"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 256},
! 	{"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 256},
! //	{"auds", &avi_header.audio_codec, CONF_TYPE_STRING, 0, 0, 0},
! //	{"vids", &avi_header.video_codec, CONF_TYPE_STRING, 0, 0, 0},
! 	{"mc", &default_max_pts_correction, CONF_TYPE_FLOAT, CONF_RANGE, 0, 10},
! 	{"fps", &force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0},
! 	{"afm", &audio_format, CONF_TYPE_INT, CONF_RANGE, 1, 6},
! 	{"vcd", &vcd_track, CONF_TYPE_INT, CONF_RANGE, 1, 99},
! 	{"divxq", "Option -divxq has been renamed to -pp (postprocessing), use -pp !\n",
              CONF_TYPE_PRINT, 0, 0, 0},
! 	{"pp", &divx_quality, CONF_TYPE_INT, CONF_RANGE, 0, 63},
! 	{"br", &encode_bitrate, CONF_TYPE_INT, CONF_RANGE, 10000, 10000000},
  
! 	{"x", &screen_size_x, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
! 	{"y", &screen_size_y, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
! 	{"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
          {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1},
          {"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0},
! 	{"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1},
! 	{"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0},
          {"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1},
          {"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0},
!        
          {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32},
! 	
! 	{"idx", &no_index, CONF_TYPE_FLAG, 0, 1, 0},
! 	{"noidx", &no_index, CONF_TYPE_FLAG, 0, 0, 1},
! 	{"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE, 0, 100},
! 	{"v", cfg_inc_verbose, CONF_TYPE_FUNC, 0, 0, 0},
! 	{"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
! 	{"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
! 	{"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
! 	{NULL, NULL, 0, 0, 0, 0}
  };
  
--- 7,81 ----
  extern char *fb_mode_cfgfile;
  extern char *fb_mode_name;
! extern int fb_mode_depth;
  #endif
  
  struct config conf[]={
!         /* name, pointer, type, flags, min, max */
!         {"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0}, /* this must be the first!!! */
!         {"o", "Option -o has been renamed to -vo (video-out), use -vo !\n",
              CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
!         {"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0},
!         {"dsp", &dsp, CONF_TYPE_STRING, 0, 0, 0},
!         {"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0},
!         {"master", &mixer_usemaster, CONF_TYPE_FLAG, 0, 0, 1},
  #ifdef HAVE_FBDEV
!         {"fb", &fb_dev_name, CONF_TYPE_STRING, 0, 0, 0},
!         {"fbmode", &fb_mode_name, CONF_TYPE_STRING, 0, 0, 0},
!         {"fbmodeconfig", &fb_mode_cfgfile, CONF_TYPE_STRING, 0, 0, 0},
!         {"fbdepth", &fb_mode_depth, CONF_TYPE_INT, CONF_RANGE, 15, 32},
  #endif
!         {"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0},
!         {"sub", &sub_name, CONF_TYPE_STRING, 0, 0, 0},
!         {"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0},
!         {"subfps", &sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0},
!         {"font", &font_name, CONF_TYPE_STRING, 0, 0, 0},
!         {"ffactor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.0},
!         {"bg", &play_in_bg, CONF_TYPE_FLAG, 0, 0, 1},
!         {"nobg", &play_in_bg, CONF_TYPE_FLAG, 0, 1, 0},
!         {"sb", &seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0},
! //      {"ss", &seek_to_sec, CONF_TYPE_INT, CONF_MIN, 0, 0},
!         {"sound", &has_audio, CONF_TYPE_FLAG, 0, 0, 1},
!         {"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0},
!         {"abs", &audio_buffer_size, CONF_TYPE_INT, CONF_MIN, 0, 0},
!         {"delay", &audio_delay, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0},
!         {"bps", &pts_from_bps, CONF_TYPE_FLAG, 0, 0, 1},
!         {"nobps", &pts_from_bps, CONF_TYPE_FLAG, 0, 1, 0},
!         {"alsa", &alsa, CONF_TYPE_FLAG, 0, 0, 1},
!         {"noalsa", &alsa, CONF_TYPE_FLAG, 0, 1, 0},
!         {"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1},
!         {"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0},
!         {"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 256},
!         {"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 256},
! //      {"auds", &avi_header.audio_codec, CONF_TYPE_STRING, 0, 0, 0},
! //      {"vids", &avi_header.video_codec, CONF_TYPE_STRING, 0, 0, 0},
!         {"mc", &default_max_pts_correction, CONF_TYPE_FLOAT, CONF_RANGE, 0, 10},
!         {"fps", &force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0},
!         {"afm", &audio_format, CONF_TYPE_INT, CONF_RANGE, 1, 6},
!         {"vcd", &vcd_track, CONF_TYPE_INT, CONF_RANGE, 1, 99},
!         {"divxq", "Option -divxq has been renamed to -pp (postprocessing), use -pp !\n",
              CONF_TYPE_PRINT, 0, 0, 0},
!         {"pp", &divx_quality, CONF_TYPE_INT, CONF_RANGE, 0, 63},
!         {"br", &encode_bitrate, CONF_TYPE_INT, CONF_RANGE, 10000, 10000000},
  
!         {"x", &screen_size_x, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
!         {"y", &screen_size_y, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
!         {"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
          {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1},
          {"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0},
!         {"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1},
!         {"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0},
          {"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1},
          {"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0},
! 
          {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32},
! 
!         {"idx", &no_index, CONF_TYPE_FLAG, 0, 1, 0},
!         {"noidx", &no_index, CONF_TYPE_FLAG, 0, 0, 1},
!         {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE, 0, 100},
!         {"v", cfg_inc_verbose, CONF_TYPE_FUNC, 0, 0, 0},
!         {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
!         {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
!         {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
!         {NULL, NULL, 0, 0, 0, 0}
  };
  

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -r1.20 -r1.21
*** configure	2001/04/14 21:16:23	1.20
--- configure	2001/04/15 18:35:16	1.21
***************
*** 7,10 ****
--- 7,14 ----
  # Changes in reversed order:
  #
+ # 2001/04/15 by Pontscho
+ #  - added --disable-select option
+ #  - added X11DIR variable in config.mak and fix syncfb Makefile -L/usr/X11/lib bug 
+ #
  # 2001/03/24 by Mike Graffam:
  #  - added autodetect code for XF86VidMode, along with explicit --enable-vm
***************
*** 90,94 ****
  	--enable-termcap	use termcap database for key codes
  	--enable-xmmp	        use XMMP audio drivers
! 	--enable-lirc	        enable LIRC (remote control) support
  
          --with-x11libdir=DIR    X library files are in DIR
--- 94,101 ----
  	--enable-termcap	use termcap database for key codes
  	--enable-xmmp	        use XMMP audio drivers
! 	--enable-lirc	        enable LIRC ( remote control ) support
! 	
! 	--disable-select        disable audio select() support ( for example required this
! 	                        option ALSA or Vortex2 driver )
  
          --with-x11libdir=DIR    X library files are in DIR
***************
*** 131,145 ****
  
  _cc=gcc
- _x11=auto
  
- _x11libdir=
- if [ -e /usr/X11R6 ]; then
-  _x11libdir=-L/usr/X11R6/lib
- else
-  if [ -e /usr/X11 ]; then
-   _x11libdir=-L/usr/X11/lib
-  fi
- fi
- 
  for ac_option
  do
--- 138,142 ----
***************
*** 148,160 ****
          _cc=`echo $ac_option | cut -d '=' -f 2`
          ;;
-   --with-x11libdir=*)
-         _x11libdir=-L`echo $ac_option | cut -d '=' -f 2`
-         ;;
-   --enable-x11)
-         _x11=yes
-         ;;
-   --disable-x11)
-         _x11=no
-         ;;
   esac
  done
--- 145,148 ----
***************
*** 183,186 ****
--- 171,175 ----
  _xv=no
  _vm=no
+ _x11=no
  _3dfx=no
  _syncfb=no
***************
*** 191,195 ****
  _dga2=no
  _svga=no
! _fbdev=yes
  _lirc=no
  _xdpms=no
--- 180,184 ----
  _dga2=no
  _svga=no
! _fbdev=no
  _lirc=no
  _xdpms=no
***************
*** 200,205 ****
  _gllib=
  _sdllib=
- _xvlib=
  _x11lib=
  
  for i in `echo $pparam`; do
--- 189,197 ----
  _gllib=
  _sdllib=
  _x11lib=
+ _xvlib=
+ _xlibdir=
+ 
+ _select='#define HAVE_AUDIO_SELECT'
  
  for i in `echo $pparam`; do
***************
*** 238,241 ****
--- 230,240 ----
  done
  
+ if [ -e /usr/X11R6 ]; then
+  _x11libdir=-L/usr/X11R6/lib
+ else
+  if [ -e /usr/X11 ]; then
+   _x11libdir=-L/usr/X11/lib
+  fi
+ fi
  
  _win32libdirnotify=no
***************
*** 377,383 ****
  
  
! $_cc $TMPC -o $TMPO -lvgagl -lvga &> /dev/null && _svga=yes
  
! $_cc $TMPC -o $TMPO -lpthread &> /dev/null || \
   { echo "Lib pthread not found."; rm -f $TMPC $TMPO ; exit 1; }
  
--- 376,388 ----
  
  
! # check GL & X11 & Xext & Xv & SDL & termcap libs
  
! $_cc $TMPC -o $TMPO $_x11libdir/ -lGL &> /dev/null && _gl=yes
! $_cc $TMPC -o $TMPO $_x11libdir/ -lXxf86vm &> /dev/null && _vm=yes
! $_cc $TMPC -o $TMPO -lvgagl -lvga &> /dev/null && _svga=yes
! $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext &> /dev/null && _x11=yes
! $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXdpms &> /dev/null && _xdpms=yes
! $_cc $TMPC -o $TMPO $_x11libdir -lXv &> /dev/null && _xv=yes
! $_cc $TMPC -o $TMPO $_x11libdir -L/usr/local/lib/ -lpthread &> /dev/null || \
   { echo "Lib pthread not found."; rm -f $TMPC $TMPO ; exit 1; }
  
***************
*** 385,389 ****
  # this is very buggy & experimental code, use it only if you really need it!!
  _have_sdl=no
! $_cc $TMPC -o $TMPO -L/usr/local/lib/ -lSDL -lpthread &> /dev/null && _have_sdl=yes
  
  _termcap=no
--- 390,394 ----
  # this is very buggy & experimental code, use it only if you really need it!!
  _have_sdl=no
! $_cc $TMPC -o $TMPO $_x11libdir -L/usr/local/lib/ -lSDL -lpthread &> /dev/null && _have_sdl=yes
  
  _termcap=no
***************
*** 392,418 ****
  _binutils=no
  as libac3/downmix/downmix_i386.S -o $TMPO &> /dev/null && _binutils=yes
- 
- # ----------- Check X11 and related libs (GL, Xxf86vm, Xv, DGA) --------------
- 
- if [ $_x11 = auto ]; then
-   _x11=no
-   $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext &> /dev/null && _x11=yes
- fi
- 
- if [ $_x11 = yes ]; then
- 
- $_cc $TMPC -o $TMPO $_x11libdir -lX11 -lXext -lXdpms &> /dev/null && _xdpms=yes
- $_cc $TMPC -o $TMPO $_x11libdir -lXv &> /dev/null && _xv=yes
- 
- $_cc $TMPC -o $TMPO $_x11libdir -lGL &> /dev/null && _gl=yes
- 
- cat > $TMPC << EOF
- #include <GL/gl.h>
- int main( void ) { return 0; }
- EOF
- $_cc $TMPC -o $TMPO $_x11libdir -lGL &> /dev/null || \
-  { _gl=no; echo "GL includes not found!";}
  
! $_cc $TMPC -o $TMPO $_x11libdir -lXxf86vm &> /dev/null && _vm=yes
  
  cat > $TMPC << EOF
--- 397,402 ----
  _binutils=no
  as libac3/downmix/downmix_i386.S -o $TMPO &> /dev/null && _binutils=yes
  
! # LGB: Check DGA
  
  cat > $TMPC << EOF
***************
*** 423,426 ****
--- 407,411 ----
  EOF
  
+ _dga=no
  $_cc $TMPC -o $TMPO -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lXxf86dga -lXxf86vm &> /dev/null && _dga=yes
  # Note: the -lXxf86vm library is the VideoMode extension and though it's
***************
*** 430,433 ****
--- 415,420 ----
  # If you run into problems, remove '-lXxf86vm'.
  
+ # ---
+ 
  # Check if DGA is 2.0 or greater
  cat > $TMPC << EOF
***************
*** 441,448 ****
  $_cc $TMPC -o $TMPO -L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lXxf86dga -lXxf86vm &> /dev/null && _dga2=yes
  
- fi
  
  rm -f $TMPC $TMPO
  
  # ---
  
--- 428,449 ----
  $_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; }
+ EOF
+ 
+ $_cc $TMPC -o $TMPO $_x11libdir/ -lGL &> /dev/null || \
+  { _gl=no; echo "GL includes not found!";}
+ 
  rm -f $TMPC $TMPO
  
+ 
+ if [ $_x11 = 'yes' ]; then
+  if [ $_mga = 'yes' ]; then
+   _xmga=yes
+  fi
+ fi
+ 
  # ---
  
***************
*** 494,497 ****
--- 495,501 ----
          _vm=yes
          ;;
+   --enable-x11)
+         _x11=yes
+         ;;
    --enable-3dfx)
          _3dfx=yes
***************
*** 515,518 ****
--- 519,525 ----
  	_lirc=yes
  	;;
+   --enable-select)
+         _select='#define HAVE_AUDIO_SELECT'
+ 	;;
    --disable-sse)
          _sse=no
***************
*** 546,549 ****
--- 553,559 ----
          _vm=no
          ;;
+   --disable-x11)
+         _x11=no
+         ;;
    --disable-mlib)
  	_mlib=no
***************
*** 564,567 ****
--- 574,583 ----
  	_termcap=no
  	;;
+   --disable-select)
+         _select='#undef HAVE_AUDIO_SELECT'
+ 	;;
+   --with-x11libdir=*)
+         _x11libdir=-L`echo $ac_option | cut -d '=' -f 2`
+         ;;
    --with-win32libdir=*)
          _win32libdir=`echo $ac_option | cut -d '=' -f 2`
***************
*** 574,579 ****
  	_y=`echo $ac_option | cut -d '=' -f 2`
  	;;
-   --with-x11libdir=*)
-         ;;
    --cc=*)
  	;;
--- 590,593 ----
***************
*** 581,590 ****
  done
  
- if [ $_x11 = 'yes' ]; then
-  if [ $_mga = 'yes' ]; then
-   _xmga=yes
-  fi
- fi
- 
  # to screen.
  echo "Using C compiler: $_cc"
--- 595,598 ----
***************
*** 676,683 ****
  AR=ar
  CC=$_cc
  # OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -fomit-frame-pointer -ffast-math
  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 $_svgalib
  TERMCAP_LIB=$_libtermcap
  XMM_LIBS = $_xmmplibs
--- 684,693 ----
  AR=ar
  CC=$_cc
+ X11DIR=$_x11libdir
  # OPTFLAGS=-O4 -march=$proc -mcpu=$proc -pipe -fomit-frame-pointer -ffast-math
  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 $_svgalib
! X_LIBS=\$(X11DIR) $_gllib $_sdllib $_dgalib $_x11lib $_xvlib $_vmlib $_svgalib
  TERMCAP_LIB=$_libtermcap
  XMM_LIBS = $_xmmplibs
***************
*** 838,842 ****
     If you have kernel Oops, player hangups, or just no audio, you should
     try to recompile MPlayer with this option disabled! */
! #define HAVE_AUDIO_SELECT
  
  /* You have a choice for MP3 decoding: mp3lib(mpg123) or Win32(l3codeca.acm)
--- 848,852 ----
     If you have kernel Oops, player hangups, or just no audio, you should
     try to recompile MPlayer with this option disabled! */
! $_select
  
  /* You have a choice for MP3 decoding: mp3lib(mpg123) or Win32(l3codeca.acm)

Index: help_mp.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** help_mp.h	2001/04/14 22:50:25	1.6
--- help_mp.h	2001/04/15 18:35:17	1.7
***************
*** 1,9 ****
  static char* banner_text=
  "\n\n"
! "MPlayer " VERSION "  (C) 2000-2001 Arpad Gereoffy <arpi at thot.banki.hu>\n"
  "\n";
  
  static char* help_text=
! "\nUsage:   mplayer [options] [path/]name\n"
  "\n"
  "  Options:\n"
--- 1,9 ----
  static char* banner_text=
  "\n\n"
! "MPlayer " VERSION "       (C) 2000-2001 Arpad Gereoffy <arpi at esp-team.scene.hu>\n"
  "\n";
  
  static char* help_text=
! "Usage:   mplayer [options] [path/]name\n"
  "\n"
  "  Options:\n"
***************
*** 41,43 ****
--- 41,45 ----
  "    + or -          adjust audio delay by +/- 0.1 second\n"
  "    o               toggle OSD:  none / seek / seek+timer\n"
+ "    * or /          increase or decrease volume\n"
+ "    m or c          use mixer master or pcm channel\n"
  "\n";

Index: lirc_mp.c
===================================================================
RCS file: /cvsroot/mplayer/main/lirc_mp.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -r1.1.1.1 -r1.2
*** lirc_mp.c	2001/02/24 20:28:35	1.1.1.1
--- lirc_mp.c	2001/04/15 18:35:17	1.2
***************
*** 96,100 ****
      {"RWND" , KEY_LEFT},
      {"FRWND" , KEY_DOWN},
!     {"PAUSE", 'p'}    
    };
         
--- 96,104 ----
      {"RWND" , KEY_LEFT},
      {"FRWND" , KEY_DOWN},
!     {"PAUSE", 'p'},
!     {"INCVOL", '*'},
!     {"DECVOL", '/'},
!     {"MASTER", 'm'},
!     {"PCM", 'c'}
    };
         

Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** mplayer.c	2001/04/15 14:46:07	1.64
--- mplayer.c	2001/04/15 18:35:17	1.65
***************
*** 89,93 ****
  
  //**************************************************************************//
! //             .SUB 
  //**************************************************************************//
  
--- 89,93 ----
  
  //**************************************************************************//
! //             .SUB
  //**************************************************************************//
[...1158 lines suppressed...]
            if (d_video->pts < d_audio->pts){
! 
            } else {
              while(d_video->pts > d_audio->pts){
!               switch(has_audio){
                  case 1: MP3_DecodeFrame(NULL,-2);break; // skip MPEG frame
                  case 3: sh_audio->ac3_frame=ac3_decode_frame();break; // skip AC3 frame
***************
*** 1870,1874 ****
  //  for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0;
  //  vo_osd_text=osd_text_buffer;
!   
    // find sub
    if(subtitles){
--- 1854,1858 ----
  //  for(i=1;i<=11;i++) osd_text_buffer[10+i]=i;osd_text_buffer[10+i]=0;
  //  vo_osd_text=osd_text_buffer;
! 
    // find sub
    if(subtitles){


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



More information about the MPlayer-cvslog mailing list