diff options
author | 2012-01-14 19:23:54 +0100 | |
---|---|---|
committer | 2012-01-14 19:23:54 +0100 | |
commit | 8f037e7122a72a8d5300b260408ba6387aa243b7 (patch) | |
tree | 2ab123a20e6dc471acdfd5b56efd68cbb5403754 | |
parent | openctm fix manifest (diff) | |
download | mistafunk-8f037e7122a72a8d5300b260408ba6387aa243b7.tar.gz mistafunk-8f037e7122a72a8d5300b260408ba6387aa243b7.tar.bz2 mistafunk-8f037e7122a72a8d5300b260408ba6387aa243b7.zip |
update to meshlab 1.3.1
-rw-r--r-- | media-gfx/meshlab/Manifest | 4 | ||||
-rw-r--r-- | media-gfx/meshlab/files/meshlab-1.3.1-unbundle-libs-and-fix-rpath.patch | 336 | ||||
-rw-r--r-- | media-gfx/meshlab/meshlab-1.3.1.ebuild | 61 |
3 files changed, 401 insertions, 0 deletions
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest index 9c5243c..8cfb50d 100644 --- a/media-gfx/meshlab/Manifest +++ b/media-gfx/meshlab/Manifest @@ -1,7 +1,9 @@ AUX meshlab-1.2.3a-r5-use-system-libs-rpath.patch 14603 RMD160 68c32a0ef39af483d6d4a51617a883655a5ce9b7 SHA1 a95029a530ac1880c41862b36f81dc0d5a9fa1b5 SHA256 99ae7c3d91f45cca5dbfdb81045316efa397b3f3864b9d2b97866a3abaeef5a6 AUX meshlab-1.3.0a-unbundle-libs-and-fix-rpath.patch 14382 RMD160 805216bf950b6cb29719357bb9e75a815366dac3 SHA1 7a5ee33b5b5559ea91682e9e790012cd6fa72259 SHA256 e2d5915ff511dab717dfec9bf0113d7a75ce3649b878dcf9f994133bb8dbc61a +AUX meshlab-1.3.1-unbundle-libs-and-fix-rpath.patch 15307 RMD160 8b1447b1abf1286a72fb396c8b7c21503794cc12 SHA1 bfc4c4403d6f64ca9948cf80b6d3262ec22a4897 SHA256 abaa233e4d49e122df0222b883e81b9e3588e3ef643dab08cf3360bed186ae0c DIST MeshLabSrc_AllInc_v123a.tgz 11126723 RMD160 6443582eaefb2c98496914fbf1836bbebbb599da SHA1 17c5af3cd07b7c131d9e387e85337d50b7180a20 SHA256 3b515ddde7ff24a14ba32e3cbc755661cd7d58a4a2a467133d59fad001168427 DIST MeshLabSrc_AllInc_v130a.tgz 12119277 RMD160 1d99dd52ecbfd1d8298182cbe7e799e6d5f91f8b SHA1 cc73758763a07036a768723ce7b95ae0bc5da038 SHA256 42404620bcb4fa8d3dc9576494343369feef4c2cc3d191f0007dbd530395ba5c +DIST MeshLabSrc_AllInc_v131.tgz 11442683 RMD160 694873737fcbbef024d4acb57e8f2ac9581edcf4 SHA1 5b177a71e12701142ce2121166ba8add56a738d7 SHA256 bbf93748ecd947095a4bd5af8e18531eca39a8c2a546108004f1382a3bc6521e EBUILD meshlab-1.2.3a-r1.ebuild 2150 RMD160 5ce5ae8ba2376589d5f62d921d061918d3f6deb7 SHA1 773f1008935e96b25d532c99d413fd60ed4ab707 SHA256 9acf13509e08476320eeeae20c001cd83be0c98918ec3a1734fe8e1029f20d9c EBUILD meshlab-1.2.3a-r2.ebuild 1753 RMD160 cb8bc2fdf8c4bc61c27931001b7aee28b6545c99 SHA1 91a1832d16cdd2d92190d90c9ce5fd812dcddc92 SHA256 6681563e2dff004a70fec1be1b9efa3a925d318bbb222f0445079702666b3898 EBUILD meshlab-1.2.3a-r3.ebuild 1438 RMD160 088a7067ab8a94387e939d9278bf85c1e3985c0e SHA1 ee34bf62ef9d52b44604fe9fdaf195437b75f9f2 SHA256 e2fcecdef23fc803f0c07d2e79ffef1d467af48470dffd930aa5e16b2404ea2a @@ -9,5 +11,7 @@ EBUILD meshlab-1.2.3a-r4.ebuild 1435 RMD160 307f6441db280c1c6ba9c8996e99c5d52ead EBUILD meshlab-1.2.3a-r5.ebuild 1452 RMD160 2f7023da74ebdef6472d9358994c43c335c114d8 SHA1 9a6bbe71ec428c3b42e2b05cb5cca7aa1688592e SHA256 f3c37360a5725bee88ff0ef01b85030067ba39150528dbd433d134f56c363de1 EBUILD meshlab-1.2.3a-r6.ebuild 1444 RMD160 3c942e743b92b1117abfaa6d3b5d1764088e5c3a SHA1 b1f6436404ecb7a8f823132bba6810ed9c5f852b SHA256 1c6ed65b8b7d8086f4674a904bbb729234facbfff9dff93881a45786780be390 EBUILD meshlab-1.3.0a.ebuild 1511 RMD160 3f04a6aa33894a2ef6b97c131d2965d6a85a2086 SHA1 90eeb8293eecd2037cd79aa4de55c7d004cdafce SHA256 af1d37786cede496bc32eee72fa9fdb14d1f51a8e98fdc634245f22dc671ffbc +EBUILD meshlab-1.3.1.ebuild 1510 RMD160 a69d2b4805d829e88ef9532aa0f2e789466c6cdc SHA1 0fa58375f5715fb28b5337bd389867e924fc12e6 SHA256 f12dcfd2e8353bb27483867aff6a8e1933a3efa41e784d4800f831a60df43bef MISC ChangeLog 3658 RMD160 b46694ce0f8a7327a112d7d3749e5a5ec3c3e979 SHA1 4a4463924f20d3c15763455a66c9b05ff1c4a292 SHA256 140d10ec72e83274e3a844b6796f4abce81528c0adef66c628deaea8e5587e3c +MISC meshlab-1.3.1.ebuild~ 1516 RMD160 5608860c3e620bd314666825670fa92b4f609052 SHA1 7d3e037e3b811cae784b752b95025638fccbd66d SHA256 cb057a388c9c6ff2595e64c862a9058b5868ea619c990808f1fde3d9d708d21b MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5 diff --git a/media-gfx/meshlab/files/meshlab-1.3.1-unbundle-libs-and-fix-rpath.patch b/media-gfx/meshlab/files/meshlab-1.3.1-unbundle-libs-and-fix-rpath.patch new file mode 100644 index 0000000..497e9de --- /dev/null +++ b/media-gfx/meshlab/files/meshlab-1.3.1-unbundle-libs-and-fix-rpath.patch @@ -0,0 +1,336 @@ +diff -urN MeshLabSrc_AllInc_v131/meshlab/src/common/common.pro MeshLabSrc_AllInc_v131_patched/meshlab/src/common/common.pro +--- MeshLabSrc_AllInc_v131/meshlab/src/common/common.pro 2011-09-14 12:42:54.000000000 +0200 ++++ MeshLabSrc_AllInc_v131_patched/meshlab/src/common/common.pro 2012-01-14 17:46:14.572172601 +0100 +@@ -1,6 +1,5 @@ + VCGDIR = ../../../vcglib +-GLEWDIR = ../external/glew-1.5.1 +-GLEWCODE = $$GLEWDIR/src/glew.c ++GLEWDIR = /usr/include/GL + + + win32-msvc2005:DESTDIR = ../distrib +@@ -37,7 +36,7 @@ + cp libcommon.* ../distrib/meshlab.app/Contents/MacOS/" + INCLUDEPATH *= ../.. \ + $$VCGDIR \ +- $$GLEWDIR/include ++ $$GLEWDIR + TEMPLATE = lib + linux-g++:CONFIG += dll + linux-g++:DESTDIR = ../distrib +@@ -86,7 +85,6 @@ + scriptinterface.cpp \ + xmlfilterinfo.cpp \ + mlapplication.cpp \ +- $$GLEWCODE \ + meshlabdocumentxml.cpp + + # win32-msvc2005: RCC_DIR = $(ConfigurationName) +diff -urN MeshLabSrc_AllInc_v131/meshlab/src/external/external.pro MeshLabSrc_AllInc_v131_patched/meshlab/src/external/external.pro +--- MeshLabSrc_AllInc_v131/meshlab/src/external/external.pro 2011-09-15 18:29:13.000000000 +0200 ++++ MeshLabSrc_AllInc_v131_patched/meshlab/src/external/external.pro 2012-01-14 17:47:01.351175349 +0100 +@@ -2,10 +2,4 @@ + + TEMPLATE = subdirs + +-SUBDIRS = lib3ds-1.3.0/lib3ds \ +- bzip2-1.0.5/bzip2-1.0.5.pro \ +- muparser_v132/src \ +- levmar-2.3/levmar-2.3.pro \ +- structuresynth/structuresynth.pro \ +- OpenCTM-1.0.3/openctm.pro +-# openkinect/openkinect.pro ++SUBDIRS = structuresynth/structuresynth.pro +diff -urN MeshLabSrc_AllInc_v131/meshlab/src/meshlab/meshlab.pro MeshLabSrc_AllInc_v131_patched/meshlab/src/meshlab/meshlab.pro +--- MeshLabSrc_AllInc_v131/meshlab/src/meshlab/meshlab.pro 2011-06-06 09:47:12.000000000 +0200 ++++ MeshLabSrc_AllInc_v131_patched/meshlab/src/meshlab/meshlab.pro 2012-01-14 17:55:49.105206353 +0100 +@@ -1,5 +1,5 @@ + VCGDIR = ../../../vcglib +-GLEWDIR = ../external/glew-1.5.1 ++GLEWDIR = /usr/include/GL + #CONFIG += debug_and_release + DESTDIR = ../distrib + +@@ -8,7 +8,7 @@ + # CONFIG += warn_off + INCLUDEPATH *= ../.. \ + $$VCGDIR \ +- $$GLEWDIR/include ++ $$GLEWDIR + DEPENDPATH += $$VCGDIR \ + $$VCGDIR/vcg \ + $$VCGDIR/wrap +@@ -108,7 +108,7 @@ + INCLUDEPATH += . \ + .. \ + ../../../vcglib \ +- $$GLEWDIR/include ++ $$GLEWDIR + CONFIG += stl + + macx:LIBS += ../common/libcommon.dylib +@@ -128,12 +128,12 @@ + # win32-g++:release:LIBS += -L../common/release -lcommon + #} + +-linux-g++:LIBS += -L../distrib -lcommon +-linux-g++:QMAKE_RPATHDIR += ../distrib +-linux-g++-32:LIBS += -L../distrib -lcommon +-linux-g++-32:QMAKE_RPATHDIR += ../distrib +-linux-g++-64:LIBS += -L../distrib -lcommon +-linux-g++-64:QMAKE_RPATHDIR += ../distrib ++linux-g++:LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW ++linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab ++linux-g++-32:LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW ++linux-g++-32:QMAKE_RPATHDIR += ../usr/lib/meshlab ++linux-g++-64:LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW ++linux-g++-64:QMAKE_RPATHDIR += /usr/lib/meshlab + + + # uncomment in your local copy only in emergency cases. +diff -urN MeshLabSrc_AllInc_v131/meshlab/src/meshlab_full.pro MeshLabSrc_AllInc_v131_patched/meshlab/src/meshlab_full.pro +--- MeshLabSrc_AllInc_v131/meshlab/src/meshlab_full.pro 2011-09-15 17:08:56.000000000 +0200 ++++ MeshLabSrc_AllInc_v131_patched/meshlab/src/meshlab_full.pro 2012-01-14 19:11:10.736471988 +0100 +@@ -9,7 +9,7 @@ + meshlabplugins/io_3ds\ + meshlabplugins/io_bre\ + meshlabplugins/io_collada \ +- meshlabplugins/io_ctm \ ++ #meshlabplugins/io_ctm \ + meshlabplugins/io_epoch \ + meshlabplugins/io_json \ + meshlabplugins/io_u3d\ +diff -urN MeshLabSrc_AllInc_v131/meshlab/src/meshlabplugins/filter_func/filter_func.pro MeshLabSrc_AllInc_v131_patched/meshlab/src/meshlabplugins/filter_func/filter_func.pro +--- MeshLabSrc_AllInc_v131/meshlab/src/meshlabplugins/filter_func/filter_func.pro 2011-06-06 09:47:26.000000000 +0200 ++++ MeshLabSrc_AllInc_v131_patched/meshlab/src/meshlabplugins/filter_func/filter_func.pro 2012-01-14 17:49:34.821184365 +0100 +@@ -14,7 +14,7 @@ + win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib
+ win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib
+ macx:LIBS += ../../external/lib/macx/libmuparser.a
+-linux-g++:LIBS += ../../external/lib/linux-g++/libmuparser.a
+-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libmuparser.a
+-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libmuparser.a
++linux-g++:LIBS += -lmuparser
++linux-g++-32:LIBS += -lmuparser
++linux-g++-64:LIBS += -lmuparser
+ win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a
+diff -urN MeshLabSrc_AllInc_v131/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro MeshLabSrc_AllInc_v131_patched/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro +--- MeshLabSrc_AllInc_v131/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro 2011-06-06 09:47:26.000000000 +0200 ++++ MeshLabSrc_AllInc_v131_patched/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro 2012-01-14 17:57:02.697210676 +0100 +@@ -24,7 +24,7 @@ +
+ TARGET = filter_isoparametrization
+ INCLUDEPATH += ./ \
+- ../../external/levmar-2.3/
++ /usr/include/levmar
+
+ win32-msvc2005:QMAKE_CXXFLAGS += /openmp -D_USE_OMP
+ win32-msvc2008:QMAKE_CXXFLAGS += /openmp -D_USE_OMP
+@@ -41,9 +41,9 @@ + win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/levmar.lib
+ win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/levmar.lib
+ win32-g++:LIBS += -L../../external/lib/win32-gcc -llevmar
+-linux-g++:LIBS += -L../../external/lib/linux-g++ -llevmar
+-linux-g++-32:LIBS += -L../../external/lib/linux-g++-32 -llevmar
+-linux-g++-64:LIBS += -L../../external/lib/linux-g++-64 -llevmar
++linux-g++:LIBS += -llevmar
++linux-g++-32:LIBS += -llevmar
++linux-g++-64:LIBS += -llevmar
+ macx:LIBS += ../../../src/external/lib/macx/liblevmar.a
+
+ # Please never ever uncomment this...
+diff -urN MeshLabSrc_AllInc_v131/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro MeshLabSrc_AllInc_v131_patched/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro +--- MeshLabSrc_AllInc_v131/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro 2011-06-06 09:47:14.000000000 +0200 ++++ MeshLabSrc_AllInc_v131_patched/meshlab/src/meshlabplugins/filter_qhull/filter_qhull.pro 2012-01-14 17:51:31.504191220 +0100 +@@ -8,28 +8,13 @@ + SOURCES += filter_qhull.cpp \ + qhull_tools.cpp + +-HEADERS += ../../external/qhull-2003.1/src/geom.h \ +- ../../external/qhull-2003.1/src/io.h \ +- ../../external/qhull-2003.1/src/mem.h \ +- ../../external/qhull-2003.1/src/merge.h \ +- ../../external/qhull-2003.1/src/poly.h \ +- ../../external/qhull-2003.1/src/qhull.h \ +- ../../external/qhull-2003.1/src/qset.h \ +- ../../external/qhull-2003.1/src/stat.h \ +- ../../external/qhull-2003.1/src/user.h ++HEADERS += /usr/include/qhull/geom.h \ ++ /usr/include/qhull/io.h \ ++ /usr/include/qhull/mem.h \ ++ /usr/include/qhull/merge.h \ ++ /usr/include/qhull/poly.h \ ++ /usr/include/qhull/qhull.h \ ++ /usr/include/qhull/qset.h \ ++ /usr/include/qhull/stat.h \ ++ /usr/include/qhull/user.h + +-SOURCES += ../../external/qhull-2003.1/src/geom.c \ +- ../../external/qhull-2003.1/src/geom2.c \ +- ../../external/qhull-2003.1/src/global.c \ +- ../../external/qhull-2003.1/src/io.c \ +- ../../external/qhull-2003.1/src/mem.c \ +- ../../external/qhull-2003.1/src/merge.c \ +- ../../external/qhull-2003.1/src/poly.c \ +- ../../external/qhull-2003.1/src/poly2.c \ +- ../../external/qhull-2003.1/src/qconvex.c \ +- ../../external/qhull-2003.1/src/qhull.c \ +- ../../external/qhull-2003.1/src/qset.c \ +- ../../external/qhull-2003.1/src/stat.c \ +- ../../external/qhull-2003.1/src/user.c +- +-TARGET = filter_qhull +\ No newline at end of file +diff -urN MeshLabSrc_AllInc_v131/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h MeshLabSrc_AllInc_v131_patched/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h +--- MeshLabSrc_AllInc_v131/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h 2011-06-06 09:47:14.000000000 +0200 ++++ MeshLabSrc_AllInc_v131_patched/meshlab/src/meshlabplugins/filter_qhull/qhull_tools.h 2012-01-14 17:52:34.077194893 +0100 +@@ -55,14 +55,14 @@ + #endif
+ #include <stdio.h>
+ #include <stdlib.h>
+-#include "../../external/qhull-2003.1/src/qhull.h"
+-#include "../../external/qhull-2003.1/src/mem.h"
+-#include "../../external/qhull-2003.1/src/qset.h"
+-#include "../../external/qhull-2003.1/src/geom.h"
+-#include "../../external/qhull-2003.1/src/merge.h"
+-#include "../../external/qhull-2003.1/src/poly.h"
+-#include "../../external/qhull-2003.1/src/io.h"
+-#include "../../external/qhull-2003.1/src/stat.h"
++#include "qhull/qhull.h"
++#include "qhull/mem.h"
++#include "qhull/qset.h"
++#include "qhull/geom.h"
++#include "qhull/merge.h"
++#include "qhull/poly.h"
++#include "qhull/io.h"
++#include "qhull/stat.h"
+ #if defined(__cplusplus)
+ }
+ #endif
+@@ -71,4 +71,4 @@ + facetT *compute_delaunay(int dim, int numpoints, MeshModel &m);
+ bool compute_voronoi(int dim, int numpoints, MeshModel &m, MeshModel &pm,float threshold);
+ bool compute_alpha_shapes(int dim, int numpoints, MeshModel &m, MeshModel &pm,double alpha, bool alphashape);
+-int visible_points(int dim, int numpoints, MeshModel &m, MeshModel &pm,MeshModel &pm2, vcg::Point3f viewpointP,float threshold,bool convex_hullFP,bool triangVP); +\ No newline at end of file ++int visible_points(int dim, int numpoints, MeshModel &m, MeshModel &pm,MeshModel &pm2, vcg::Point3f viewpointP,float threshold,bool convex_hullFP,bool triangVP);
+diff -urN MeshLabSrc_AllInc_v131/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro MeshLabSrc_AllInc_v131_patched/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro +--- MeshLabSrc_AllInc_v131/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro 2011-06-06 09:47:19.000000000 +0200 ++++ MeshLabSrc_AllInc_v131_patched/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro 2012-01-14 18:05:38.001240952 +0100 +@@ -14,7 +14,7 @@ + + TARGET = io_3ds + +-INCLUDEPATH += ../../external/lib3ds-1.3.0/ ++INCLUDEPATH += /usr/include/lib3ds + + # Notes on the paths of lib3ds files. + # Once you have compiled the library put the lib files in a dir named lib/XXX/ +@@ -25,9 +25,9 @@ + win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/3ds.lib + win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/3ds.lib + win32-g++:LIBS += ../../external/lib/win32-gcc/lib3ds.a +-linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a +-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a +-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a ++linux-g++:LIBS += -l3ds ++linux-g++-32:LIBS += -l3ds ++linux-g++-64:LIBS += -l3ds + + # unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds + +diff -urN MeshLabSrc_AllInc_v131/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro MeshLabSrc_AllInc_v131_patched/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro +--- MeshLabSrc_AllInc_v131/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro 2011-06-06 09:47:23.000000000 +0200 ++++ MeshLabSrc_AllInc_v131_patched/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro 2012-01-14 17:58:05.321214356 +0100 +@@ -30,16 +30,16 @@ + win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/bz2.lib + win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/bz2.lib + win32-g++:LIBS += ../../external/lib/win32-gcc/libbz2.a +-linux-g++:LIBS += ../../external/lib/linux-g++/libbz2.a +-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libbz2.a +-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libbz2.a ++linux-g++:LIBS += -lbz2 ++linux-g++-32:LIBS += -lbz2 ++linux-g++-64:LIBS += -lbz2 + + win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5 + win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5 + win32-g++:INCLUDEPATH += ../../external/bzip2-1.0.5 +-linux-g++:INCLUDEPATH += ../../external/bzip2-1.0.5 +-linux-g++-32:INCLUDEPATH += ../../external/bzip2-1.0.5 +-linux-g++-64:INCLUDEPATH += ../../external/bzip2-1.0.5 ++#linux-g++:INCLUDEPATH += ++#linux-g++-32:INCLUDEPATH += ../../external/bzip2-1.0.5 ++#linux-g++-64:INCLUDEPATH += ../../external/bzip2-1.0.5 + + mac:LIBS += -lbz2 + +diff -urN MeshLabSrc_AllInc_v131/meshlab/src/meshlabserver/meshlabserver.pro MeshLabSrc_AllInc_v131_patched/meshlab/src/meshlabserver/meshlabserver.pro +--- MeshLabSrc_AllInc_v131/meshlab/src/meshlabserver/meshlabserver.pro 2011-06-06 09:47:03.000000000 +0200 ++++ MeshLabSrc_AllInc_v131_patched/meshlab/src/meshlabserver/meshlabserver.pro 2012-01-14 18:08:35.072251353 +0100 +@@ -1,4 +1,4 @@ +-GLEWDIR = ../external/glew-1.5.1 ++GLEWDIR = /usr/include/GL + + HEADERS = + +@@ -25,12 +25,12 @@ + win32-msvc2008: LIBS += -L../distrib -lcommon + 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++-32: LIBS += -L../distrib -lcommon +-linux-g++-32:QMAKE_RPATHDIR += ../distrib +-linux-g++-64: LIBS += -L../distrib -lcommon +-linux-g++-64:QMAKE_RPATHDIR += ../distrib ++linux-g++: LIBS += -L../distrib -lcommon -lGLEW ++linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab ++linux-g++-32: LIBS += -L../distrib -lcommon -lGLEW ++linux-g++-32:QMAKE_RPATHDIR += /usr/lib/meshlab ++linux-g++-64: LIBS += -L../distrib -lcommon -lGLEW ++linux-g++-64:QMAKE_RPATHDIR += /usr/lib/meshlab + #CONFIG (release,debug | release) { + # win32-msvc2005:release: LIBS += -L../common/release -lcommon + # win32-msvc2008:release: LIBS += -L../common/release -lcommon +@@ -43,7 +43,7 @@ + + #DEFINES += GLEW_STATIC + +-INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR/include ++INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR + CONFIG += stl + CONFIG += console + +diff -urN MeshLabSrc_AllInc_v131/meshlab/src/shared.pri MeshLabSrc_AllInc_v131_patched/meshlab/src/shared.pri +--- MeshLabSrc_AllInc_v131/meshlab/src/shared.pri 2011-06-06 09:47:27.000000000 +0200 ++++ MeshLabSrc_AllInc_v131_patched/meshlab/src/shared.pri 2012-01-14 17:59:49.426220471 +0100 +@@ -8,7 +8,7 @@ + QT += script + + VCGDIR = ../../../../vcglib +-GLEWDIR = ../../external/glew-1.5.1 ++GLEWDIR = /usr/include/GL + + mac:LIBS += ../../common/libcommon.dylib + +@@ -18,9 +18,9 @@ + win32-msvc2008: LIBS += ../../distrib/common.lib + win32-msvc2010: LIBS += ../../distrib/common.lib + win32-g++:LIBS += -L../../distrib -lcommon +-linux-g++:LIBS += -L../../distrib -lcommon +-linux-g++-32:LIBS += -L../../distrib -lcommon +-linux-g++-64:LIBS += -L../../distrib -lcommon ++linux-g++:LIBS += -L../../distrib -lcommon -lGLEW ++linux-g++-32:LIBS += -L../../distrib -lcommon -lGLEW ++linux-g++-64:LIBS += -L../../distrib -lcommon -lGLEW + + #CONFIG(debug, debug|release) { + # win32-msvc2005: LIBS += ../../common/debug/common.lib +@@ -77,4 +77,4 @@ + + win32-msvc2005: RCC_DIR = $(ConfigurationName) + win32-msvc2008: RCC_DIR = $(ConfigurationName) +- win32-msvc2010: RCC_DIR = $(ConfigurationName) +\ No newline at end of file ++ win32-msvc2010: RCC_DIR = $(ConfigurationName) diff --git a/media-gfx/meshlab/meshlab-1.3.1.ebuild b/media-gfx/meshlab/meshlab-1.3.1.ebuild new file mode 100644 index 0000000..6e4ed63 --- /dev/null +++ b/media-gfx/meshlab/meshlab-1.3.1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +# TODO: use versionator; first talk to upstream to cleanup their naming +# TODO: add slot for version 2, append -${SLOT} + +EAPI=2 + +inherit eutils multilib qt4-r2 versionator + +DESCRIPTION="A mesh processing system for the editing of large unstructured 3D triangular meshes." +HOMEPAGE="http://meshlab.sourceforge.net/" +SRC_URI="mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.0/MeshLabSrc_AllInc_v131.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +DEPEND=">=sys-devel/gcc-4.3 + media-libs/glew + sci-libs/levmar + media-libs/lib3ds + >=dev-cpp/muParser-1.30 + media-libs/qhull + x11-libs/qt-core:4 + x11-libs/qt-opengl:4" +RDEPEND="${DEPEND}" + +S=${WORKDIR}/meshlab/src + +PATCHES=( + "${FILESDIR}/${PF}-unbundle-libs-and-fix-rpath.patch" +) + +src_configure() { + eqmake4 external/external.pro + eqmake4 meshlab_full.pro +} + +src_compile() { + cd external && emake + cd .. && emake +} + +src_install() { + local my_libdir=/usr/$(get_libdir)/meshlab + + exeinto ${my_libdir} + doexe distrib/{libcommon.so.1.0.0,meshlab{,server}} || die + dosym libcommon.so.1.0.0 ${my_libdir}/libcommon.so.1 || die + dosym libcommon.so.1 ${my_libdir}/libcommon.so || die + dosym ${my_libdir}/meshlab /usr/bin/meshlab || die + dosym ${my_libdir}/meshlabserver /usr/bin/meshlabserver || die + + exeinto ${my_libdir}/plugins + doexe distrib/plugins/*.so || die + + insinto ${my_libdir}/shaders + doins -r distrib/shaders/* || die +} |