Don't override flat SSE2 dequant functions with non-flat AVX ones

[x264] / version.sh

diff --git a/version.sh b/version.sh
index f302be4544fa7c1674d9b9f3bf6c1b367b2ea740..7f06c7c5f4f7b3205b6460581d5723d23c7514d9 100755 (executable)
--- a/version.sh
+++ b/version.sh
@@ -1,12 +1,20 @@
-#!/bin/sh
-VER=`svnversion .`
-if [ "x$VER" != x -a "$VER" != exported ]
-then
-  echo "#define X264_VERSION \" svn-$VER\"" > config.h
-  API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'`
-  VER=`echo $VER | sed -e 's/[^0-9].*//'`
-  echo "#define X264_POINTVER \"0.$API.$VER\"" >> config.h
+#!/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))"
+    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 \"\"" > config.h
-  echo "#define X264_POINTVER \"\"" >> config.h
+    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\""