Mercurial > mplayer.hg
changeset 32743:9b590f58634c
Remove outdated FFmpeg svn external, make configure optionally
get and update a git checkout.
| author | reimar |
|---|---|
| date | Sun, 30 Jan 2011 10:27:31 +0000 |
| parents | 0dfeffc40c65 |
| children | c8475dec7a3f |
| files | configure |
| diffstat | 1 files changed, 23 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sat Jan 29 16:43:54 2011 +0000 +++ b/configure Sun Jan 30 10:27:31 2011 +0000 @@ -35,6 +35,29 @@ # ############################################################################# +if test -e ffmpeg/.svn ; then + echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it" + exit 1 +fi + +if test -e ffmpeg/mp_auto_pull ; then + if ! (cd ffmpeg && git pull --rebase --ff-only) ; then + echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling" + exit 1 + fi +fi + +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 + rm -rf ffmpeg + echo "Failed to get a FFmpeg checkout" + exit 1 + fi + touch ffmpeg/mp_auto_pull +fi + # Prevent locale nonsense from breaking basic text processing utils export LC_ALL=C