November 2006 - MPlayer-cvslog - lists.mplayerhq.hu

r21109 - trunk/configure
by diego 20 Nov '06

20 Nov '06

Author: diego Date: Mon Nov 20 17:40:07 2006 New Revision: 21109 Modified: trunk/configure Log: Remove --with-toolamelibdir from help output as well. Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Mon Nov 20 17:40:07 2006 @@ -425,7 +425,6 @@ --with-xvidlibdir=DIR libxvidcore (XviD) in DIR (*) --with-x264libdir=DIR libx264 in DIR --with-livelibdir=DIR LIVE555 Streaming Media in DIR - --with-toolamelibdir=DIR Toolame in DIR --with-xmmsplugindir=DIR XMMS plugins in DIR --with-xmmslibdir=DIR libxmms.so.1 in DIR --with-xvmclib=NAME adapter-specific library name (e.g. XvMCNVIDIA)

1 0

r21108 - trunk/configure
by diego 20 Nov '06

20 Nov '06

Author: diego Date: Mon Nov 20 17:14:47 2006 New Revision: 21108 Modified: trunk/configure Log: Remove --with-toolamelibdir. Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Mon Nov 20 17:14:47 2006 @@ -2161,9 +2161,6 @@ --with-dvdnav-config=*) _dvdnavconfig=`echo $ac_option | cut -d '=' -f 2` ;; - --with-toolamelibdir=*) - _ld_toolame=-L`echo $ac_option | cut -d '=' -f 2 | sed 's,:, -L,g'` - ;; --prefix=*) _prefix=`echo $ac_option | cut -d '=' -f 2` ;; @@ -5555,7 +5552,7 @@ int main(void) { toolame_init(); return 0; } EOF _toolame=no - cc_check $_ld_toolame -ltoolame $_ld_lm && _toolame=yes + cc_check -ltoolame $_ld_lm && _toolame=yes fi if test "$_toolame" = yes ; then _def_toolame='#define HAVE_TOOLAME 1'

3 2

r21107 - in trunk: Makefile configure
by diego 20 Nov '06

20 Nov '06

Author: diego Date: Mon Nov 20 17:14:01 2006 New Revision: 21107 Modified: trunk/Makefile trunk/configure Log: Add support for disabling MPlayer compilation. Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Nov 20 17:14:01 2006 @@ -163,7 +163,9 @@ OBJS_MPLAYER += osdep/mplayer-rc.o endif +ifeq ($(MPLAYER),yes) ALL_PRG = mplayer$(EXESUF) +endif ifeq ($(MENCODER),yes) ALL_PRG += mencoder$(EXESUF) endif Modified: trunk/configure ============================================================================== --- trunk/configure (original) +++ trunk/configure Mon Nov 20 17:14:01 2006 @@ -212,6 +212,7 @@ Optional features: --disable-mencoder disable MEncoder (A/V encoder) compilation [enable] + --disable-mplayer disable MPlayer compilation [enable] --enable-gui enable GMPlayer compilation (GTK+ GUI) [disable] --enable-gtk1 force using GTK 1.2 for the GUI [disable] --enable-largefiles enable support for files > 2GB [disable] @@ -1561,6 +1562,7 @@ _libpostproc_so=auto _libavcodec_mpegaudio_hp=yes _mencoder=yes +_mplayer=yes _x11=auto _xshape=auto _dga=auto # 1 2 no auto @@ -1735,6 +1737,8 @@ # Real 2nd pass --enable-mencoder) _mencoder=yes ;; --disable-mencoder) _mencoder=no ;; + --enable-mplayer) _mplayer=yes ;; + --disable-mplayer) _mplayer=no ;; --enable-dynamic-plugins) _dynamic_plugins=yes ;; --disable-dynamic-plugins) _dynamic_plugins=no ;; --enable-x11) _x11=yes ;; @@ -7465,6 +7469,7 @@ X264 = $_x264 LIBNUT = $_nut CONFIG_DTS = $_libdts +MPLAYER = $_mplayer MENCODER = $_mencoder CDDA = $_cdda BITMAP_FONT = $_bitmap_font

1 0

r21106 - trunk/Makefile
by diego 20 Nov '06

20 Nov '06

Author: diego Date: Mon Nov 20 15:49:08 2006 New Revision: 21106 Modified: trunk/Makefile Log: Oops, the loader stuff needs to be in COMMON_LIBS. Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Nov 20 15:49:08 2006 @@ -106,6 +106,7 @@ libaf \ ifeq ($(WIN32DLL),yes) +COMMON_LIBS += loader/libloader.a loader/dshow/libDS_Filter.a loader/dmo/libDMO_Filter.a PARTS += loader loader/dshow loader/dmo endif ifeq ($(MP3LIB),yes)

1 0

r21070 - trunk/m_config.c
by reimar 20 Nov '06

20 Nov '06

Author: reimar Date: Sun Nov 19 18:41:31 2006 New Revision: 21070 Modified: trunk/m_config.c Log: Fix obvious typo, although the exact effect is still unclear to me, see also bug #593. Patch by jose nazario [jose <at> monkey org]. Modified: trunk/m_config.c ============================================================================== --- trunk/m_config.c (original) +++ trunk/m_config.c Sun Nov 19 18:41:31 2006 @@ -124,7 +124,7 @@ continue; if(co->opt->flags & (M_OPT_GLOBAL|M_OPT_NOSAVE)) continue; - if((co->opt->flags & M_OPT_OLD) && !(co->flags && M_CFG_OPT_SET)) + if((co->opt->flags & M_OPT_OLD) && !(co->flags & M_CFG_OPT_SET)) continue; if(co->flags & M_CFG_OPT_ALIAS) continue;

2 1

r21104 - trunk/Makefile
by diego 20 Nov '06

20 Nov '06

Author: diego Date: Mon Nov 20 15:27:00 2006 New Revision: 21104 Modified: trunk/Makefile Log: Remove MPlayer-specific dependencies from COMMON_DEPS. Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Nov 20 15:27:00 2006 @@ -90,11 +90,8 @@ libmpdemux/libmpdemux.a \ stream/stream.a \ libmpcodecs/libmpcodecs.a \ - libao2/libao2.a \ osdep/libosdep.a \ libswscale/libswscale.a \ - input/libinput.a \ - libvo/libvo.a \ libaf/libaf.a \ OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)

1 0

r21103 - trunk/Makefile
by diego 20 Nov '06

20 Nov '06

Author: diego Date: Mon Nov 20 14:57:12 2006 New Revision: 21103 Modified: trunk/Makefile Log: VIDIX is for MPlayer only. Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Nov 20 14:57:12 2006 @@ -146,7 +146,7 @@ PARTS += tremor endif ifeq ($(VIDIX),yes) -COMMON_DEPS += libdha/libdha.so vidix/libvidix.a +MPLAYER_DEPS += libdha/libdha.so vidix/libvidix.a VO_LIBS += vidix/libvidix.a PARTS += libdha vidix endif

1 0

r21102 - trunk/Makefile
by diego 20 Nov '06

20 Nov '06

Author: diego Date: Mon Nov 20 14:39:36 2006 New Revision: 21102 Modified: trunk/Makefile Log: The GUI is only for MPlayer, not MEncoder. Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Nov 20 14:39:36 2006 @@ -172,7 +172,7 @@ COMMON_LIBS += $(FREETYPE_LIB) endif ifeq ($(GUI),yes) -COMMON_DEPS += Gui/libgui.a +MPLAYER_DEPS += Gui/libgui.a LIBS_MPLAYER += Gui/libgui.a $(GTK_LIBS) PARTS += Gui endif

1 0

r21101 - trunk/Makefile
by diego 20 Nov '06

20 Nov '06

Author: diego Date: Mon Nov 20 14:38:21 2006 New Revision: 21101 Modified: trunk/Makefile Log: Rename variables for consistency. Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Nov 20 14:38:21 2006 @@ -100,8 +100,8 @@ OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) -MPLAYER_DEP = $(OBJS_MPLAYER) $(COMMON_DEPS) -MENCODER_DEP = $(OBJS_MENCODER) $(COMMON_DEPS) libmpcodecs/libmpencoders.a +MPLAYER_DEPS = $(OBJS_MPLAYER) $(COMMON_DEPS) +MENCODER_DEPS = $(OBJS_MENCODER) $(COMMON_DEPS) libmpcodecs/libmpencoders.a PARTS = libmpdemux \ stream \ @@ -177,7 +177,7 @@ PARTS += Gui endif ifeq ($(LIBMENU),yes) -MPLAYER_DEP += libmenu/libmenu.a +MPLAYER_DEPS += libmenu/libmenu.a LIBS_MPLAYER += libmenu/libmenu.a PARTS += libmenu endif @@ -283,10 +283,10 @@ libmenu/libmenu.a: $(MAKE) -C libmenu -mplayer$(EXESUF): $(MPLAYER_DEP) +mplayer$(EXESUF): $(MPLAYER_DEPS) $(CC) -o $@ $(OBJS_MPLAYER) $(LIBS_MPLAYER) -mencoder$(EXESUF): $(MENCODER_DEP) +mencoder$(EXESUF): $(MENCODER_DEPS) $(CC) -o $@ $(OBJS_MENCODER) $(LIBS_MENCODER) osdep/mplayer-rc.o: osdep/mplayer.rc @@ -419,7 +419,7 @@ mplayer.o mencoder.o vobsub.o: version.h # temporary measure to make sure help_mp.h is built. we desperately need correct deps! -$(MPLAYER_DEP) $(MENCODER_DEP): help_mp.h +$(MPLAYER_DEPS) $(MENCODER_DEPS): help_mp.h # # the following lines provide _partial_ dependency information

1 0

r21100 - trunk/Makefile
by diego 20 Nov '06

20 Nov '06

Author: diego Date: Mon Nov 20 14:34:47 2006 New Revision: 21100 Modified: trunk/Makefile Log: Simplify gui and menu libs handling. Modified: trunk/Makefile ============================================================================== --- trunk/Makefile (original) +++ trunk/Makefile Mon Nov 20 14:34:47 2006 @@ -77,8 +77,6 @@ LIBS_MPLAYER = libvo/libvo.a \ libao2/libao2.a \ input/libinput.a \ - $(MENU_LIBS) \ - $(GUI_LIBS) \ $(COMMON_LIBS) \ $(VO_LIBS) \ $(AO_LIBS) \ @@ -175,12 +173,12 @@ endif ifeq ($(GUI),yes) COMMON_DEPS += Gui/libgui.a -GUI_LIBS = Gui/libgui.a $(GTK_LIBS) +LIBS_MPLAYER += Gui/libgui.a $(GTK_LIBS) PARTS += Gui endif ifeq ($(LIBMENU),yes) MPLAYER_DEP += libmenu/libmenu.a -MENU_LIBS = libmenu/libmenu.a +LIBS_MPLAYER += libmenu/libmenu.a PARTS += libmenu endif ifeq ($(TARGET_WIN32),yes)

1 0