Skip to content

Commit

Permalink
only check for a git rev if the src tree is in a git repo
Browse files Browse the repository at this point in the history
fixes the version string when building from the kodi depends src tree
  • Loading branch information
wsnipex authored and Rechi committed Nov 3, 2018
1 parent db6a873 commit 21c13d0
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions ffbuild/version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

# Usage: version.sh <ffmpeg-root-dir> <output-version.h> <extra-version>

if [ -d $1/.git ]; then # only check for a git rev, if the src tree is in a git repo
# check for git short hash
if ! test "$revision"; then
if (cd "$1" && grep git RELEASE 2> /dev/null >/dev/null) ; then
Expand All @@ -27,6 +28,7 @@ if [ -z "$revision" ]; then
git_hash="${srcdir##*-}";;
esac
fi
fi

# no revision number found
test "$revision" || revision=$(cd "$1" && cat RELEASE 2> /dev/null)
Expand Down

0 comments on commit 21c13d0

Please sign in to comment.