meshlab/src/fgt/filter_func/filter_func.pro | 6 2 + 4 - 0 !
1 file changed, 2 insertions(+), 4 deletions(-)

 use debian muparser.
X-git-branch: p/muparser

 meshlab/src/fgt/filter_func/filter_func.pro |    6 ++

meshlab/src/fgt/filter_qhull/filter_qhull.pro | 26 2 + 24 - 0 !
meshlab/src/fgt/filter_qhull/qhull_tools.h | 18 9 + 9 - 0 !
2 files changed, 11 insertions(+), 33 deletions(-)

 use debian qhull.
X-git-branch: p/qhull

 meshlab/src/fgt/filter_qhull/filter_qhull.pro |   26 +

meshlab/src/meshlabplugins/io_3ds/io_3ds.pro | 6 2 + 4 - 0 !
1 file changed, 2 insertions(+), 4 deletions(-)

 use debian lib3ds.
X-git-branch: p/lib3ds

 meshlab/src/meshlabplugins/io_3ds/io_3ds.pro |    6 ++

meshlab/src/meshlabplugins/io_epoch/io_epoch.pro | 8 2 + 6 - 0 !
1 file changed, 2 insertions(+), 6 deletions(-)

 use debian libbz2.
X-git-branch: p/libbz2

 meshlab/src/meshlabplugins/io_epoch/io_epoch.pro |    8 ++

meshlab/src/common/common.pro | 8 4 + 4 - 0 !
meshlab/src/meshlab/meshlab.pro | 7 2 + 5 - 0 !
meshlab/src/meshlabplugins/filter_plymc/plymc.pro | 2 1 + 1 - 0 !
meshlab/src/meshlabserver/meshlabserver.pro | 6 2 + 4 - 0 !
meshlab/src/shared.pri | 11 6 + 5 - 0 !
vcglib/apps/sample/trimesh_QT/trimesh_qt.pro | 5 3 + 2 - 0 !
vcglib/apps/sample/trimesh_pos_demo/trimesh_pos_demo.pro | 4 2 + 2 - 0 !
7 files changed, 20 insertions(+), 23 deletions(-)

 use debian glew.
X-git-branch: p/glew

 meshlab/src/common/common.pro                      |    8 

meshlab/src/shared.pri | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

meshlab/src/shared.pri | 3 2 + 1 - 0 !
vcglib/vcg/complex/trimesh/update/curvature_fitting.h | 8 4 + 4 - 0 !
vcglib/vcg/math/eigen.h | 8 4 + 4 - 0 !
3 files changed, 10 insertions(+), 9 deletions(-)

 use debian eigen.
X-git-branch: p/eigen

 meshlab/src/shared.pri                             |    3 ++-
 .../vcg/complex/trimesh/update/curvature_fitting.h |    8 

meshlab/src/meshlab/mainwindow_Init.cpp | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 disable checking for updates on startup.
X-git-branch: p/disable-updates

 meshlab/src/meshlab/mainwindow_Init.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meshlab/src/external/external.pro | 6 1 + 5 - 0 !
1 file changed, 1 insertion(+), 5 deletions(-)

 only build necessary external sources.
X-git-branch: p/externals

 meshlab/src/external/external.pro |    6 +

meshlab/src/meshlab/meshlab.pro | 5 4 + 1 - 0 !
meshlab/src/meshlabserver/meshlabserver.pro | 4 3 + 1 - 0 !
2 files changed, 7 insertions(+), 2 deletions(-)

---

meshlab/src/meshlab/meshlab.pro | 4 1 + 3 - 0 !
meshlab/src/meshlabserver/meshlabserver.pro | 4 1 + 3 - 0 !
2 files changed, 2 insertions(+), 6 deletions(-)

 use /usr/lib/meshlab as rpath in binaries.
X-git-branch: p/rpath

 meshlab/src/meshlab/meshlab.pro             |    4 +

meshlab/src/fgt/render_rfx/render_rfx.cpp | 2 1 + 1 - 0 !
meshlab/src/meshlabplugins/filter_ao/filter_ao.cpp | 2 1 + 1 - 0 !
meshlab/src/meshlabplugins/render_gdp/meshrender.cpp | 2 1 + 1 - 0 !
meshlab/src/meshlabplugins/render_gdp/shaderDialog.cpp | 2 1 + 1 - 0 !
meshlab/src/meshlabplugins/render_splatpyramid/dialog.cpp | 2 1 + 1 - 0 !
meshlab/src/old/render_rm/rmmeshrender.cpp | 2 1 + 1 - 0 !
6 files changed, 6 insertions(+), 6 deletions(-)

 hardcode shadersdir to the correct path in debian in various plugins
X-git-branch: p/shadersdir

 meshlab/src/fgt/render_rfx/render_rfx.cpp          |    2 +-
 meshlab/src/meshlabplugins/filter_ao/filter_ao.cpp |    2 +-
 .../src/meshlabplugins/render_gdp/meshrender.cpp   |    2 +-
 .../src/meshlabplugins/render_gdp/shaderDialog.cpp |    2 +-
 .../meshlabplugins/render_splatpyramid/dialog.cpp  |    2 +-
 meshlab/src/old/render_rm/rmmeshrender.cpp         |    2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

meshlab/src/common/pluginmanager.cpp | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 hardcode pluginsdir to the correct path in debian
X-git-branch: p/pluginsdir

 meshlab/src/common/pluginmanager.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

meshlab/src/meshlab/main.cpp | 4 4 + 0 - 0 !
1 file changed, 4 insertions(+)

 set lc_numeric to "c"
X-git-branch: p/ply_numeric

Fixes reading of ascii float values in locales which use the comma as a
float separator.

 meshlab/src/meshlab/main.cpp |    4 

vcglib/wrap/io_tetramesh/import_ply.h | 1 1 + 0 - 0 !
vcglib/wrap/io_trimesh/import_ply.h | 1 1 + 0 - 0 !
vcglib/wrap/ply/plystuff.h | 1 1 + 0 - 0 !
3 files changed, 3 insertions(+)

 include <cstddef> on files using offsetoff (closes: #625053)
X-git-branch: p/cstddef

 vcglib/wrap/io_tetramesh/import_ply.h |    1 +
 vcglib/wrap/io_trimesh/import_ply.h   |    1 +
 vcglib/wrap/ply/plystuff.h            |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/EngineWidget.h | 1 1 + 0 - 0 !
meshlab/src/external/structuresynth/ssynth/SyntopiaCore/GLEngine/Sphere.h | 1 1 + 0 - 0 !
meshlab/src/external/structuresynth/structuresynth.pro | 1 1 + 0 - 0 !
3 files changed, 3 insertions(+)

 include glu.h where needed in included structure-synth code.
X-git-branch: p/structuresynth

Also link structuresynth code with libGLU.

This FTBS was exposed by GCC-4.7. See Debian bug #672000 for the same
issue in the real structure-synth Debian package.

 .../ssynth/SyntopiaCore/GLEngine/EngineWidget.h    |    1 +
 .../ssynth/SyntopiaCore/GLEngine/Sphere.h          |    1 +
 .../src/external/structuresynth/structuresynth.pro |    1 +
 3 files changed, 3 insertions(+), 0 deletions(-)

meshlab/src/fgt/filter_trioptimize/curvedgeflip.h | 2 1 + 1 - 0 !
meshlab/src/meshlabplugins/decorate_base/colorhistogram.h | 6 3 + 3 - 0 !
meshlab/src/meshlabplugins/filter_isoparametrization/param_collapse.h | 6 3 + 3 - 0 !
meshlab/src/meshlabplugins/filter_meshing/quadric_tex_simp.h | 4 2 + 2 - 0 !
meshlab/src/meshlabplugins/filter_plymc/tri_edge_collapse_mc.h | 2 1 + 1 - 0 !
vcglib/vcg/complex/local_optimization/tri_edge_collapse.h | 4 2 + 2 - 0 !
vcglib/vcg/complex/local_optimization/tri_edge_collapse_quadric.h | 4 2 + 2 - 0 !
vcglib/vcg/complex/local_optimization/tri_edge_flip.h | 8 4 + 4 - 0 !
vcglib/vcg/math/lin_algebra.h | 14 7 + 7 - 0 !
vcglib/vcg/space/index/grid_static_obj.h | 6 3 + 3 - 0 !
vcglib/vcg/space/index/octree.h | 8 4 + 4 - 0 !
vcglib/vcg/space/index/spatial_hashing.h | 4 2 + 2 - 0 !
vcglib/wrap/gl/trimesh.h | 2 1 + 1 - 0 !
vcglib/wrap/ply/plystuff.h | 1 1 + 0 - 0 !
14 files changed, 36 insertions(+), 35 deletions(-)

 fix ftbfs with gcc-4.7
X-git-branch: p/gcc47

Closes: #667276

Thanks to Matej Vela for the patch.

 meshlab/src/fgt/filter_trioptimize/curvedgeflip.h  |    2 +-
 .../meshlabplugins/decorate_base/colorhistogram.h  |    6 

meshlab/src/meshlab/meshlab.pro | 5 1 + 4 - 0 !
meshlab/src/meshlabserver/meshlabserver.pro | 4 1 + 3 - 0 !
2 files changed, 2 insertions(+), 7 deletions(-)

---