[Bf-blender-cvs] [f9353b8] master: Code cleanup: remove patch series from libmv

Sergey Sharybin noreply at git.blender.org
Thu Jan 2 10:31:05 CET 2014


Commit: f9353b8e8d9f13c938ab12f6698bd598a4d39104
Author: Sergey Sharybin
Date:   Thu Jan 2 15:22:28 2014 +0600
https://developer.blender.org/rBf9353b8e8d9f13c938ab12f6698bd598a4d39104

Code cleanup: remove patch series from libmv

Since we're using own libmv branch from git.blender.org
we don't need to have local patches for libmv in blender
source tree.

===================================================================

M	extern/libmv/bundle.sh
D	extern/libmv/patches/series

===================================================================

diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh
index 79c80dd..5f7251e 100755
--- a/extern/libmv/bundle.sh
+++ b/extern/libmv/bundle.sh
@@ -14,14 +14,8 @@ tmp=`mktemp -d`
 
 git clone -b $BRANCH $repo $tmp/libmv
 
-#git --git-dir $tmp/libmv/.git --work-tree $tmp/libmv log --since="1 month ago" > ChangeLog
 git --git-dir $tmp/libmv/.git --work-tree $tmp/libmv log -n 50 > ChangeLog
 
-for p in `cat ./patches/series`; do
-  echo "Applying patch $p..."
-  cat ./patches/$p | patch -d $tmp/libmv -p1
-done
-
 find libmv -type f -not -iwholename '*.svn*' -exec rm -rf {} \;
 find third_party -type f -not -iwholename '*.svn*' -not -iwholename '*third_party/ceres*' \
     -not -iwholename '*third_party/SConscript*' -not -iwholename '*third_party/CMakeLists.txt*' \
diff --git a/extern/libmv/patches/series b/extern/libmv/patches/series
deleted file mode 100644
index e69de29..0000000




More information about the Bf-blender-cvs mailing list