meshlab-1.3.2-sharedlib.patch

   1 diff -up meshlab-1.3.2/meshlab/src/common/common.pro.sharedlib meshlab-1.3.2/meshlab/src/common/common.pro
   2 --- meshlab-1.3.2/meshlab/src/common/common.pro.sharedlib       2012-07-30 23:42:56.000000000 -0600
   3 +++ meshlab-1.3.2/meshlab/src/common/common.pro 2013-02-26 09:43:25.574027223 -0700
   4 @@ -1,9 +1,6 @@
   5  include (../general.pri)
   6  EXIF_DIR = ../external/jhead-2.95
   7
   8 -
   9 -GLEWCODE = $$GLEWDIR/src/glew.c
  10 -
  11  win32-msvc2005:DESTDIR = ../distrib
  12  win32-msvc2008:DESTDIR = ../distrib
  13  win32-msvc2010:DESTDIR = ../distrib
  14 @@ -52,8 +49,7 @@ echo "linked shader dir"; \
  15  fi;\
  16  "
  17  INCLUDEPATH *= ../.. \
  18 -    $$VCGDIR \
  19 -    $$GLEWDIR/include
  20 +    $$VCGDIR
  21  TEMPLATE = lib
  22  linux-g++:CONFIG += dll
  23  linux-g++:DESTDIR = ../distrib
  24 @@ -75,7 +71,6 @@ QT += script
  25  TARGET =
  26  DEPENDPATH += .
  27  INCLUDEPATH += . $$EXIF_DIR
  28 -DEFINES += GLEW_STATIC
  29  win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS
  30  win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS
  31
  32 @@ -106,7 +101,6 @@ SOURCES += filterparameter.cpp \
  33         mlapplication.cpp \
  34         scriptsyntax.cpp \
  35         searcher.cpp \
  36 -    $$GLEWCODE \
  37      meshlabdocumentxml.cpp \
  38      meshlabdocumentbundler.cpp
  39
  40 diff -up meshlab-1.3.2/meshlab/src/external/external.pro.sharedlib meshlab-1.3.2/meshlab/src/external/external.pro
  41 --- meshlab-1.3.2/meshlab/src/external/external.pro.sharedlib   2012-05-30 08:24:24.000000000 -0600
  42 +++ meshlab-1.3.2/meshlab/src/external/external.pro     2013-02-26 09:43:25.574027223 -0700
  43 @@ -2,11 +2,5 @@ config += debug_and_release
  44
  45  TEMPLATE      = subdirs
  46
  47 -SUBDIRS       = lib3ds-1.3.0/lib3ds \
  48 -                bzip2-1.0.5/bzip2-1.0.5.pro \
  49 -                muparser_v132/src \
  50 -                levmar-2.3/levmar-2.3.pro \
  51 -                structuresynth/structuresynth.pro \
  52 -                                OpenCTM-1.0.3/openctm.pro \
  53 +SUBDIRS       = structuresynth/structuresynth.pro \
  54                  jhead-2.95/jhead-2.95.pro
  55 -#                openkinect/openkinect.pro
  56 diff -up meshlab-1.3.2/meshlab/src/meshlab/meshlab.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlab/meshlab.pro
  57 --- meshlab-1.3.2/meshlab/src/meshlab/meshlab.pro.sharedlib     2012-05-30 08:32:44.000000000 -0600
  58 +++ meshlab-1.3.2/meshlab/src/meshlab/meshlab.pro       2013-02-26 09:43:25.575027223 -0700
  59 @@ -129,7 +129,7 @@ win32-g++:LIBS              += -L../external/
  60  #      win32-g++:release:LIBS                  += -L../common/release -lcommon
  61  #}
  62
  63 -linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
  64 +linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLEW -lGLU
  65  linux-g++:QMAKE_RPATHDIR += ../distrib
  66  linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon -lGLU
  67  linux-g++-32:QMAKE_RPATHDIR += ../distrib
  68 diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro
  69 --- meshlab-1.3.2/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro.sharedlib        2013-02-26 10:05:31.025983842 -0700
  70 +++ meshlab-1.3.2/meshlab/src/meshlabplugins/edit_arc3D/edit_arc3D.pro  2013-02-26 10:08:53.259977223 -0700
  71 @@ -32,16 +32,13 @@ RESOURCES     = edit_arc3D.qrc
  72  win32-msvc2005:LIBS       += ../../external/lib/win32-msvc2005/bz2.lib\r
  73  win32-msvc2008:LIBS       += ../../external/lib/win32-msvc2008/bz2.lib\r
  74  win32-g++:LIBS += ../../external/lib/win32-gcc/libbz2.a\r
  75 -linux-g++:LIBS += ../../external/lib/linux-g++/libbz2.a\r
  76 -linux-g++-32:LIBS      += ../../external/lib/linux-g++-32/libbz2.a\r
  77 -linux-g++-64:LIBS      += ../../external/lib/linux-g++-64/libbz2.a\r
  78 +linux-g++:LIBS += -lbz2\r
  79 +linux-g++-32:LIBS      += -lbz2\r
  80 +linux-g++-64:LIBS      += -lbz2\r
  81  \r
  82  win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5\r
  83  win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5\r
  84  win32-g++:INCLUDEPATH  += ../../external/bzip2-1.0.5\r
  85 -linux-g++:INCLUDEPATH  += ../../external/bzip2-1.0.5\r
  86 -linux-g++-32:INCLUDEPATH       += ../../external/bzip2-1.0.5\r
  87 -linux-g++-64:INCLUDEPATH       += ../../external/bzip2-1.0.5\r
  88  \r
  89  mac:LIBS   += -lbz2\r
  90  \r
  91 diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_func/filter_func.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_func/filter_func.pro
  92 --- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_func/filter_func.pro.sharedlib      2011-10-14 10:38:01.000000000 -0600
  93 +++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_func/filter_func.pro        2013-02-26 09:43:25.575027223 -0700
  94 @@ -6,15 +6,13 @@ SOURCES       += filter_func.cpp
  95  \r
  96  TARGET        = filter_func\r
  97  \r
  98 -INCLUDEPATH += ../../external/muparser_v132/include\r
  99 -\r
 100  # Note: we need static libs so when building muparser lib use \r
 101  # ./configure --enable-shared=no\r
 102  \r
 103  win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib\r
 104  win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib\r
 105  macx:LIBS            += $$MACLIBDIR/libmuparser.a\r
 106 -linux-g++:LIBS       += ../../external/lib/linux-g++/libmuparser.a\r
 107 +linux-g++:LIBS       += -lmuparser\r
 108  linux-g++-32:LIBS       += ../../external/lib/linux-g++-32/libmuparser.a\r
 109  linux-g++-64:LIBS       += ../../external/lib/linux-g++-64/libmuparser.a\r
 110  win32-g++:LIBS          += ../../external/lib/win32-gcc/libmuparser.a\r
 111 diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro
 112 --- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro.sharedlib  2011-10-14 10:37:59.000000000 -0600
 113 +++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro    2013-02-26 09:43:25.576027223 -0700
 114 @@ -23,8 +23,7 @@ HEADERS       += ./diamond_sampler.h \
 115  SOURCES       += ./filter_isoparametrization.cpp \r
 116                                 \r
 117  TARGET        = filter_isoparametrization\r
 118 -INCLUDEPATH  += ./  \\r
 119 -                ../../external/levmar-2.3/\r
 120 +INCLUDEPATH  += ./\r
 121  \r
 122  win32-msvc2005:QMAKE_CXXFLAGS   +=  /openmp -D_USE_OMP\r
 123  win32-msvc2008:QMAKE_CXXFLAGS   +=  /openmp -D_USE_OMP\r
 124 @@ -47,7 +46,7 @@ win32-msvc.net:LIBS   += ../../external/li
 125  win32-msvc2005:LIBS    += ../../external/lib/win32-msvc2005/levmar.lib\r
 126  win32-msvc2008:LIBS    += ../../external/lib/win32-msvc2008/levmar.lib\r
 127  win32-g++:LIBS         += -L../../external/lib/win32-gcc -llevmar\r
 128 -linux-g++:LIBS         += -L../../external/lib/linux-g++ -llevmar\r
 129 +linux-g++:LIBS         += -llevmar\r
 130  linux-g++-32:LIBS              += -L../../external/lib/linux-g++-32 -llevmar\r
 131  linux-g++-64:LIBS              += -L../../external/lib/linux-g++-64 -llevmar\r
 132  macx:LIBS += $$MACLIBDIR/liblevmar.a\r
 133 diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h
 134 --- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h.sharedlib       2011-10-14 10:37:59.000000000 -0600
 135 +++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h 2013-02-26 09:43:25.576027223 -0700
 136 @@ -14,7 +14,7 @@
 137
 138  #include <local_parametrization.h>
 139  #include <mesh_operators.h>
 140 -#include <lm.h>
 141 +#include <levmar.h>
 142  #include <uv_grid.h>
 143
 144  #include "opt_patch.h"
 145 diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h
 146 --- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h.sharedlib       2011-10-14 10:37:59.000000000 -0600
 147 +++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_isoparametrization/parametrizator.h 2013-02-26 09:43:25.577027223 -0700
 148 @@ -34,7 +34,7 @@
 149  #include <vcg/space/color4.h>
 150  #include <dual_coord_optimization.h>
 151  #include <float.h>
 152 -#include <lm.h>
 153 +#include <levmar.h>
 154  #ifndef _MESHLAB
 155  #include <wrap/io_trimesh/export_ply.h>
 156  #endif
 157 diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h
 158 --- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h.sharedlib     2012-05-30 07:57:47.000000000 -0600
 159 +++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/levmarmethods.h       2013-02-26 09:43:25.577027223 -0700
 160 @@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
 161  \r
 162  #include <list>\r
 163  \r
 164 -#include "../../external/levmar-2.3/lm.h"\r
 165 +#include <levmar.h>\r
 166  \r
 167  \r
 168  struct LevmarCorrelation {\r
 169 diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h
 170 --- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h.sharedlib    2012-05-30 07:57:47.000000000 -0600
 171 +++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_mutualinfoxml/solver.h      2013-02-26 09:43:25.578027223 -0700
 172 @@ -5,7 +5,7 @@
 173  #include "alignset.h"\r
 174  \r
 175  #include "parameters.h"\r
 176 -#include "../../external/levmar-2.3/lm.h"\r
 177 +#include <levmar.h>\r
 178  \r
 179  #include <iostream>\r
 180  #include <fstream>\r
 181 diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro
 182 --- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro.sharedlib  2011-10-14 10:35:23.000000000 -0600
 183 +++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_photosynth/filter_photosynth.pro    2013-02-26 09:43:25.579027223 -0700
 184 @@ -1,17 +1,15 @@
 185  include (../../shared.pri)
 186
 187 -QTSOAPDIR = ../../external/qtsoap-2.7_1/src
 188 -
 189 -INCLUDEPATH += $$QTSOAPDIR
 190 +INCLUDEPATH += /usr/include/QtSoap
 191
 192  HEADERS       += filter_photosynth.h \
 193 -                 synthData.h \
 194 -                 $$QTSOAPDIR/qtsoap.h
 195 +                 synthData.h
 196
 197  SOURCES       += filter_photosynth.cpp \
 198 -                 downloader.cpp \
 199 -                 $$QTSOAPDIR/qtsoap.cpp
 200 +                 downloader.cpp
 201
 202  TARGET         = filter_photosynth
 203
 204 +linux-g++:LIBS += -lqtsoap
 205 +
 206  QT += network
 207 diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro
 208 --- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro.sharedlib    2011-10-14 10:35:34.000000000 -0600
 209 +++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro      2013-02-26 09:43:25.580027223 -0700
 210 @@ -8,28 +8,8 @@ HEADERS       += filter_qhull.h \
 211  SOURCES       += filter_qhull.cpp \
 212                 qhull_tools.cpp
 213
 214 -HEADERS +=     ../../external/qhull-2003.1/src/geom.h \
 215 -               ../../external/qhull-2003.1/src/io.h \
 216 -               ../../external/qhull-2003.1/src/mem.h \
 217 -               ../../external/qhull-2003.1/src/merge.h \
 218 -               ../../external/qhull-2003.1/src/poly.h \
 219 -               ../../external/qhull-2003.1/src/qhull.h \
 220 -               ../../external/qhull-2003.1/src/qset.h \
 221 -               ../../external/qhull-2003.1/src/stat.h \
 222 -               ../../external/qhull-2003.1/src/user.h
 223 +INCLUDEPATH += /usr/include/qhull
 224
 225 -SOURCES +=     ../../external/qhull-2003.1/src/geom.c \
 226 -               ../../external/qhull-2003.1/src/geom2.c \
 227 -               ../../external/qhull-2003.1/src/global.c \
 228 -               ../../external/qhull-2003.1/src/io.c \
 229 -               ../../external/qhull-2003.1/src/mem.c \
 230 -               ../../external/qhull-2003.1/src/merge.c \
 231 -               ../../external/qhull-2003.1/src/poly.c \
 232 -               ../../external/qhull-2003.1/src/poly2.c \
 233 -               ../../external/qhull-2003.1/src/qconvex.c \
 234 -               ../../external/qhull-2003.1/src/qhull.c \
 235 -               ../../external/qhull-2003.1/src/qset.c \
 236 -               ../../external/qhull-2003.1/src/stat.c \
 237 -               ../../external/qhull-2003.1/src/user.c
 238 +LIBS += -lqhull
 239
 240 -TARGET        = filter_qhull
 241 \ No newline at end of file
 242 +TARGET        = filter_qhull
 243 diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h
 244 --- meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h.sharedlib       2011-10-14 10:35:34.000000000 -0600
 245 +++ meshlab-1.3.2/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h 2013-02-26 09:43:25.581027223 -0700
 246 @@ -55,14 +55,14 @@ extern "C"
 247  #endif\r
 248  #include <stdio.h>\r
 249  #include <stdlib.h>\r
 250 -#include "../../external/qhull-2003.1/src/qhull.h"\r
 251 -#include "../../external/qhull-2003.1/src/mem.h"\r
 252 -#include "../../external/qhull-2003.1/src/qset.h"\r
 253 -#include "../../external/qhull-2003.1/src/geom.h"\r
 254 -#include "../../external/qhull-2003.1/src/merge.h"\r
 255 -#include "../../external/qhull-2003.1/src/poly.h"\r
 256 -#include "../../external/qhull-2003.1/src/io.h"\r
 257 -#include "../../external/qhull-2003.1/src/stat.h"\r
 258 +#include <qhull/qhull.h>\r
 259 +#include <qhull/mem.h>\r
 260 +#include <qhull/qset.h>\r
 261 +#include <qhull/geom.h>\r
 262 +#include <qhull/merge.h>\r
 263 +#include <qhull/poly.h>\r
 264 +#include <qhull/io.h>\r
 265 +#include <qhull/stat.h>\r
 266  #if defined(__cplusplus)\r
 267  }\r
 268  #endif\r
 269 diff -up meshlab-1.3.2/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro
 270 --- meshlab-1.3.2/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro.sharedlib        2011-10-14 10:36:53.000000000 -0600
 271 +++ meshlab-1.3.2/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro  2013-02-26 09:43:25.582027223 -0700
 272 @@ -14,7 +14,7 @@ SOURCES       +=      meshio.cpp \
 273
 274  TARGET        = io_3ds
 275
 276 -INCLUDEPATH += ../../external/lib3ds-1.3.0/
 277 +INCLUDEPATH += /usr/include/lib3ds/
 278
 279  # Notes on the paths of lib3ds files.
 280  # Once you have compiled the library put the lib files in a dir named lib/XXX/
 281 @@ -25,9 +25,7 @@ win32-msvc.net:LIBS   += ../../external/li
 282  win32-msvc2005:LIBS    += ../../external/lib/win32-msvc2005/3ds.lib
 283  win32-msvc2008:LIBS    += ../../external/lib/win32-msvc2008/3ds.lib
 284  win32-g++:LIBS         += ../../external/lib/win32-gcc/lib3ds.a
 285 -linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a
 286 -linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a
 287 -linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a
 288 +linux-g++:LIBS += -l3ds
 289
 290  # unix:LIBS            += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds
 291
 292 diff -up meshlab-1.3.2/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib meshlab-1.3.2/meshlab/src/meshlabserver/meshlabserver.pro
 293 --- meshlab-1.3.2/meshlab/src/meshlabserver/meshlabserver.pro.sharedlib 2011-10-14 10:34:48.000000000 -0600
 294 +++ meshlab-1.3.2/meshlab/src/meshlabserver/meshlabserver.pro   2013-02-26 09:43:25.583027223 -0700
 295 @@ -1,5 +1,3 @@
 296 -GLEWDIR = ../external/glew-1.5.1
 297 -
 298  HEADERS        =
 299
 300  SOURCES        = mainserver.cpp
 301 @@ -25,12 +23,8 @@ win32-msvc2005:  LIBS += -L../distrib -l
 302  win32-msvc2008:  LIBS += -L../distrib -lcommon
 303  win32-msvc2010:  LIBS += -L../distrib -lcommon
 304  win32-g++:  LIBS += -L../distrib -lcommon
 305 -linux-g++:  LIBS += -L../distrib -lcommon
 306 +linux-g++:  LIBS += -L../distrib -lcommon -lGLEW
 307  linux-g++:QMAKE_RPATHDIR += ../distrib
 308 -linux-g++-32:  LIBS += -L../distrib -lcommon
 309 -linux-g++-32:QMAKE_RPATHDIR += ../distrib
 310 -linux-g++-64:  LIBS += -L../distrib -lcommon
 311 -linux-g++-64:QMAKE_RPATHDIR += ../distrib
 312  #CONFIG (release,debug | release) {
 313  #      win32-msvc2005:release:  LIBS += -L../common/release -lcommon
 314  #      win32-msvc2008:release:  LIBS += -L../common/release -lcommon
 315 @@ -43,7 +37,7 @@ win32-msvc2010:DEFINES += GLEW_STATIC
 316
 317  #DEFINES += GLEW_STATIC
 318
 319 -INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR/include
 320 +INCLUDEPATH += . .. ../../../vcglib
 321  CONFIG += stl
 322  CONFIG += console
 323
 324 diff -up meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h.sharedlib meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h
 325 --- meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h.sharedlib        2012-04-05 03:05:12.000000000 -0600
 326 +++ meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/levmarmethods.h  2013-02-26 09:43:25.583027223 -0700
 327 @@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
 328  \r
 329  #include <list>\r
 330  \r
 331 -#include "../../external/levmar-2.3/lm.h"\r
 332 +#include <levmar.h>\r
 333  \r
 334  \r
 335  struct LevmarCorrelation {\r
 336 diff -up meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/solver.h.sharedlib meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/solver.h
 337 --- meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/solver.h.sharedlib       2012-04-05 03:05:12.000000000 -0600
 338 +++ meshlab-1.3.2/meshlab/src/plugins_experimental/filter_mutualglobal/solver.h 2013-02-26 09:43:25.584027223 -0700
 339 @@ -5,7 +5,7 @@
 340  #include "alignset.h"\r
 341  \r
 342  #include "parameters.h"\r
 343 -#include "../../external/levmar-2.3/lm.h"\r
 344 +#include <levmar.h>\r
 345  \r
 346  #include <iostream>\r
 347  #include <fstream>\r
 348 diff -up meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_curvature_from_sliding/curvature_from_sliding.h.sharedlib meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_curvature_from_sliding/curvature_from_sliding.h
 349 --- meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_curvature_from_sliding/curvature_from_sliding.h.sharedlib      2011-10-14 10:30:46.000000000 -0600
 350 +++ meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_curvature_from_sliding/curvature_from_sliding.h        2013-02-26 09:43:25.585027223 -0700
 351 @@ -30,7 +30,7 @@
 352  #include <vcg/complex/allocate.h>
 353  #include <vcg/complex/algorithms/subset.h>
 354  #include <vcg/space/index/grid_static_ptr.h>
 355 -#include <lib/levmar/lm.h>
 356 +#include <levmar.h>
 357
 358  #include "frame.h"
 359
 360 @@ -313,4 +313,4 @@ static void eval_only_k( double *x,doubl
 361
 362  };// end of class
 363
 364 -}// end of subspace
 365 \ No newline at end of file
 366 +}// end of subspace
 367 diff -up meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/levmarmethods.h.sharedlib meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/levmarmethods.h
 368 --- meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/levmarmethods.h.sharedlib   2012-06-27 03:34:59.000000000 -0600
 369 +++ meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/levmarmethods.h     2013-02-26 09:43:25.620027222 -0700
 370 @@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
 371  \r
 372  #include <list>\r
 373  \r
 374 -#include "../../external/levmar-2.3/lm.h"\r
 375 +#include <levmar.h>\r
 376  \r
 377  \r
 378  struct LevmarCorrelation {\r
 379 diff -up meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/solver.h.sharedlib meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/solver.h
 380 --- meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/solver.h.sharedlib  2012-06-27 03:34:59.000000000 -0600
 381 +++ meshlab-1.3.2/meshlab/src/plugins_unsupported/filter_mutualinfo/solver.h    2013-02-26 09:43:25.621027222 -0700
 382 @@ -5,7 +5,7 @@
 383  #include "alignset.h"\r
 384  \r
 385  #include "parameters.h"\r
 386 -#include "../../external/levmar-2.3/lm.h"\r
 387 +#include <levmar.h>\r
 388  \r
 389  #include <iostream>\r
 390  #include <fstream>\r
 391 diff -up meshlab-1.3.2/meshlab/src/plugins_unsupported/io_epoch/io_epoch.pro.sharedlib meshlab-1.3.2/meshlab/src/plugins_unsupported/io_epoch/io_epoch.pro
 392 --- meshlab-1.3.2/meshlab/src/plugins_unsupported/io_epoch/io_epoch.pro.sharedlib       2013-02-26 10:07:51.957979230 -0700
 393 +++ meshlab-1.3.2/meshlab/src/plugins_unsupported/io_epoch/io_epoch.pro 2013-02-26 10:08:26.850978087 -0700
 394 @@ -30,16 +30,13 @@ QT           += xml
 395  win32-msvc2005:LIBS       += ../../external/lib/win32-msvc2005/bz2.lib\r
 396  win32-msvc2008:LIBS       += ../../external/lib/win32-msvc2008/bz2.lib\r
 397  win32-g++:LIBS += ../../external/lib/win32-gcc/libbz2.a\r
 398 -linux-g++:LIBS += ../../external/lib/linux-g++/libbz2.a\r
 399 -linux-g++-32:LIBS      += ../../external/lib/linux-g++-32/libbz2.a\r
 400 -linux-g++-64:LIBS      += ../../external/lib/linux-g++-64/libbz2.a\r
 401 +linux-g++:LIBS += -lbz2\r
 402 +linux-g++-32:LIBS      += -lbz2\r
 403 +linux-g++-64:LIBS      += -lbz2\r
 404  \r
 405  win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5\r
 406  win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5\r
 407  win32-g++:INCLUDEPATH  += ../../external/bzip2-1.0.5\r
 408 -linux-g++:INCLUDEPATH  += ../../external/bzip2-1.0.5\r
 409 -linux-g++-32:INCLUDEPATH       += ../../external/bzip2-1.0.5\r
 410 -linux-g++-64:INCLUDEPATH       += ../../external/bzip2-1.0.5\r
 411  \r
 412  mac:LIBS   += -lbz2\r
 413  \r