X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=version.sh;h=6f72b2c2e6ee66aad29379da5a4cd6428a622c58;hb=0cb93dacee45d3d767b4470e6a9b43b17e5220c4;hp=39bef80af17b591bea895e59b6b7bcfd358dcd6e;hpb=31c194e7f9483cb067c31bb64bc0d719e2823e25;p=ffmpeg

diff --git a/version.sh b/version.sh
index 39bef80af17..6f72b2c2e6e 100755
--- a/version.sh
+++ b/version.sh
@@ -1,37 +1,23 @@
 #!/bin/sh
 
-# check for SVN revision number
-revision=$(cd "$1" && 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)
-test $revision && revision=SVN-r$revision
-
-# check for git svn revision number
-if ! test $revision; then
-    revision=$(cd "$1" && git svn find-rev HEAD)
-    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)
-    test $revision && revision=git-$revision
-fi
+revision=$(cd "$1" && git describe --always 2> /dev/null)
 
 # no revision number found
-test $revision || revision=UNKNOWN
+test "$revision" || revision=$(cd "$1" && cat RELEASE 2> /dev/null)
 
 # releases extract the version number from the VERSION file
-version=$(cat VERSION 2> /dev/null)
-test $version || version=$revision
+version=$(cd "$1" && cat VERSION 2> /dev/null)
+test "$version" || version=$revision
 
 test -n "$3" && version=$version-$3
 
-NEW_REVISION="#define FFMPEG_VERSION \"$version\""
+if [ -z "$2" ]; then
+    echo "$version"
+    exit
+fi
+
+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