[Bf-blender-cvs] [caa2306] master: Libmv: Update to latest upstream version

Sergey Sharybin noreply at git.blender.org
Wed Dec 31 12:11:50 CET 2014 

Commit: caa2306d16e879659cdbef4ec54752637fb5c474
Author: Sergey Sharybin
Date:   Wed Dec 31 15:55:00 2014 +0500
Branches: master
https://developer.blender.org/rBcaa2306d16e879659cdbef4ec54752637fb5c474

Libmv: Update to latest upstream version

Main purpose of this is to bring new gflags library which is more likely
to have a fix for undefined order of static variables initialization and
also to bring new glog where some compilation error are fixed (which are
only visible with more strict checks with clang and c++11 enabled).

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

M	extern/libmv/CMakeLists.txt
M	extern/libmv/ChangeLog
M	extern/libmv/SConscript
M	extern/libmv/bundle.sh
M	extern/libmv/files.txt
M	extern/libmv/intern/logging.cc
D	extern/libmv/third_party/gflags/AUTHORS
A	extern/libmv/third_party/gflags/AUTHORS.txt
D	extern/libmv/third_party/gflags/COPYING
A	extern/libmv/third_party/gflags/COPYING.txt
D	extern/libmv/third_party/gflags/ChangeLog
A	extern/libmv/third_party/gflags/ChangeLog.txt
D	extern/libmv/third_party/gflags/NEWS
A	extern/libmv/third_party/gflags/NEWS.txt
M	extern/libmv/third_party/gflags/README.libmv
M	extern/libmv/third_party/gflags/config.h
M	extern/libmv/third_party/gflags/gflags.cc
M	extern/libmv/third_party/gflags/gflags/gflags.h
M	extern/libmv/third_party/gflags/gflags/gflags_completions.h
M	extern/libmv/third_party/gflags/gflags/gflags_declare.h
M	extern/libmv/third_party/gflags/gflags_completions.cc
M	extern/libmv/third_party/gflags/gflags_reporting.cc
M	extern/libmv/third_party/gflags/mutex.h
M	extern/libmv/third_party/gflags/util.h
M	extern/libmv/third_party/glog/README.libmv
M	extern/libmv/third_party/glog/src/demangle.cc
M	extern/libmv/third_party/glog/src/logging.cc
M	extern/libmv/third_party/glog/src/symbolize.cc
M	extern/libmv/third_party/glog/src/symbolize.h
M	intern/cycles/blender/blender_logging.cpp
M	tests/gtests/testing/testing_main.cc

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

diff --git a/extern/libmv/CMakeLists.txt b/extern/libmv/CMakeLists.txt
index 49f7761..4528c0b 100644
--- a/extern/libmv/CMakeLists.txt
+++ b/extern/libmv/CMakeLists.txt
@@ -40,14 +40,14 @@ set(SRC
 if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
 	list(APPEND INC
 		third_party/gflags
+		third_party/gflags/gflags
 		third_party/glog/src
 		third_party/ceres/include
 		third_party/ceres/config
 		../../intern/guardedalloc
 	)
 
-	list(APPEND
-		INC_SYS
+	list(APPEND INC_SYS
 		../Eigen3
 		${PNG_INCLUDE_DIRS}
 		${ZLIB_INCLUDE_DIRS}
diff --git a/extern/libmv/ChangeLog b/extern/libmv/ChangeLog
index 5c2129b..0bb340b 100644
--- a/extern/libmv/ChangeLog
+++ b/extern/libmv/ChangeLog
@@ -1,3 +1,42 @@
+commit 7d6020d2ec42c6cb2749bc891186b4880d26d40b
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Wed Dec 31 15:32:07 2014 +0500
+
+    Update GLog to latest upstream revision 143
+    
+    Mainly to solve compilation error with demangle.cc.
+
+commit 5dc746700eaf85cb674f0fb73ff3c1b49a7f6315
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Fri Dec 12 14:59:55 2014 +0500
+
+    Update GFlags to latest release 2.1.1
+    
+    Main purpose of this (andsome of upcoming) update is to check if the
+    upstream sources are useable without any modifications for us. And if
+    not, then we'll need to consider moving some changes into upstream.
+    
+    This commit contains an one-to-one copy of the upstream GFlags library
+    and also changes namespace usage since it's changed in the upstream.
+
+commit 6fe6d75f7e90e161b44643b953f058a3829a5247
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Sat Nov 1 02:53:36 2014 +0500
+
+    Libmv: Code cleanup, mixed class/struct in declaration/definition
+
+commit d2a5f7953812d2d09765431b59c6c4ac72faf35b
+Author: Sergey Sharybin <sergey.vfx at gmail.com>
+Date:   Thu Oct 30 23:13:53 2014 +0500
+
+    Libmv: Support disabled color channels in tracking settings
+    
+    This was never ported to a new tracking pipeline and now it's done using
+    FrameAccessor::Transform routines. Quite striaghtforward, but i've changed
+    order of grayscale conversion in blender side with call of transform callback.
+    
+    This way it's much easier to perform rescaling in libmv side.
+
 commit d976e034cdf74b34860e0632d7b29713f47c5756
 Author: Keir Mierle <mierle at gmail.com>
 Date:   Sat Aug 23 00:38:01 2014 -0700
@@ -666,37 +705,3 @@ Author: Sergey Sharybin <sergey.vfx at gmail.com>
 Date:   Tue Feb 18 19:38:22 2014 +0600
 
     Remove .orig file which was added by accident
-
-commit 62597e3cf0f266a2fefec415c89759e502793e06
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date:   Thu Jan 2 16:02:08 2014 +0600
-
-    Upgrade glog to latest svn r139
-    
-    The intention of this upgrade is to get rid of custom patches
-    we've been having to support compilation on different platforms
-    and compilers.
-
-commit 2452d5d42b390c7ab853e6fe60e58bdd7a01a004
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date:   Tue Feb 18 18:46:08 2014 +0600
-
-    Tweak Ceres CMake to detect uninstall target properly on Windows
-
-commit 98a281d58ce2301f3dd239a97a448e53f48d0258
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date:   Fri Feb 14 00:36:44 2014 +0600
-
-    Fix order of third party libs compilation and options used by them
-    
-    WITH_FAST_DETECTOR was defined too late and third_party folder
-    didn't see this option.
-
-commit 4962bccd643ec0f2aed3035170d5f20e8f6efc85
-Author: Sergey Sharybin <sergey.vfx at gmail.com>
-Date:   Thu Feb 13 23:55:03 2014 +0600
-
-    Disable Ceres unit tests and examples by default
-    
-    Actually we're to switch to external Ceres rather than
-    bundled one, would make life much easier actually.
diff --git a/extern/libmv/SConscript b/extern/libmv/SConscript
index 6d41727..6211bf6 100644
--- a/extern/libmv/SConscript
+++ b/extern/libmv/SConscript
@@ -17,7 +17,7 @@ if env['WITH_BF_LIBMV'] or (env['WITH_BF_CYCLES'] and env['WITH_BF_CYCLES_LOGGIN
     defs.append('WITH_LIBMV_GUARDED_ALLOC')
     defs.append('LIBMV_NO_FAST_DETECTOR')
 
-    incs += ' ../Eigen3 third_party/gflags third_party/glog/src third_party/ceres/include third_party/ceres/config ../../intern/guardedalloc'
+    incs += ' ../Eigen3 third_party/gflags third_party/gflags/gflags third_party/glog/src third_party/ceres/include third_party/ceres/config ../../intern/guardedalloc'
     incs += ' ' + env['BF_PNG_INC']
     incs += ' ' + env['BF_ZLIB_INC']
 
diff --git a/extern/libmv/bundle.sh b/extern/libmv/bundle.sh
index 002e381..f8aaaa9 100755
--- a/extern/libmv/bundle.sh
+++ b/extern/libmv/bundle.sh
@@ -133,6 +133,7 @@ set(SRC
 if(WITH_LIBMV OR WITH_GTESTS OR (WITH_CYCLES AND WITH_CYCLES_LOGGING))
 	list(APPEND INC
 		third_party/gflags
+		third_party/gflags/gflags
 		third_party/glog/src
 		third_party/ceres/include
 		third_party/ceres/config
@@ -294,7 +295,7 @@ if env['WITH_BF_LIBMV'] or (env['WITH_BF_CYCLES'] and env['WITH_BF_CYCLES_LOGGIN
     defs.append('WITH_LIBMV_GUARDED_ALLOC')
     defs.append('LIBMV_NO_FAST_DETECTOR')
 
-    incs += ' ../Eigen3 third_party/gflags third_party/glog/src third_party/ceres/include third_party/ceres/config ../../intern/guardedalloc'
+    incs += ' ../Eigen3 third_party/gflags third_party/gflags/gflags third_party/glog/src third_party/ceres/include third_party/ceres/config ../../intern/guardedalloc'
     incs += ' ' + env['BF_PNG_INC']
     incs += ' ' + env['BF_ZLIB_INC']
 
diff --git a/extern/libmv/files.txt b/extern/libmv/files.txt
index a206ffe..91a529b 100644
--- a/extern/libmv/files.txt
+++ b/extern/libmv/files.txt
@@ -133,10 +133,10 @@ libmv/tracking/track_region.cc
 libmv/tracking/track_region.h
 libmv/tracking/trklt_region_tracker.cc
 libmv/tracking/trklt_region_tracker.h
-third_party/gflags/AUTHORS
-third_party/gflags/ChangeLog
+third_party/gflags/AUTHORS.txt
+third_party/gflags/ChangeLog.txt
 third_party/gflags/config.h
-third_party/gflags/COPYING
+third_party/gflags/COPYING.txt
 third_party/gflags/gflags.cc
 third_party/gflags/gflags_completions.cc
 third_party/gflags/gflags/gflags_completions.h
@@ -144,7 +144,7 @@ third_party/gflags/gflags/gflags_declare.h
 third_party/gflags/gflags/gflags.h
 third_party/gflags/gflags_reporting.cc
 third_party/gflags/mutex.h
-third_party/gflags/NEWS
+third_party/gflags/NEWS.txt
 third_party/gflags/README.libmv
 third_party/gflags/util.h
 third_party/glog/AUTHORS
diff --git a/extern/libmv/intern/logging.cc b/extern/libmv/intern/logging.cc
index 4ab2d91..77b56ef 100644
--- a/extern/libmv/intern/logging.cc
+++ b/extern/libmv/intern/logging.cc
@@ -35,21 +35,21 @@ void libmv_initLogging(const char* argv0) {
            google::GLOG_FATAL);
 
   google::InitGoogleLogging(argv0);
-  google::SetCommandLineOption("logtostderr", "1");
-  google::SetCommandLineOption("v", "0");
-  google::SetCommandLineOption("stderrthreshold", severity_fatal);
-  google::SetCommandLineOption("minloglevel", severity_fatal);
+  gflags::SetCommandLineOption("logtostderr", "1");
+  gflags::SetCommandLineOption("v", "0");
+  gflags::SetCommandLineOption("stderrthreshold", severity_fatal);
+  gflags::SetCommandLineOption("minloglevel", severity_fatal);
 }
 
 void libmv_startDebugLogging(void) {
-  google::SetCommandLineOption("logtostderr", "1");
-  google::SetCommandLineOption("v", "2");
-  google::SetCommandLineOption("stderrthreshold", "1");
-  google::SetCommandLineOption("minloglevel", "0");
+  gflags::SetCommandLineOption("logtostderr", "1");
+  gflags::SetCommandLineOption("v", "2");
+  gflags::SetCommandLineOption("stderrthreshold", "1");
+  gflags::SetCommandLineOption("minloglevel", "0");
 }
 
 void libmv_setLoggingVerbosity(int verbosity) {
   char val[10];
   snprintf(val, sizeof(val), "%d", verbosity);
-  google::SetCommandLineOption("v", val);
+  gflags::SetCommandLineOption("v", val);
 }
diff --git a/extern/libmv/third_party/gflags/AUTHORS b/extern/libmv/third_party/gflags/AUTHORS.txt
similarity index 100%
rename from extern/libmv/third_party/gflags/AUTHORS
rename to extern/libmv/third_party/gflags/AUTHORS.txt
diff --git a/extern/libmv/third_party/gflags/COPYING b/extern/libmv/third_party/gflags/COPYING.txt
similarity index 100%
rename from extern/libmv/third_party/gflags/COPYING
rename to extern/libmv/third_party/gflags/COPYING.txt
diff --git a/extern/libmv/third_party/gflags/ChangeLog b/extern/libmv/third_party/gflags/ChangeLog
deleted file mode 100644
index f9ef935..0000000
--- a/extern/libmv/third_party/gflags/ChangeLog
+++ /dev/null
@@ -1,195 +0,0 @@
-Wed Jan 25 15:09:14 2012  Google Inc. <google-gflags at googlegroups.com>
-
-	* gflags: version 2.0
-	* Changed the 'official' gflags email in setup.py/etc
-	* Renamed google-gflags.sln to gflags.sln
-	* Changed copyright text to reflect Google's relinquished ownership
-
-Tue Dec 20 19:48:57 2011  Google Inc. <opensource at google.com>
-
-	* google-gflags: version 1.7
-	* Add CommandLineFlagInfo::flag_ptr pointing to current storage (musji)
-	* PORTING: flush after writing to stderr, needed on cygwin
-	* PORTING: Clean up the GFLAGS_DLL_DECL stuff better
-	* Fix a bug in StringPrintf() that affected large strings (csilvers)
-	* Die at configure-time when g++ isn't installed
-
-Fri Jul 29 19:05:21 2011  Google Inc. <opensource at google.com>
-
-	* google-gflags: version 1.6
-	* BUGFIX: Fix a bug where we were leaving out a required $(top_srcdir)
-	* Fix definition of clstring (jyrki)
-	* Split up flag declares into its own file (jyrki)
-	* Add --version support (csilvers)
-	* Update the README for gflags with static libs
-	* Update acx_pthread.m4 for nostdlib
-	* Change ReparseCommandLineFlags to return void (csilvers)
-	* Some doc typofixes and example augmentation (various)
-
-Mon Jan 24 16:11:35 2011  Google Inc. <opensource at google.com>
-
-	* google-gflags: version 1.5
-	* Better reporting of current vs default value (handler)
-	* Add API for cleaning up of memory at program-exit (jmarantz)
-	* Fix macros to work inside namespaces (csilvers)
-	* Use our own string typedef in case string is redefined (csilvers)
-	* Updated to autoconf 2.65
-
-Wed Oct 13 17:40:12 2010  Google Inc. <opensource at google.com>
-
-	* google-gflags: version 1.4
-	* Add a check to prevent passing 0 to DEFIN

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list