patches/libx264-02-version.diff
changeset 3015 bd78f72ae2d7
parent 2693 3abe46f7045d
child 3749 a39ae2c0ae71
--- a/patches/libx264-02-version.diff	Wed Nov 10 19:13:39 2010 +0000
+++ b/patches/libx264-02-version.diff	Wed Nov 10 21:44:34 2010 +0000
@@ -1,6 +1,6 @@
---- x264-snapshot-20100520-2245/version.sh	Fri May 21 21:17:43 2010
-+++ x264-snapshot-20100520-2245-patch/version.sh	Fri May 21 21:17:25 2010
-@@ -1,19 +1,20 @@
+--- x264-snapshot-20101029-2245/version.sh.orig	Fri Oct 29 16:45:07 2010
++++ x264-snapshot-20101029-2245/version.sh	Fri Oct 29 22:40:36 2010
+@@ -1,20 +1,5 @@
  #!/bin/bash
 -git rev-list HEAD | sort > config.git-hash
 -LOCALVER=`wc -l config.git-hash | awk '{print $1}'`
@@ -8,31 +8,19 @@
 -    VER=`git rev-list origin/master | sort | join config.git-hash - | wc -l | awk '{print $1}'`
 -    if [ $VER != $LOCALVER ] ; then
 -        VER="$VER+$(($LOCALVER-$VER))"
--    elif git status | grep -q "modified:" ; then
+-    fi
+-    if git status | grep -q "modified:" ; then
 -        VER="${VER}M"
 -    fi
 -    VER="$VER $(git rev-list HEAD -n 1 | cut -c 1-7)"
-+#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))"
-+#    elif git status | grep -q "modified:" ; then
-+#        VER="${VER}M"
-+#    fi
-+#    VER="$VER $(git rev-list HEAD -n 1 | cut -c 1-7)"
-+VER="git-2245M"
-     echo "#define X264_VERSION \" r$VER\"" >> config.h
+-    echo "#define X264_VERSION \" r$VER\""
 -else
--    echo "#define X264_VERSION \"\"" >> config.h
+-    echo "#define X264_VERSION \"\""
 -    VER="x"
 -fi
 -rm -f config.git-hash
-+#else
-+#    echo "#define X264_VERSION \"\"" >> config.h
-+#    VER="x"
-+#fi
-+#rm -f config.git-hash
++VER="git-2245M"
++    echo "#define X264_VERSION \" r$VER\"" >> config.h
  API=`grep '#define X264_BUILD' < x264.h | sed -e 's/.* \([1-9][0-9]*\).*/\1/'`
- echo "#define X264_POINTVER \"0.$API.$VER\"" >> config.h
+-echo "#define X264_POINTVER \"0.$API.$VER\""
++echo "#define X264_POINTVER \"0.$API.$VER\"" >> config.h