[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39905] branches/soc-2011-tomato/extern/ libmv: Camera tracking integration

[Sergey Sharybin]

Revision: 39905
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39905
Author:   nazgul
Date:     2011-09-04 12:56:16 +0000 (Sun, 04 Sep 2011)
Log Message:
-----------
Camera tracking integration
===========================

Fix compilation for 32bit OSX.

Modified Paths:
--------------
    branches/soc-2011-tomato/extern/libmv/patches/series
    branches/soc-2011-tomato/extern/libmv/third_party/glog/src/config_mac.h

Added Paths:
-----------
    branches/soc-2011-tomato/extern/libmv/patches/config_mac.patch

Added: branches/soc-2011-tomato/extern/libmv/patches/config_mac.patch
===================================================================
--- branches/soc-2011-tomato/extern/libmv/patches/config_mac.patch	                        (rev 0)
+++ branches/soc-2011-tomato/extern/libmv/patches/config_mac.patch	2011-09-04 12:56:16 UTC (rev 39905)
@@ -0,0 +1,13 @@
+diff --git a/src/third_party/glog/src/config_mac.h b/src/third_party/glog/src/config_mac.h
+index a45575b..5f953d1 100644
+--- a/src/third_party/glog/src/config_mac.h
++++ b/src/third_party/glog/src/config_mac.h
+@@ -131,7 +131,7 @@
+ #define PACKAGE_VERSION "0.3.1"
+ 
+ /* How to access the PC from a struct ucontext */
+-#define PC_FROM_UCONTEXT uc_mcontext->__ss.__rip
++#undef PC_FROM_UCONTEXT
+ 
+ /* Define to necessary symbol if this constant uses a non-standard name on
+    your system. */

Modified: branches/soc-2011-tomato/extern/libmv/patches/series
===================================================================
--- branches/soc-2011-tomato/extern/libmv/patches/series	2011-09-04 11:38:53 UTC (rev 39904)
+++ branches/soc-2011-tomato/extern/libmv/patches/series	2011-09-04 12:56:16 UTC (rev 39905)
@@ -1,4 +1,5 @@
 v3d_verbosity.patch
 snrptinf_fix.patch
 bundle_tweaks.patch
-fast.patch
\ No newline at end of file
+fast.patch
+config_mac.patch

Modified: branches/soc-2011-tomato/extern/libmv/third_party/glog/src/config_mac.h
===================================================================
--- branches/soc-2011-tomato/extern/libmv/third_party/glog/src/config_mac.h	2011-09-04 11:38:53 UTC (rev 39904)
+++ branches/soc-2011-tomato/extern/libmv/third_party/glog/src/config_mac.h	2011-09-04 12:56:16 UTC (rev 39905)
@@ -131,7 +131,7 @@
 #define PACKAGE_VERSION "0.3.1"
 
 /* How to access the PC from a struct ucontext */
-#define PC_FROM_UCONTEXT uc_mcontext->__ss.__rip
+#undef PC_FROM_UCONTEXT
 
 /* Define to necessary symbol if this constant uses a non-standard name on
    your system. */