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

[reimar]

Author: reimar
Date: Sun Jan 30 11:27:31 2011
New Revision: 32830

Log:
Remove outdated FFmpeg svn external, make configure optionally
get and update a git checkout.

Modified:
   trunk/   (props changed)
   trunk/configure

Modified: trunk/configure
==============================================================================
--- 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/.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