Indeo 5 decoder

[ffmpeg] / version.sh

diff --git a/version.sh b/version.sh
index 9809d6d14e29d9543c4dd91ed4e0a6323cbd61aa..774e514c22fcba06e209e979e6ed2a2435d1aae8 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -1,15 +1,24 @@
 #!/bin/sh
 
 # check for SVN revision number
-revision=$(cat snapshot_version 2> /dev/null)
-test $revision || revision=$(cd "$1" && LC_ALL=C svn info 2> /dev/null | grep Revision | cut -d' ' -f2)
-test $revision || revision=$(cd "$1" && grep revision .svn/entries 2>/dev/null | cut -d '"' -f2)
-test $revision || revision=$(cd "$1" && sed -n -e '/^dir$/{n;p;q}' .svn/entries 2>/dev/null)
+revision=$(cd "$1" && cat snapshot_version 2> /dev/null)
+test $revision || revision=$(cd "$1" && LC_ALL=C svn info 2> /dev/null | grep "Last Changed Rev" | cut -d' ' -f4)
+test $revision || revision=$(cd "$1" && grep committed-rev .svn/entries 2>/dev/null | head -n 1 | cut -d '"' -f2)
+test $revision || revision=$(cd "$1" && sed -n -e '/^dir$/{n
+p
+q
+}' .svn/entries 2>/dev/null)
 test $revision && revision=SVN-r$revision
 
+# check for git svn revision number
+if ! test $revision; then
+    revision=$(cd "$1" && git svn find-rev HEAD 2> /dev/null)
+    test $revision && revision=git-svn-r$revision
+fi
+
 # check for git short hash
 if ! test $revision; then
-    revision=$(cd "$1" && git log -1 --pretty=format:%h)
+    revision=$(cd "$1" && git log -1 --pretty=format:%h 2> /dev/null)
     test $revision && revision=git-$revision
 fi
 
@@ -17,7 +26,7 @@ fi
 test $revision || revision=UNKNOWN
 
 # releases extract the version number from the VERSION file
-version=$(cat VERSION 2> /dev/null)
+version=$(cd "$1" && cat VERSION 2> /dev/null)
 test $version || version=$revision
 
 test -n "$3" && version=$version-$3