[Mplayer-cvslog] CVS: main Makefile,1.16,1.17 cfg-mplayer.h,1.21,1.22 configure,1.21,1.22 help_mp.h,1.7,1.8 lirc_mp.c,1.2,1.3 mplayer.c,1.67,1.68
GEREOFFY
arpi_esp at users.sourceforge.net
Sun Apr 15 22:31:59 CEST 2001
Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv31229
Modified Files:
Makefile cfg-mplayer.h configure help_mp.h lirc_mp.c mplayer.c
Log Message:
qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** Makefile 2001/04/15 19:24:30 1.16
--- Makefile 2001/04/15 20:31:57 1.17
***************
*** 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
--- 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
***************
*** 33,37 ****
# .PHONY: all clean
! all: $(PRG) $(PRG_CFG)
# $(PRG_AVIP)
--- 33,37 ----
# .PHONY: all clean
! all: version.h $(PRG) $(PRG_CFG)
# $(PRG_AVIP)
***************
*** 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 ; 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++
--- 66,69 ----
***************
*** 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
--- 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
***************
*** 100,103 ****
--- 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
***************
*** 106,107 ****
--- 115,117 ----
include .depend
endif
+
Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** cfg-mplayer.h 2001/04/15 19:26:33 1.21
--- cfg-mplayer.h 2001/04/15 20:31:57 1.22
***************
*** 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}
};
--- 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}
};
Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** configure 2001/04/15 18:35:16 1.21
--- configure 2001/04/15 20:31:57 1.22
***************
*** 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
--- 7,10 ----
***************
*** 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
--- 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
***************
*** 138,142 ****
--- 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
***************
*** 145,148 ****
--- 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
***************
*** 171,175 ****
_xv=no
_vm=no
- _x11=no
_3dfx=no
_syncfb=no
--- 183,186 ----
***************
*** 180,184 ****
_dga2=no
_svga=no
! _fbdev=no
_lirc=no
_xdpms=no
--- 191,195 ----
_dga2=no
_svga=no
! _fbdev=yes
_lirc=no
_xdpms=no
***************
*** 189,197 ****
_gllib=
_sdllib=
- _x11lib=
_xvlib=
! _xlibdir=
!
! _select='#define HAVE_AUDIO_SELECT'
for i in `echo $pparam`; do
--- 200,205 ----
_gllib=
_sdllib=
_xvlib=
! _x11lib=
for i in `echo $pparam`; do
***************
*** 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
--- 238,241 ----
***************
*** 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; }
--- 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; }
***************
*** 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
--- 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
***************
*** 397,402 ****
_binutils=no
as libac3/downmix/downmix_i386.S -o $TMPO &> /dev/null && _binutils=yes
! # LGB: Check DGA
cat > $TMPC << EOF
--- 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
***************
*** 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
--- 423,426 ----
***************
*** 415,420 ****
# If you run into problems, remove '-lXxf86vm'.
- # ---
-
# Check if DGA is 2.0 or greater
cat > $TMPC << EOF
--- 430,433 ----
***************
*** 427,449 ****
_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; }
! 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
-
# ---
--- 440,448 ----
_dga2=no
$_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
# ---
***************
*** 495,501 ****
_vm=yes
;;
- --enable-x11)
- _x11=yes
- ;;
--enable-3dfx)
_3dfx=yes
--- 494,497 ----
***************
*** 519,525 ****
_lirc=yes
;;
- --enable-select)
- _select='#define HAVE_AUDIO_SELECT'
- ;;
--disable-sse)
_sse=no
--- 515,518 ----
***************
*** 553,559 ****
_vm=no
;;
- --disable-x11)
- _x11=no
- ;;
--disable-mlib)
_mlib=no
--- 546,549 ----
***************
*** 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`
--- 564,567 ----
***************
*** 590,593 ****
--- 574,579 ----
_y=`echo $ac_option | cut -d '=' -f 2`
;;
+ --with-x11libdir=*)
+ ;;
--cc=*)
;;
***************
*** 595,598 ****
--- 581,590 ----
done
+ if [ $_x11 = 'yes' ]; then
+ if [ $_mga = 'yes' ]; then
+ _xmga=yes
+ fi
+ fi
+
# to screen.
echo "Using C compiler: $_cc"
***************
*** 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
--- 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
***************
*** 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)
--- 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)
Index: help_mp.h
===================================================================
RCS file: /cvsroot/mplayer/main/help_mp.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** help_mp.h 2001/04/15 18:35:17 1.7
--- help_mp.h 2001/04/15 20:31:57 1.8
***************
*** 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"
--- 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"
***************
*** 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";
--- 41,43 ----
Index: lirc_mp.c
===================================================================
RCS file: /cvsroot/mplayer/main/lirc_mp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** lirc_mp.c 2001/04/15 18:35:17 1.2
--- lirc_mp.c 2001/04/15 20:31:57 1.3
***************
*** 96,104 ****
{"RWND" , KEY_LEFT},
{"FRWND" , KEY_DOWN},
! {"PAUSE", 'p'},
! {"INCVOL", '*'},
! {"DECVOL", '/'},
! {"MASTER", 'm'},
! {"PCM", 'c'}
};
--- 96,100 ----
{"RWND" , KEY_LEFT},
{"FRWND" , KEY_DOWN},
! {"PAUSE", 'p'}
};
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -C2 -r1.67 -r1.68
*** mplayer.c 2001/04/15 19:17:10 1.67
--- mplayer.c 2001/04/15 20:31:57 1.68
***************
*** 33,37 ****
#include "cfgparser.h"
- #include "mixer.h"
#include "cfg-mplayer-def.h"
--- 33,36 ----
***************
*** 1579,1594 ****
case 'o': // toggle OSD
osd_level=(osd_level+1)%3;
- break;
- case '*':
- mixer_incvolume();
- break;
- case '/':
- mixer_decvolume();
- break;
- case 'm':
- mixer_usemaster=1;
- break;
- case 'c':
- mixer_usemaster=0;
break;
}
--- 1578,1581 ----
_______________________________________________
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