[MPlayer-dev-eng] [PATCH] configure: add support for specifying a branch to use.

[Reimar Döffinger]

On Wed, Feb 26, 2014 at 12:22:06AM +0100, Alexander Strasser wrote:
> Hi Reimar!
> 
> On 2014-02-24 20:18 +0100, Reimar Döffinger wrote:
> > This is intended for use in release.
> > ---
> >  configure | 7 +++++--
> >  1 file changed, 5 insertions(+), 2 deletions(-)
> > 
> > diff --git a/configure b/configure
> > index fab56a7..1448a23 100755
> > --- a/configure
> > +++ b/configure
> > @@ -1507,9 +1507,12 @@ if test -e ffmpeg/.svn ; then
> >      exit 1
> >  fi
> >  
> > +FFBRANCH=master
> 
>   I would prefer the name FFREF (or FFMPEG_REF) to address
> the fact that we can use tag names too, which we IMHO should
> do for release tarballs.

As you noticed that won't work without making quite a mess out
of configure.
In addition that is exactly what I do _not_ want to happen,
someone downloading the tarball and getting a FFmpeg with
month old security issues.
A hard-coded tag is an equally horrible idea as including
FFmpeg since it essentially means we should upload a new tarball
for every security fix in FFmpeg.
That was a huge mistake I very much don't want to repeat.

>   BTW talking about releases, I guess we will make one soon,
> won't we?

I'd hope so, preferably mostly in sync with FFmpeg 2.2, but I
am not sure I'll make it.
In particular since I think we really should update libass for the
release.
But if someone else wants to...

> > +test -e FFBRANCH && FFBRANCH=`cat FFBRANCH`
> 
>   I think we use $() instead of `` nowadays. A quick glance
> at configure seems to support that suspicion.

Yes, I realized that shortly after I sent the patch.

> >  if test -e ffmpeg/mp_auto_pull ; then
> >      echo "Updating FFmpeg, (re)move ffmpeg/mp_auto_pull to disable"
> > -    (cd ffmpeg && git checkout master)
> > +    (cd ffmpeg && git checkout $FFBRANCH)
> 
> 
> >      if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
> 
>   I realize now this would fail with a tag name in the line above (e.g. in
> detached HEAD state).
> 
>   Could be fixed by something like this I believe (not integration tested):
>   if ! ( cd ffmpeg && ( test "$(git branch | grep '^*')" == "* (no branch)" || git pull --rebase --ff-only ) ) ; then

I really would like to avoid making it more messy.