[MPlayer-cvslog] r22366 - in trunk: configure osdep/Makefile

[Reimar Döffinger]

Hello,
On Tue, Feb 27, 2007 at 06:13:17PM +0100, diego wrote:
> Author: diego
> Date: Tue Feb 27 18:13:17 2007
> New Revision: 22366
> 
> Modified:
>    trunk/configure
>    trunk/osdep/Makefile
> 
> Log:
> Move the decision about stream cache compilation to configure.

That is nonsense, since that's not at all what this change does. It
disables cache unconditionally on MinGW whereas it was enabled
unconditionally before.

> Modified: trunk/configure
> ==============================================================================
> --- trunk/configure	(original)
> +++ trunk/configure	Tue Feb 27 18:13:17 2007
> @@ -643,6 +643,7 @@ _ass=auto
>  _rpath=no
>  _asmalign_pot=auto
>  _color_console=no
> +_stream_cache=yes
>  for ac_option do
>    case "$ac_option" in
>    --help|-help|-h)
> @@ -1286,6 +1287,10 @@ if win32 ; then
>    _ld_extra="$_ld_extra -lwinmm"
>  fi
>  
> +if mingw32 ; then
> +  _stream_cache=no
> +fi
> +
>  # Check how to call 'head' and 'tail'. Newer versions spit out warnings
>  # if used as 'head -1' instead of 'head -n 1', but older versions don't
>  # know about '-n'.
> @@ -7458,7 +7463,7 @@ MPLAYER_NETWORK = $_network
>  FTP = $_ftp
>  STREAMING_LIVE555 = $_live
>  VSTREAM = $_vstream
> -STREAM_CACHE = yes
> +STREAM_CACHE = $_stream_cache
>  DVBIN = $_dvbin
>  VIDIX = $_vidix_internal
>  EXTERNAL_VIDIX = $_vidix_external
> @@ -7736,7 +7741,7 @@ $_def_stddef
>  
>  /* Define this to compile stream-caching support, it can be enabled via
>     -cache <kilobytes> */
> -#define USE_STREAM_CACHE 1
> +$_def_stream_cache
>  
>  /* Define if you are using XviD library */
>  $_def_xvid
> 
> Modified: trunk/osdep/Makefile
> ==============================================================================
> --- trunk/osdep/Makefile	(original)
> +++ trunk/osdep/Makefile	Tue Feb 27 18:13:17 2007
> @@ -5,9 +5,7 @@ LIBNAME = libosdep.a
>  
>  SRCS-$(HAVE_SYS_MMAN_H)       += mmap_anon.c
>  SRCS-$(MACOSX_FINDER_SUPPORT) += macosx_finder_args.c
> -ifneq ($(TARGET_OS),MINGW32)
>  SRCS-$(STREAM_CACHE)          += shmem.c
> -endif
>  
>  SRCS-$(NEED_FSEEKO)           += fseeko.c
>  SRCS-$(NEED_FTELLO)           += ftello.c

This rule is only there because cache on MinGW works with a thread and
thus does not need shared memory. Cache still did work before, it
doesn't now...

Greetings,
Reimar Döffinger