X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=version.sh;h=6f72b2c2e6ee66aad29379da5a4cd6428a622c58;hb=2d1f4288dd02a624cb8b86ab06371d6434c9da69;hp=f8b111cc72287beb4173f6dd9d7e91437fec1572;hpb=40eaf7806d861ac61c1585e8999983fbcddb7e94;p=ffmpeg

diff --git a/version.sh b/version.sh
index f8b111cc722..6f72b2c2e6e 100755
--- a/version.sh
+++ b/version.sh
@@ -1,24 +1,26 @@
 #!/bin/sh
 
-# check for SVN revision number
-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`
-test $revision && revision=SVN-r$revision
-
 # check for git short hash
-if ! test $revision; then
-    revision=`cd "$1" && git log -1 --pretty=format:%h`
-    test $revision && revision=git-$revision
-fi
+revision=$(cd "$1" && git describe --always 2> /dev/null)
+
+# no revision number found
+test "$revision" || revision=$(cd "$1" && cat RELEASE 2> /dev/null)
 
-# no version number found
-test $revision || revision=UNKNOWN
+# releases extract the version number from the VERSION file
+version=$(cd "$1" && cat VERSION 2> /dev/null)
+test "$version" || version=$revision
+
+test -n "$3" && version=$version-$3
+
+if [ -z "$2" ]; then
+    echo "$version"
+    exit
+fi
 
-NEW_REVISION="#define FFMPEG_VERSION \"$revision\""
-OLD_REVISION=`cat version.h 2> /dev/null`
+NEW_REVISION="#define LIBAV_VERSION \"$version\""
+OLD_REVISION=$(cat version.h 2> /dev/null)
 
 # Update version.h only on revision changes to avoid spurious rebuilds
 if test "$NEW_REVISION" != "$OLD_REVISION"; then
-    echo "$NEW_REVISION" > version.h
+    echo "$NEW_REVISION" > "$2"
 fi