Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (658e6d33533c802f4211f87ea6d4306ac050dc8e)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ladislav Hagara <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (658e6d33533c802f4211f87ea6d4306ac050dc8e)
  • Date: Mon, 15 Oct 2012 19:55:45 -0500

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

ChangeLog | 3 +++
graphics/meshlab/BUILD | 10 ++++++++++
graphics/meshlab/DEPENDS | 1 +
graphics/meshlab/DETAILS | 15 +++++++++++++++
graphics/meshlab/HISTORY | 3 +++
graphics/meshlab/INSTALL | 4 ++++
graphics/meshlab/PRE_BUILD | 6 ++++++
graphics/meshlab/gcc-4.7.patch | 38 ++++++++++++++++++++++++++++++++++++++
graphics/meshlab/rpath.patch | 36 ++++++++++++++++++++++++++++++++++++
9 files changed, 116 insertions(+)

New commits:
commit 658e6d33533c802f4211f87ea6d4306ac050dc8e
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

graphics/meshlab: new spell, advanced mesh processing system

diff --git a/ChangeLog b/ChangeLog
index 87cd7f2..de3efd2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2012-10-16 Ladislav Hagara <hgr AT vabo.cz>
+ * graphics/meshlab: new spell, advanced mesh processing system
+
2012-10-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* graphics/rawtherapee: new spell, a RAW image developmer

diff --git a/graphics/meshlab/BUILD b/graphics/meshlab/BUILD
new file mode 100755
index 0000000..8845c7f
--- /dev/null
+++ b/graphics/meshlab/BUILD
@@ -0,0 +1,10 @@
+QTDIR="${QTDIR:-$INSTALL_ROOT/usr}" &&
+PATH="$QTDIR/bin/qt4:$PATH" &&
+
+cd meshlab/src/external &&
+qmake PREFIX=$INSTALL_ROOT/usr -recursive external.pro &&
+make &&
+
+cd .. &&
+qmake PREFIX=$INSTALL_ROOT/usr -recursive meshlab_full.pro &&
+make
diff --git a/graphics/meshlab/DEPENDS b/graphics/meshlab/DEPENDS
new file mode 100755
index 0000000..428f269
--- /dev/null
+++ b/graphics/meshlab/DEPENDS
@@ -0,0 +1 @@
+depends qt4
diff --git a/graphics/meshlab/DETAILS b/graphics/meshlab/DETAILS
new file mode 100755
index 0000000..b1657cf
--- /dev/null
+++ b/graphics/meshlab/DETAILS
@@ -0,0 +1,15 @@
+ SPELL=meshlab
+ VERSION=1.3.2
+ SOURCE=MeshLabSrc_AllInc_v${VERSION//.}.tgz
+ SOURCE_URL[0]=$SOURCEFORGE_URL/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:40ef1f887d18e2146d6001d9c290bb76f6fc27caf13a1256a4061d5e2c43fd8dfdc843ace2cb83c6370648c2c5be3a22e2d5b31698df46e0695890d6a20651ac
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
+ WEB_SITE=http://meshlab.sourceforge.net/
+ LICENSE[0]=GPL
+ ENTERED=20121016
+ SHORT="advanced mesh processing system"
+cat << EOF
+MeshLab is a advanced mesh processing system, for the automatic and user
+assisted editing, cleaning, filtering converting and rendering of large
+unstructured 3D triangular meshes.
+EOF
diff --git a/graphics/meshlab/HISTORY b/graphics/meshlab/HISTORY
new file mode 100644
index 0000000..da23d9f
--- /dev/null
+++ b/graphics/meshlab/HISTORY
@@ -0,0 +1,3 @@
+2012-10-16 Ladislav Hagara <hgr AT vabo.cz>
+ * DETAILS, DEPENDS, PRE_BUILD, BUILD, INSTALL, gcc-4.7.patch,
+ rpath.patch: spell created, version 1.3.2, patches from Arch
diff --git a/graphics/meshlab/INSTALL b/graphics/meshlab/INSTALL
new file mode 100755
index 0000000..00d5194
--- /dev/null
+++ b/graphics/meshlab/INSTALL
@@ -0,0 +1,4 @@
+mkdir -p /opt/meshlab &&
+cp -a distrib /opt/meshlab &&
+ln -s /opt/meshlab/distrib/meshlab /usr/bin/meshlab &&
+ln -s /opt/meshlab/distrib/meshlabserver /usr/bin/meshlabserver
diff --git a/graphics/meshlab/PRE_BUILD b/graphics/meshlab/PRE_BUILD
new file mode 100755
index 0000000..4a5f0e6
--- /dev/null
+++ b/graphics/meshlab/PRE_BUILD
@@ -0,0 +1,6 @@
+mk_source_dir $SOURCE_DIRECTORY &&
+cd $SOURCE_DIRECTORY &&
+unpack_file &&
+
+patch -p1 < $SPELL_DIRECTORY/gcc-4.7.patch &&
+patch -p0 < $SPELL_DIRECTORY/rpath.patch
diff --git a/graphics/meshlab/gcc-4.7.patch b/graphics/meshlab/gcc-4.7.patch
new file mode 100644
index 0000000..07dc1a0
--- /dev/null
+++ b/graphics/meshlab/gcc-4.7.patch
@@ -0,0 +1,38 @@
+diff --git a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
+index 2351b2a..90c6d76 100644
+--- a/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
++++ b/meshlab/src/meshlabplugins/decorate_base/colorhistogram.h
+@@ -40,7 +40,7 @@ public:
+
+ //! Reset histogram data.
+ void Clear() {
+- this->::Clear();
++ Histogram<ScalarType>::Clear();
+ CV.clear();
+ }
+ /*
+diff --git a/vcglib/wrap/gl/trimesh.h b/vcglib/wrap/gl/trimesh.h
+index 5d40404..ab9d0aa 100644
+--- a/vcglib/wrap/gl/trimesh.h
++++ b/vcglib/wrap/gl/trimesh.h
+@@ -1003,7 +1003,7 @@ void Crease(MESH_TYPE &m, typename
MESH_TYPE::scalar_type angleRad)
+ }
+ }
+
+- m.vert.math::Swap(newvert);
++ m.vert.math.Swap(newvert);
+ m.vn=m.vert.size();
+ }
+
+diff --git a/vcglib/wrap/ply/plystuff.h b/vcglib/wrap/ply/plystuff.h
+index 3e41e63..4af9508 100644
+--- a/vcglib/wrap/ply/plystuff.h
++++ b/vcglib/wrap/ply/plystuff.h
+@@ -75,6 +75,7 @@ using namespace vcg;
+ #define pb_close _close
+ #define DIR_SEP "\\"
+ #else
++#include <unistd.h>
+ #define pb_mkdir(n) mkdir(n,0755)
+ #define pb_access access
+ #define pb_stat stat
diff --git a/graphics/meshlab/rpath.patch b/graphics/meshlab/rpath.patch
new file mode 100644
index 0000000..07e91a0
--- /dev/null
+++ b/graphics/meshlab/rpath.patch
@@ -0,0 +1,36 @@
+diff -Nur meshlab.orig/src/meshlab/meshlab.pro
meshlab/src/meshlab/meshlab.pro
+--- meshlab.orig/src/meshlab/meshlab.pro 2012-05-31 00:32:44.000000000
+1000
++++ meshlab/src/meshlab/meshlab.pro 2012-08-06 21:26:01.405784190 +1000
+@@ -130,11 +130,11 @@
+ #}
+
+ linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon
-lGLU
+-linux-g++:QMAKE_RPATHDIR += ../distrib
++linux-g++:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
+ linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -L../distrib -lcommon
-lGLU
+-linux-g++-32:QMAKE_RPATHDIR += ../distrib
++linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
+ linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -L../distrib -lcommon
-lGLU
+-linux-g++-64:QMAKE_RPATHDIR += ../distrib
++linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
+
+ # uncomment in your local copy only in emergency cases.
+ # We should never be too permissive
+diff -Nur meshlab.orig/src/meshlabserver/meshlabserver.pro
meshlab/src/meshlabserver/meshlabserver.pro
+--- meshlab.orig/src/meshlabserver/meshlabserver.pro 2011-10-15
03:34:48.000000000 +1100
++++ meshlab/src/meshlabserver/meshlabserver.pro 2012-08-06
21:26:34.609557938 +1000
+@@ -26,11 +26,11 @@
+ win32-msvc2010: LIBS += -L../distrib -lcommon
+ win32-g++: LIBS += -L../distrib -lcommon
+ linux-g++: LIBS += -L../distrib -lcommon
+-linux-g++:QMAKE_RPATHDIR += ../distrib
++linux-g++:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
+ linux-g++-32: LIBS += -L../distrib -lcommon
+-linux-g++-32:QMAKE_RPATHDIR += ../distrib
++linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
+ linux-g++-64: LIBS += -L../distrib -lcommon
+-linux-g++-64:QMAKE_RPATHDIR += ../distrib
++linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
+ #CONFIG (release,debug | release) {
+ # win32-msvc2005:release: LIBS += -L../common/release -lcommon
+ # win32-msvc2008:release: LIBS += -L../common/release -lcommon



  • [SM-Commit] GIT changes to master grimoire by Ladislav Hagara (658e6d33533c802f4211f87ea6d4306ac050dc8e), Ladislav Hagara, 10/15/2012

Archive powered by MHonArc 2.6.24.

Top of Page