[MPlayer-cvslog] r32830 - in trunk: . configure

[Diego Biurrun]

On Sun, Jan 30, 2011 at 11:27:32AM +0100, reimar wrote:
> 
> Log:
> Remove outdated FFmpeg svn external, make configure optionally
> get and update a git checkout.

I'm not terribly fond of this, but I currently have nothing better,
so I won't complain.

> --- trunk/configure	Sat Jan 29 17:43:54 2011	(r32829)
> +++ trunk/configure	Sun Jan 30 11:27:31 2011	(r32830)
> @@ -35,6 +35,29 @@
>  
> +if test -e ffmpeg/mp_auto_pull ; then
> +  if ! (cd ffmpeg && git pull --rebase --ff-only) ; then

I have a hunch you need a new enough git version for this to work:

diego at slaughter:/var/tmp/diego/mplayer/trunk/ffmpeg $ git pull --rebase --ff-only
error: unknown option `ff-only'
usage: git-fetch [options] [<repository> <refspec>...]

    -q, --quiet           be quiet
    -v, --verbose         be verbose
    -a, --append          append to .git/FETCH_HEAD instead of overwriting
    --upload-pack <PATH>  path to upload pack on remote end
    -f, --force           force overwrite of local branch
    -t, --tags            fetch all tags and associated objects
    -n                    do not fetch all tags (--no-tags)
    -k, --keep            keep downloaded pack
    -u, --update-head-ok  allow updating of HEAD ref
    --depth <DEPTH>       deepen history of shallow clone

diego at slaughter:/var/tmp/diego/mplayer/trunk/ffmpeg $ git --version
git version 1.5.6.5

> +if ! test -e ffmpeg ; then
> +  echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort"
> +  read tmp
> +  if ! git clone git://git.videolan.org/ffmpeg.git ffmpeg ; then

wrong repo ;-p

No, I won't fight about this, but the irony in seeing MPlayer with two
libmpcodecs directories amuses me. ;-)

Diego