[MPlayer-dev-eng] [PATCH] configure: Add a note about ffmpeg download
Hans-Dieter Kosch
hdkosch at kabelbw.de
Sat Mar 30 18:18:56 CET 2013
Reimar Döffinger wrote:
> On Sat, Mar 30, 2013 at 12:28:27AM +0100, Hans-Dieter Kosch wrote:>
>> Index: configure
>> ===================================================================
>> --- configure (revision 36097)
>> +++ configure (working copy)
>> @@ -1490,6 +1490,8 @@
>> echo >> "$TMPLOG"
>>
>>
>> +echo; echo "Getting FFmpeg..."; echo
>> +
>> # local FFmpeg checkout handling
>> if test -e ffmpeg/.svn ; then
>> echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it"
>
> That's the wrong place, it would print the message also in cases where
> nothing will be downloaded.
I see. It was just a quick hack.
> Also, there is a more explicit question for the initial checkout.
> Maybe something like this instead:
> Index: configure
> ===================================================================
> --- configure (revision 36098)
> +++ configure (working copy)
> @@ -1497,6 +1497,7 @@
> fi
>
> if test -e ffmpeg/mp_auto_pull ; then
> + echo "Updating FFmpeg, (re)move ffmpeg/mp_auto_pull to disable"
> (cd ffmpeg && git checkout master)
> if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
> echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
That looks fine.
More information about the MPlayer-dev-eng
mailing list