x86inc: Fix AVX emulation of some instructions

[x264] / version.sh

diff --git a/version.sh b/version.sh
index 7f06c7c5f4f7b3205b6460581d5723d23c7514d9..178fc95245e385621176f03f0a698ac89facfb2f 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -1,20 +1,28 @@
-#!/bin/bash
-git rev-list HEAD | sort > config.git-hash
-LOCALVER=`wc -l config.git-hash | awk '{print $1}'`
-if [ $LOCALVER \> 1 ] ; then
-    VER=`git rev-list origin/master | sort | join config.git-hash - | wc -l | awk '{print $1}'`
-    if [ $VER != $LOCALVER ] ; then
-        VER="$VER+$(($LOCALVER-$VER))"
+#!/bin/sh
+
+cd "$(dirname "$0")" >/dev/null && [ -f x264.h ] || exit 1
+
+api="$(grep '#define X264_BUILD' < x264.h | sed 's/^.* \([1-9][0-9]*\).*$/\1/')"
+ver="x"
+version=""
+
+if [ -d .git ] && command -v git >/dev/null 2>&1 ; then
+    localver="$(($(git rev-list HEAD | wc -l)))"
+    if [ "$localver" -gt 1 ] ; then
+        ver_diff="$(($(git rev-list origin/master..HEAD | wc -l)))"
+        ver="$((localver-ver_diff))"
+        echo "#define X264_REV $ver"
+        echo "#define X264_REV_DIFF $ver_diff"
+        if [ "$ver_diff" -ne 0 ] ; then
+            ver="$ver+$ver_diff"
+        fi
+        if git status | grep -q "modified:" ; then
+            ver="${ver}M"
+        fi
+        ver="$ver $(git rev-list -n 1 HEAD | cut -c 1-7)"
+        version=" r$ver"
     fi
-    if git status | grep -q "modified:" ; then
-        VER="${VER}M"
-    fi
-    VER="$VER $(git rev-list HEAD -n 1 | cut -c 1-7)"
-    echo "#define X264_VERSION \" r$VER\""
-else
-    echo "#define X264_VERSION \"\""
-    VER="x"
 fi
-rm -f config.git-hash
-API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'`
-echo "#define X264_POINTVER \"0.$API.$VER\""
+
+echo "#define X264_VERSION \"$version\""
+echo "#define X264_POINTVER \"0.$api.$ver\""