[MPlayer-dev-eng] [PATCH] ddvnav+internal dvdread

[Diego Biurrun]

On Tue, May 01, 2007 at 08:18:28PM +0200, Nico Sabbi wrote:
> Nico Sabbi wrote:
> >Diego Biurrun wrote:
> >
> >>On Mon, Apr 30, 2007 at 11:27:22AM +0200, Nico Sabbi wrote:
> >>
> >>>Diego Biurrun wrote:
> >>
> >>I don't see a problem, simply skip the check for libdvdread when the
> >>internal libdvdread is enabled.  What am I missing?
> >
> >see what happens if I leave the assignment
> >
> >[...]
> 
> is this patch acceptable for you?

It seems to be boil down to

> --- configure	(revisione 23156)
> +++ configure	(copia locale)
> @@ -5197,41 +5197,6 @@
>  
> -  #disable dvdread checks: dvdread will be enabled using dvdnav's version of dvdread
> -  _dvdread_internal=no
> -  _dvdread=yes
>  
> @@ -5269,14 +5234,9 @@
>  elif test "$_dvdread" = yes; then
>    _def_dvdread='#define USE_DVDREAD 1'
>    _largefiles=yes
> -  if test "$_dvdnav" != yes; then
>      _ld_extra="$_ld_extra -ldvdread"
>      _inputmodules="dvdread(external) $_inputmodules"
>      _res_comment="external"
> -  else
> -    _inputmodules="dvdread(from dvdnav) $_inputmodules"
> -    _res_comment="from dvdnav"
> -  fi
>  else
>    _def_dvdread_internal="#undef USE_DVDREAD_INTERNAL"
>    _def_dvdread='#undef USE_DVDREAD'

If that is all it takes, I'm fine with the patch.  Fixing indentation
after the second hunk is applied would be a plus.

Diego