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

[Diego Biurrun]

On Sun, Apr 29, 2007 at 10:02:41PM +0200, Nico Sabbi wrote:
> Diego Biurrun wrote:
> >On Sat, Apr 28, 2007 at 02:48:45PM +0200, Nico Sabbi wrote:
> >
> >>Diego Biurrun wrote:
> >>
> >>>On Sat, Apr 28, 2007 at 02:10:03PM +0200, Nico Sabbi wrote:
> >>>
> >>>>If you install my fork of dvdnav configured to use an external dvdread,
> >>>>with this patch applied mplayer can use dvdnav and mplayer's dvdread
> >>>>(unless you pass --disable-dvdread-internal, in which case the 
> >>>>system-wide dvdread will be used).
> >>>
> >>>Why don't we drop support for the old libdvdnav versions?  AFAICT it
> >>>does not work anyway, so we should just require our forked version and
> >>>get rid of all these hacks.
> >>
> >>- by development policy libdvdnav must be backwards compatible,
> >>  so removing dvdread tout-court is out of question
> >
> >Why?  You just took over, make those big changes!
> 
> patch updated: now configure works only when dvdnav-config --minilibs 
> works correctly (linking against libdvdnavmini.so), hence the old 
> libdvdnav.so with dvdread embedded won't be used anymore.
> 
> --- configure	(revisione 23156)
> +++ configure	(copia locale)
> @@ -5269,14 +5264,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'

Fix indentation after you commit this.

> @@ -7542,6 +7532,8 @@
>    _libavmuxers=`echo $_libavmuxers | sed -e s/LIBNUT_MUXER// `
>  fi
>  
> +test "$_dvdnav" = yes && _ld_extra="$_ld_extra `$_dvdnavconfig --minilibs`"

This is unacceptable, it belongs together with the libdvdnav test, don't
spread things all over configure.

Diego