scripts: update for gst-ffmpeg -> gst-libav

Now that we have a gst-libav git repository (symlinked to gst-ffmpeg).

diff --git a/scripts/create-uninstalled-setup.sh b/scripts/create-uninstalled-setup.sh
index 1bedf55..2a93a00 100755 (executable)
--- a/scripts/create-uninstalled-setup.sh
+++ b/scripts/create-uninstalled-setup.sh
@@ -36,7 +36,13 @@ BRANCH="master"
 GIT_ACCESS="anongit"
 
 # git modules to clone
-MODULES="gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad gst-ffmpeg"
+MODULES="gstreamer gst-plugins-base gst-plugins-good gst-plugins-ugly gst-plugins-bad"
+
+if test "$BRANCH" != "0.10"; then
+  MODULES="$MODULES gst-libav"
+else
+  MODULES="$MODULES gst-ffmpeg"
+fi
 
 # note: we use ~/gst because that's what the gst-uninstalled script
 # uses by default, so don't just change that to something else

diff --git a/scripts/gst-uninstalled b/scripts/gst-uninstalled
index 31702d2..c2ca503 100755 (executable)
--- a/scripts/gst-uninstalled
+++ b/scripts/gst-uninstalled
@@ -132,6 +132,7 @@ $GST/gstreamer/plugins\
 :$GST/gst-plugins-bad/ext\
 :$GST/gst-plugins-bad/gst\
 :$GST/gst-plugins-bad/sys\
+:$GST/gst-libav/ext/\
 :$GST/gst-ffmpeg/ext/\
 :$GST/gnonlin/gnl/.libs\
 :$GST/gst-openmax/omx/.libs\
@@ -190,6 +191,19 @@ export LD_LIBRARY_PATH=$GST/gst-editing-services/ges/.libs:$LD_LIBRARY_PATH
 export DYLD_LIBRARY_PATH=$GST/gst-editing-services/ges/.libs:$DYLD_LIBRARY_PATH
 export PATH=$GST/gst-editing-services/tools:$PATH
 
+if [ -d "$GST/gst-libav" -a -d "$GST/gst-ffmpeg" ]; then
+  echo
+  echo "====================================================================="
+  echo " You have both an uninstalled gst-ffmpeg checkout and a gst-libav"
+  echo " checkout. You need to remove one of those. You should remove"
+  echo
+  echo "   $GST/gst-ffmpeg"
+  echo
+  echo " since gst-libav replaces gst-ffmpeg."
+  echo "====================================================================="
+  echo
+fi
+
 # if we got a command, run it, else start a shell
 if test ! -z "$1";
 then