[Mplayer-cvslog] CVS: main Makefile,1.102,1.103 configure2,1.251,1.252
pl
pl at mplayer.dev.hu
Sat Nov 17 12:26:28 CET 2001
Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv11825
Modified Files:
Makefile configure2
Log Message:
last part of changes since around configure 230 applied
(lirc in autodetect, VO2 support)
blocks sorted for ao/vo (video/video+audio/audio)
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/Makefile,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- Makefile 16 Nov 2001 20:54:53 -0000 1.102
+++ Makefile 17 Nov 2001 11:26:26 -0000 1.103
@@ -26,9 +26,17 @@
SRCS_MPLAYER = mplayer.c ima4.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c find_sub.c dec_audio.c dec_video.c msvidc.c codec-cfg.c subreader.c lirc_mp.c cfgparser.c mixer.c spudec.c my_profile.c
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
+
CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(EXTRA_INC) $(MADLIB_INC) # -Wall
-A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB) $(MADLIB_LIB) $(SGI_AUDIO_LIB)
VO_LIBS = -Llibvo -lvo $(MLIB_LIB) $(X_LIBS)
+ifeq ($(VO2),yes)
+CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo2 $(EXTRA_INC) $(MADLIB_INC) # -Wall
+VO_LIBS = -Llibvo2 -lvo2 $(MLIB_LIB) $(X_LIBS)
+endif
+
+A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB) $(MADLIB_LIB) $(SGI_AUDIO_LIB)
+
+
OSDEP_LIBS = -Llinux -losdep
PP_LIBS = -Lpostproc -lpostproc
XA_LIBS = -Lxa -lxa
@@ -37,6 +45,10 @@
# OBJS = $(OBJS_MENCODER) $(OBJS_MPLAYER)
PARTS = libmpdemux mp3lib libac3 libmpeg2 opendivx libavcodec libvo libao2 drivers drivers/syncfb linux postproc xa
+ifeq ($(VO2),yes)
+PARTS = libmpdemux mp3lib libac3 libmpeg2 opendivx libavcodec libvo2 libao2 drivers drivers/syncfb linux postproc xa
+endif
+
ifeq ($(GUI),yes)
PARTS += Gui
@@ -68,6 +80,9 @@
$(CC) -c $(CFLAGS) -o $@ $<
COMMONLIBS = libmpdemux/libmpdemux.a libvo/libvo.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
+ifeq ($(VO2),yes)
+COMMONLIBS = libmpdemux/libmpdemux.a libvo2/libvo2.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
+endif
loader/libloader.a:
$(MAKE) -C loader
@@ -86,6 +101,9 @@
libvo/libvo.a:
$(MAKE) -C libvo
+
+libvo2/libvo2.a:
+ $(MAKE) -C libvo2
libao2/libao2.a:
$(MAKE) -C libao2
Index: configure2
===================================================================
RCS file: /cvsroot/mplayer/main/configure2,v
retrieving revision 1.251
retrieving revision 1.252
diff -u -r1.251 -r1.252
--- configure2 17 Nov 2001 09:57:54 -0000 1.251
+++ configure2 17 Nov 2001 11:26:26 -0000 1.252
@@ -18,9 +18,9 @@
# GOTCHAS:
# - config files are currently:
# config2.h config2.mak libvo/config2.mak libao2/config2.mak
-# Gui/config2.mak
+# Gui/config2.mak libvo2/config2.mak
# - removed xmmp/esd
-# - removec dvbincdir/madincdir/cssincdir: add them to extraincdir
+# - removed dvbincdir/madincdir/cssincdir: add them to extraincdir
#
#############################################################################
@@ -95,7 +95,7 @@
Optional features:
--enable-largefiles enable support for files >2^32 bytes long [disable]
--enable-termcap use termcap database for key codes [autodetect]
- --enable-lirc enable LIRC (remote control) support [disable]
+ --enable-lirc enable LIRC (remote control) support [autodetect]
--enable-gui enable GUI [disable]
--enable-tv enable TV Interface (tv/dvb grabbers) [disable]
--disable-win32 disable Win32 DLL support [autodetect]
@@ -646,21 +646,21 @@
_sgiaudio=auto
_sunaudio=auto
_alsa=auto
-
_fastmemcpy=yes
_win32=auto
- _dshow=auto
+_dshow=auto
_def_select='#define HAVE_AUDIO_SELECT'
-
_tv=no
_streaming=no
_divx4linux=auto
-_lirc=no
+_lirc=auto
_gui=no
_termcap=auto
_3dfx=no
_tdfxfb=no
+_vo2=no
+
_x=1
_y=1
_language=en
@@ -738,8 +738,6 @@
--disable-tv) _tv=no ;;
--enable-fastmemcpy) _fastmemcpy=yes ;;
--disable-fastmemcpy) _fastmemcpy=no ;;
- --enable-tv) _tv=yes ;;
- --disable-tv) _tv=no ;;
--enable-streaming) _streaming=yes ;;
--disable-streaming) _streaming=no ;;
--enable-divx4linux) _divx4linux=yes ;;
@@ -757,6 +755,9 @@
--enable-mtrr) _mtrr=yes ;;
--disable-mtrr) _mtrr=no ;;
+ --enable-vo2) _vo2=yes ;;
+ --disable-vo2) _vo2=no ;;
+
--enable-select) _def_select='#define HAVE_AUDIO_SELECT' ;;
--disable-select) _def_select='#undef HAVE_AUDIO_SELECT' ;;
@@ -851,6 +852,7 @@
_datadir=`echo $ac_option | cut -d '=' -f 2`
;;
+
*)
echo "Unknown parameter: $ac_option"
;;
@@ -1200,6 +1202,10 @@
_ld_x11="-L$_x11libdir -lX11 -lXext"
+#########
+# VIDEO #
+#########
+
echocheck "X11"
if test "$_x11" = auto ; then
cat > $TMPC <<EOF
@@ -1366,46 +1372,6 @@
echores "$_dga2"
-echocheck "SDL"
-if test -z "$_sdlconfig" ; then
- if ( sdl-config --version ) >/dev/null 2>&1 ; then
- _sdlconfig="sdl-config"
- elif ( sdl11-config --version ) >/dev/null 2>&1 ; then
- _sdlconfig="sdl11-config"
- else
- _sdlconfig=false
- fi
-fi
-if test "$_sdl" = auto || test "$_sdl" = yes ; then
- _sdl=no
- if "$_sdlconfig" --version >/dev/null 2>&1 ; then
- if cc_check `$_sdlconfig --cflags` `$_sdlconfig --libs` ; then
- _sdlversion=`$_sdlconfig --version | sed 's/[^0-9]//g'`
- if test "$_sdlversion" -gt 116 ; then
- if test "$_sdlversion" -lt 121 ; then
- _def_sdlbuggy='#define BUGGY_SDL'
- else
- _def_sdlbuggy='#undef BUGGY_SDL'
- fi
- _sdl=yes
- else
- _sdl=outdated
- fi
- fi
- fi
-fi
-if test "$_sdl" = yes ; then
- _def_sdl='#define HAVE_SDL 1'
- _ld_sdl=`$_sdlconfig --libs`
- _inc_sdl=`$_sdlconfig --cflags`
- _vosrc="$_vosrc vo_sdl.c"
- _aosrc="$_aosrc ao_sdl.c"
-else
- _def_sdl='#undef HAVE_SDL'
-fi
-echores "$_sdl (with $_sdlconfig)"
-
-
echocheck "OpenGL"
if test "$_gl" = auto ; then
cat > $TMPC << EOF
@@ -1557,6 +1523,73 @@
echores "$_dvb"
+echocheck "PNG support"
+if test "$_png" = auto ; then
+ _png=no
+ if irix ; then
+ # Don't check for -lpng on irix since it has its own libpng
+ # incompatible with the GNU libpng
+ echores "disabled on irix (not GNU libpng)"
+ else
+ cc_check -lpng -lz -lm && _png=yes
+ echores yes
+ fi
+else
+ echores "$_png"
+fi
+if test "$_png" = yes ; then
+ _def_png='#define HAVE_PNG 1'
+ _ld_png='-lpng -lz'
+ _vosrc="$_vosrc vo_png.c"
+else
+ _def_png='#undef HAVE_PNG'
+fi
+
+
+#################
+# VIDEO + AUDIO #
+#################
+
+
+echocheck "SDL"
+if test -z "$_sdlconfig" ; then
+ if ( sdl-config --version ) >/dev/null 2>&1 ; then
+ _sdlconfig="sdl-config"
+ elif ( sdl11-config --version ) >/dev/null 2>&1 ; then
+ _sdlconfig="sdl11-config"
+ else
+ _sdlconfig=false
+ fi
+fi
+if test "$_sdl" = auto || test "$_sdl" = yes ; then
+ _sdl=no
+ if "$_sdlconfig" --version >/dev/null 2>&1 ; then
+ if cc_check `$_sdlconfig --cflags` `$_sdlconfig --libs` ; then
+ _sdlversion=`$_sdlconfig --version | sed 's/[^0-9]//g'`
+ if test "$_sdlversion" -gt 116 ; then
+ if test "$_sdlversion" -lt 121 ; then
+ _def_sdlbuggy='#define BUGGY_SDL'
+ else
+ _def_sdlbuggy='#undef BUGGY_SDL'
+ fi
+ _sdl=yes
+ else
+ _sdl=outdated
+ fi
+ fi
+ fi
+fi
+if test "$_sdl" = yes ; then
+ _def_sdl='#define HAVE_SDL 1'
+ _ld_sdl=`$_sdlconfig --libs`
+ _inc_sdl=`$_sdlconfig --cflags`
+ _vosrc="$_vosrc vo_sdl.c"
+ _aosrc="$_aosrc ao_sdl.c"
+else
+ _def_sdl='#undef HAVE_SDL'
+fi
+echores "$_sdl (with $_sdlconfig)"
+
echocheck "DXR3/H+"
if test "$_dxr3" = auto ; then
cat > $TMPC << EOF
@@ -1577,6 +1610,11 @@
echores "$_dxr3"
+#########
+# AUDIO #
+#########
+
+
echocheck "OSS Audio"
if test "$_ossaudio" = auto ; then
cat > $TMPC << EOF
@@ -1750,29 +1788,6 @@
echores "$_zlib"
-echocheck "PNG support"
-if test "$_png" = auto ; then
- _png=no
- if irix ; then
- # Don't check for -lpng on irix since it has its own libpng
- # incompatible with the GNU libpng
- echores "disabled on irix (not GNU libpng)"
- else
- cc_check -lpng -lz -lm && _png=yes
- echores yes
- fi
-else
- echores "$_png"
-fi
-if test "$_png" = yes ; then
- _def_png='#define HAVE_PNG 1'
- _ld_png='-lpng -lz'
- _vosrc="$_vosrc vo_png.c"
-else
- _def_png='#undef HAVE_PNG'
-fi
-
-
echocheck "mad support"
if test "$_mad" = auto ; then
_mad=no
@@ -2045,6 +2060,10 @@
echocheck "lirc"
+if test "$_lirc" = auto ; then
+ _lirc=no
+ test -c /dev/lirc && _lirc=yes
+fi
if test "$_lirc" = yes ; then
_def_lirc='#define HAVE_LIRC 1'
_ld_lirc='-llirc_client'
@@ -2255,6 +2274,8 @@
STREAMING = $_streaming
+VO2 = $_vo2
+
X11_INC = $_inc_x11
X11DIR = $_ld_x11
X_LIBS = $_ld_x11 $_ld_extra $_ld_gl $_ld_ggi $_ld_dxr3 $_ld_sdl $_ld_dga $_ld_xv $_ld_vm $_ld_svga $_ld_png $_ld_sock $_ld_aa $_ld_vorbis $_ld_xinerama $_ld_mad $_ld_z
@@ -2552,6 +2573,16 @@
include ../config.mak
OPTIONAL_SRCS = $_vosrc
OPTIONAL_OBJS = $_voobj
+EOF
+
+#############################################################################
+
+echo "Creating libvo2/config2.mak"
+_vo2obj=`echo $_vo2src | sed -e 's/\.c/\.o/g'`
+cat > libvo2/config2.mak << EOF
+include ../config.mak
+OPTIONAL_SRCS = $_vo2src
+OPTIONAL_OBJS = $_vo2obj
EOF
#############################################################################
More information about the MPlayer-cvslog
mailing list