[MPlayer-dev-eng] [patch] check pkg-config first for libdvd{nav, read}
Diego Biurrun
diego at biurrun.de
Sun Apr 8 20:56:05 CEST 2012
On Sat, Apr 07, 2012 at 12:56:50PM -0400, Mike Frysinger wrote:
> On Saturday 07 April 2012 05:01:38 Diego Biurrun wrote:
> > On Fri, Mar 30, 2012 at 02:18:04PM -0400, Mike Frysinger wrote:
> > > managing pkg-config files is a lot easier when cross-compiling then a
> > > variety of config scripts. the libdvd{nav,read} packages install .pc
> > > files now, so check those first before falling back to the config
> > > scripts.
> > >
> > > (please cc me as i'm not on the list)
> > >
> > > --- configure (revision 34835)
> > > +++ configure (working copy)
> > > @@ -4042,7 +4042,7 @@ echores "$_apple_ir"
> > >
> > > echocheck "pkg-config"
> > >
> > > -_pkg_config=pkg-config
> > > +_pkg_config=${PKG_CONFIG:-pkg-config}
> >
> > That doesn't quite fit the patch description.
>
> the build should respect the env $PKG_CONFIG just like the upstream pkg-config
> intended (see pkg.m4) which makes it work like every autotools based pkg out
> there.
>
> at least the mplayer2 project has adopted a --pkg-config flag it seems.
I don't doubt you for a second. I'm just saying that this does not fit
under the
check pkg-config first for libdvd{nav, read}
moniker. We require separate changes to be in separate patches.
At least a log message should mention such changes.
> > > @@ -7721,13 +7726,20 @@ if test "$_dvdnav" = auto ; then
> > > dvdnav_internal=yes
> > > res_comment="internal"
> > > else
> > > - $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no
> > > + if ! $_pkg_config --exists dvdnavmini ; then
> > > + $_dvdnavconfig --version --minilibs >> $TMPLOG 2>&1 || _dvdnav=no
> > > + fi
> > > fi
> > > fi
> >
> > I wonder why you do not test pkg-config, but only dvdnav-config here.
>
> not sure what you mean. the logic is testing for the dvdnav .pc before
> falling back to the dvdnavconfig
I misread; the change looks correct.
Diego
More information about the MPlayer-dev-eng
mailing list