| 1 |
commit: d8f9a1fb60f7507dcac4cdb07721da84ef365be4 |
| 2 |
Author: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Nov 26 21:29:51 2011 +0000 |
| 4 |
Commit: Alexey Shvetsov <alexxy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Nov 26 21:29:51 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=d8f9a1fb |
| 7 |
|
| 8 |
[media-gfx/meshlab] Import from alexxy overlay |
| 9 |
|
| 10 |
(Portage version: 2.2.0_alpha78/git/Linux x86_64, signed Manifest commit with key F82F92E6) |
| 11 |
|
| 12 |
--- |
| 13 |
.../meshlab-1.2.3a-r5-use-system-libs-rpath.patch | 322 ++++++++++++++++++++ |
| 14 |
...eshlab-1.3.0a-unbundle-libs-and-fix-rpath.patch | 316 +++++++++++++++++++ |
| 15 |
media-gfx/meshlab/meshlab-1.2.3a-r5.ebuild | 55 ++++ |
| 16 |
media-gfx/meshlab/meshlab-1.3.0a.ebuild | 61 ++++ |
| 17 |
media-gfx/meshlab/metadata.xml | 9 + |
| 18 |
5 files changed, 763 insertions(+), 0 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-gfx/meshlab/files/meshlab-1.2.3a-r5-use-system-libs-rpath.patch b/media-gfx/meshlab/files/meshlab-1.2.3a-r5-use-system-libs-rpath.patch |
| 21 |
new file mode 100644 |
| 22 |
index 0000000..f96fe4b |
| 23 |
--- /dev/null |
| 24 |
+++ b/media-gfx/meshlab/files/meshlab-1.2.3a-r5-use-system-libs-rpath.patch |
| 25 |
@@ -0,0 +1,322 @@ |
| 26 |
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/common/common.pro MeshLabSrc_AllInc_v123a-patched/meshlab/src/common/common.pro |
| 27 |
+--- MeshLabSrc_AllInc_v123a/meshlab/src/common/common.pro 2010-05-05 14:54:06.000000000 +0200 |
| 28 |
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/common/common.pro 2010-05-16 14:39:04.000000000 +0200 |
| 29 |
+@@ -1,6 +1,5 @@ |
| 30 |
+ VCGDIR = ../../../vcglib |
| 31 |
+-GLEWDIR = ../external/glew-1.5.1 |
| 32 |
+-GLEWCODE = $$GLEWDIR/src/glew.c |
| 33 |
++GLEWDIR = /usr/include/GL |
| 34 |
+ |
| 35 |
+ |
| 36 |
+ win32-msvc2005:DESTDIR = ../distrib |
| 37 |
+@@ -19,14 +18,14 @@ |
| 38 |
+ macx:QMAKE_POST_LINK = "cp libcommon.* ../distrib/meshlab.app/Contents/MacOs/" |
| 39 |
+ INCLUDEPATH *= ../.. \ |
| 40 |
+ $$VCGDIR \ |
| 41 |
+- $$GLEWDIR/include |
| 42 |
++ $$GLEWDIR |
| 43 |
+ TEMPLATE = lib |
| 44 |
+ linux-g++:CONFIG += dll |
| 45 |
+ linux-g++:DESTDIR = ../distrib |
| 46 |
+ linux-g++-32:CONFIG += dll |
| 47 |
+ linux-g++-32:DESTDIR = ../distrib |
| 48 |
+ linux-g++-64:CONFIG += dll |
| 49 |
+-linux-g++-64:DESTDIR = ../distrib |
| 50 |
++linux-g++-64:DESTDIR = ../distrib |
| 51 |
+ |
| 52 |
+ win32-msvc2005:CONFIG += staticlib |
| 53 |
+ win32-msvc2008:CONFIG += staticlib |
| 54 |
+@@ -54,5 +53,4 @@ |
| 55 |
+ filterscript.cpp \ |
| 56 |
+ GLLogStream.cpp \ |
| 57 |
+ meshmodel.cpp \ |
| 58 |
+- pluginmanager.cpp \ |
| 59 |
+- $$GLEWCODE |
| 60 |
++ pluginmanager.cpp |
| 61 |
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/fgt/filter_func/filter_func.pro MeshLabSrc_AllInc_v123a-patched/meshlab/src/fgt/filter_func/filter_func.pro |
| 62 |
+--- MeshLabSrc_AllInc_v123a/meshlab/src/fgt/filter_func/filter_func.pro 2010-05-05 14:54:06.000000000 +0200 |
| 63 |
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/fgt/filter_func/filter_func.pro 2010-05-16 13:29:44.000000000 +0200 |
| 64 |
+@@ -14,7 +14,7 @@ |
| 65 |
+ win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib |
| 66 |
+ win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib |
| 67 |
+ macx:LIBS += ../../external/lib/macx/libmuparser.a |
| 68 |
+-linux-g++:LIBS += ../../external/lib/linux-g++/libmuparser.a |
| 69 |
+-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libmuparser.a |
| 70 |
+-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libmuparser.a |
| 71 |
+-win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a |
| 72 |
++linux-g++:LIBS += -lmuparser |
| 73 |
++linux-g++-32:LIBS += -lmuparser |
| 74 |
++linux-g++-64:LIBS += -lmuparser |
| 75 |
++win32-g++:LIBS += -lmuparser |
| 76 |
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/fgt/filter_qhull/filter_qhull.pro MeshLabSrc_AllInc_v123a-patched/meshlab/src/fgt/filter_qhull/filter_qhull.pro |
| 77 |
+--- MeshLabSrc_AllInc_v123a/meshlab/src/fgt/filter_qhull/filter_qhull.pro 2010-04-28 09:30:45.000000000 +0200 |
| 78 |
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/fgt/filter_qhull/filter_qhull.pro 2010-06-13 23:21:55.000000000 +0200 |
| 79 |
+@@ -8,28 +8,14 @@ |
| 80 |
+ SOURCES += filter_qhull.cpp \ |
| 81 |
+ qhull_tools.cpp |
| 82 |
+ |
| 83 |
+-HEADERS += ../../external/qhull-2003.1/src/geom.h \ |
| 84 |
+- ../../external/qhull-2003.1/src/io.h \ |
| 85 |
+- ../../external/qhull-2003.1/src/mem.h \ |
| 86 |
+- ../../external/qhull-2003.1/src/merge.h \ |
| 87 |
+- ../../external/qhull-2003.1/src/poly.h \ |
| 88 |
+- ../../external/qhull-2003.1/src/qhull.h \ |
| 89 |
+- ../../external/qhull-2003.1/src/qset.h \ |
| 90 |
+- ../../external/qhull-2003.1/src/stat.h \ |
| 91 |
+- ../../external/qhull-2003.1/src/user.h |
| 92 |
+- |
| 93 |
+-SOURCES += ../../external/qhull-2003.1/src/geom.c \ |
| 94 |
+- ../../external/qhull-2003.1/src/geom2.c \ |
| 95 |
+- ../../external/qhull-2003.1/src/global.c \ |
| 96 |
+- ../../external/qhull-2003.1/src/io.c \ |
| 97 |
+- ../../external/qhull-2003.1/src/mem.c \ |
| 98 |
+- ../../external/qhull-2003.1/src/merge.c \ |
| 99 |
+- ../../external/qhull-2003.1/src/poly.c \ |
| 100 |
+- ../../external/qhull-2003.1/src/poly2.c \ |
| 101 |
+- ../../external/qhull-2003.1/src/qconvex.c \ |
| 102 |
+- ../../external/qhull-2003.1/src/qhull.c \ |
| 103 |
+- ../../external/qhull-2003.1/src/qset.c \ |
| 104 |
+- ../../external/qhull-2003.1/src/stat.c \ |
| 105 |
+- ../../external/qhull-2003.1/src/user.c |
| 106 |
++HEADERS += /usr/include/qhull/geom.h \ |
| 107 |
++ /usr/include/qhull/io.h \ |
| 108 |
++ /usr/include/qhull/mem.h \ |
| 109 |
++ /usr/include/qhull/merge.h \ |
| 110 |
++ /usr/include/qhull/poly.h \ |
| 111 |
++ /usr/include/qhull/qhull.h \ |
| 112 |
++ /usr/include/qhull/qset.h \ |
| 113 |
++ /usr/include/qhull/stat.h \ |
| 114 |
++ /usr/include/qhull/user.h |
| 115 |
+ |
| 116 |
+ TARGET = filter_qhull |
| 117 |
+\ No newline at end of file |
| 118 |
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/fgt/filter_qhull/qhull_tools.h MeshLabSrc_AllInc_v123a-patched/meshlab/src/fgt/filter_qhull/qhull_tools.h |
| 119 |
+--- MeshLabSrc_AllInc_v123a/meshlab/src/fgt/filter_qhull/qhull_tools.h 2010-04-28 09:30:45.000000000 +0200 |
| 120 |
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/fgt/filter_qhull/qhull_tools.h 2010-06-13 23:24:24.000000000 +0200 |
| 121 |
+@@ -55,14 +55,14 @@ |
| 122 |
+ #endif |
| 123 |
+ #include <stdio.h> |
| 124 |
+ #include <stdlib.h> |
| 125 |
+-#include "../../external/qhull-2003.1/src/qhull.h" |
| 126 |
+-#include "../../external/qhull-2003.1/src/mem.h" |
| 127 |
+-#include "../../external/qhull-2003.1/src/qset.h" |
| 128 |
+-#include "../../external/qhull-2003.1/src/geom.h" |
| 129 |
+-#include "../../external/qhull-2003.1/src/merge.h" |
| 130 |
+-#include "../../external/qhull-2003.1/src/poly.h" |
| 131 |
+-#include "../../external/qhull-2003.1/src/io.h" |
| 132 |
+-#include "../../external/qhull-2003.1/src/stat.h" |
| 133 |
++#include "qhull/qhull.h" |
| 134 |
++#include "qhull/mem.h" |
| 135 |
++#include "qhull/qset.h" |
| 136 |
++#include "qhull/geom.h" |
| 137 |
++#include "qhull/merge.h" |
| 138 |
++#include "qhull/poly.h" |
| 139 |
++#include "qhull/io.h" |
| 140 |
++#include "qhull/stat.h" |
| 141 |
+ #if defined(__cplusplus) |
| 142 |
+ } |
| 143 |
+ #endif |
| 144 |
+@@ -71,4 +71,4 @@ |
| 145 |
+ facetT *compute_delaunay(int dim, int numpoints, MeshModel &m); |
| 146 |
+ bool compute_voronoi(int dim, int numpoints, MeshModel &m, MeshModel &pm,float threshold); |
| 147 |
+ bool compute_alpha_shapes(int dim, int numpoints, MeshModel &m, MeshModel &pm,double alpha, bool alphashape); |
| 148 |
+-int visible_points(int dim, int numpoints, MeshModel &m, MeshModel &pm,MeshModel &pm2, vcg::Point3f viewpointP,float threshold,bool convex_hullFP,bool triangVP); |
| 149 |
+\ No newline at end of file |
| 150 |
++int visible_points(int dim, int numpoints, MeshModel &m, MeshModel &pm,MeshModel &pm2, vcg::Point3f viewpointP,float threshold,bool convex_hullFP,bool triangVP); |
| 151 |
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/meshlab/meshlab.pro MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlab/meshlab.pro |
| 152 |
+--- MeshLabSrc_AllInc_v123a/meshlab/src/meshlab/meshlab.pro 2010-05-05 14:54:06.000000000 +0200 |
| 153 |
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlab/meshlab.pro 2010-06-19 18:06:04.000000000 +0200 |
| 154 |
+@@ -1,5 +1,5 @@ |
| 155 |
+ VCGDIR = ../../../vcglib |
| 156 |
+-GLEWDIR = ../external/glew-1.5.1 |
| 157 |
++GLEWDIR = /usr/include/GL |
| 158 |
+ #CONFIG += debug_and_release |
| 159 |
+ DESTDIR = ../distrib |
| 160 |
+ # uncomment to try Eigen |
| 161 |
+@@ -7,7 +7,7 @@ |
| 162 |
+ # CONFIG += warn_off |
| 163 |
+ INCLUDEPATH *= ../.. \ |
| 164 |
+ $$VCGDIR \ |
| 165 |
+- $$GLEWDIR/include |
| 166 |
++ $$GLEWDIR |
| 167 |
+ DEPENDPATH += $$VCGDIR \ |
| 168 |
+ $$VCGDIR/vcg \ |
| 169 |
+ $$VCGDIR/wrap |
| 170 |
+@@ -88,7 +88,7 @@ |
| 171 |
+ INCLUDEPATH += . \ |
| 172 |
+ .. \ |
| 173 |
+ ../../../vcglib \ |
| 174 |
+- $$GLEWDIR/include |
| 175 |
++ $$GLEWDIR |
| 176 |
+ CONFIG += stl |
| 177 |
+ |
| 178 |
+ macx:LIBS += ../common/libcommon.dylib |
| 179 |
+@@ -107,12 +107,12 @@ |
| 180 |
+ # win32-g++:release:LIBS += -L../common/release -lcommon |
| 181 |
+ #} |
| 182 |
+ |
| 183 |
+-linux-g++:LIBS += -L../distrib -lcommon |
| 184 |
+-linux-g++:QMAKE_RPATHDIR += ../distrib |
| 185 |
+-linux-g++-32:LIBS += -L../distrib -lcommon |
| 186 |
+-linux-g++-32:QMAKE_RPATHDIR += ../distrib |
| 187 |
+-linux-g++-64:LIBS += -L../distrib -lcommon |
| 188 |
+-linux-g++-64:QMAKE_RPATHDIR += ../distrib |
| 189 |
++linux-g++:LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW |
| 190 |
++linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab |
| 191 |
++linux-g++-32:LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW |
| 192 |
++linux-g++-32:QMAKE_RPATHDIR += ../usr/lib/meshlab |
| 193 |
++linux-g++-64:LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW |
| 194 |
++linux-g++-64:QMAKE_RPATHDIR += /usr/lib/meshlab |
| 195 |
+ |
| 196 |
+ |
| 197 |
+ # uncomment in your local copy only in emergency cases. |
| 198 |
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/meshlab/meshlab.qrc MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlab/meshlab.qrc |
| 199 |
+--- MeshLabSrc_AllInc_v123a/meshlab/src/meshlab/meshlab.qrc 2010-04-30 15:10:45.000000000 +0200 |
| 200 |
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlab/meshlab.qrc 2010-05-16 12:58:12.000000000 +0200 |
| 201 |
+@@ -34,6 +34,5 @@ |
| 202 |
+ <file>images/100mesh.html</file> |
| 203 |
+ <file>images/selected_face.png</file> |
| 204 |
+ <file>images/selected_vert.png</file> |
| 205 |
+- <file>images/facebook.gif</file> |
| 206 |
+ </qresource> |
| 207 |
+ </RCC> |
| 208 |
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro |
| 209 |
+--- MeshLabSrc_AllInc_v123a/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro 2010-05-05 14:54:07.000000000 +0200 |
| 210 |
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro 2010-06-13 23:10:13.000000000 +0200 |
| 211 |
+@@ -24,7 +24,7 @@ |
| 212 |
+ |
| 213 |
+ TARGET = filter_isoparametrization |
| 214 |
+ INCLUDEPATH += ./ \ |
| 215 |
+- ../../external/levmar-2.3/ |
| 216 |
++ /usr/include/levmar/ |
| 217 |
+ |
| 218 |
+ win32-msvc2005:QMAKE_CXXFLAGS += /openmp -D_USE_OMP |
| 219 |
+ win32-msvc2008:QMAKE_CXXFLAGS += /openmp -D_USE_OMP |
| 220 |
+@@ -40,9 +40,9 @@ |
| 221 |
+ win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/levmar.lib |
| 222 |
+ win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/levmar.lib |
| 223 |
+ win32-g++:LIBS += -L../../external/lib/win32-gcc -llevmar |
| 224 |
+-linux-g++:LIBS += -L../../external/lib/linux-g++ -llevmar |
| 225 |
+-linux-g++-32:LIBS += -L../../external/lib/linux-g++-32 -llevmar |
| 226 |
+-linux-g++-64:LIBS += -L../../external/lib/linux-g++-64 -llevmar |
| 227 |
++linux-g++:LIBS += -llevmar |
| 228 |
++linux-g++-32:LIBS += -llevmar |
| 229 |
++linux-g++-64:LIBS += -llevmar |
| 230 |
+ macx:LIBS += ../../external/lib/macx/liblevmar.a |
| 231 |
+ |
| 232 |
+ # Please never ever uncomment this... |
| 233 |
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro |
| 234 |
+--- MeshLabSrc_AllInc_v123a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro 2010-05-05 14:54:07.000000000 +0200 |
| 235 |
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro 2010-05-16 13:02:34.000000000 +0200 |
| 236 |
+@@ -14,7 +14,7 @@ |
| 237 |
+ |
| 238 |
+ TARGET = io_3ds |
| 239 |
+ |
| 240 |
+-INCLUDEPATH += ../../external/lib3ds-1.3.0/ |
| 241 |
++INCLUDEPATH += /usr/include/lib3ds #../../external/lib3ds-1.3.0/ |
| 242 |
+ |
| 243 |
+ # Notes on the paths of lib3ds files. |
| 244 |
+ # Once you have compiled the library put the lib files in a dir named lib/XXX/ |
| 245 |
+@@ -25,9 +25,9 @@ |
| 246 |
+ win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/3ds.lib |
| 247 |
+ win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/3ds.lib |
| 248 |
+ win32-g++:LIBS += ../../external/lib/win32-gcc/lib3ds.a |
| 249 |
+-linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a |
| 250 |
+-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a |
| 251 |
+-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a |
| 252 |
++linux-g++:LIBS += -l3ds |
| 253 |
++linux-g++-32:LIBS += -l3ds |
| 254 |
++linux-g++-64:LIBS += -l3ds |
| 255 |
+ |
| 256 |
+ # unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds |
| 257 |
+ |
| 258 |
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro |
| 259 |
+--- MeshLabSrc_AllInc_v123a/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro 2010-05-05 14:54:07.000000000 +0200 |
| 260 |
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro 2010-05-16 13:09:22.000000000 +0200 |
| 261 |
+@@ -30,16 +30,16 @@ |
| 262 |
+ win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/bz2.lib |
| 263 |
+ win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/bz2.lib |
| 264 |
+ win32-g++:LIBS += ../../external/lib/win32-gcc/libbz2.a |
| 265 |
+-linux-g++:LIBS += ../../external/lib/linux-g++/libbz2.a |
| 266 |
+-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libbz2.a |
| 267 |
+-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libbz2.a |
| 268 |
++linux-g++:LIBS += -lbz2 |
| 269 |
++linux-g++-32:LIBS += -lbz2 |
| 270 |
++linux-g++-64:LIBS += -lbz2 |
| 271 |
+ |
| 272 |
+ win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5 |
| 273 |
+ win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5 |
| 274 |
+ win32-g++:INCLUDEPATH += ../../external/bzip2-1.0.5 |
| 275 |
+-linux-g++:INCLUDEPATH += ../../external/bzip2-1.0.5 |
| 276 |
+-linux-g++-32:INCLUDEPATH += ../../external/bzip2-1.0.5 |
| 277 |
+-linux-g++-64:INCLUDEPATH += ../../external/bzip2-1.0.5 |
| 278 |
++#linux-g++:INCLUDEPATH += ../../external/bzip2-1.0.5 |
| 279 |
++#linux-g++-32:INCLUDEPATH += ../../external/bzip2-1.0.5 |
| 280 |
++#linux-g++-64:INCLUDEPATH += ../../external/bzip2-1.0.5 |
| 281 |
+ |
| 282 |
+ mac:LIBS += -lbz2 |
| 283 |
+ |
| 284 |
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/meshlabserver/meshlabserver.pro MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlabserver/meshlabserver.pro |
| 285 |
+--- MeshLabSrc_AllInc_v123a/meshlab/src/meshlabserver/meshlabserver.pro 2010-05-05 14:54:06.000000000 +0200 |
| 286 |
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/meshlabserver/meshlabserver.pro 2010-06-19 18:08:02.000000000 +0200 |
| 287 |
+@@ -1,4 +1,4 @@ |
| 288 |
+-GLEWDIR = ../external/glew-1.5.1 |
| 289 |
++GLEWDIR = /usr/include/GL |
| 290 |
+ |
| 291 |
+ HEADERS = |
| 292 |
+ |
| 293 |
+@@ -20,13 +20,13 @@ |
| 294 |
+ |
| 295 |
+ win32-msvc2005: LIBS += -L../distrib -lcommon |
| 296 |
+ win32-msvc2008: LIBS += -L../distrib -lcommon |
| 297 |
+-win32-g++: LIBS += -L../distrib -lcommon |
| 298 |
+-linux-g++: LIBS += -L../distrib -lcommon |
| 299 |
+-linux-g++:QMAKE_RPATHDIR += ../distrib |
| 300 |
+-linux-g++-32: LIBS += -L../distrib -lcommon |
| 301 |
+-linux-g++-32:QMAKE_RPATHDIR += ../distrib |
| 302 |
+-linux-g++-64: LIBS += -L../distrib -lcommon |
| 303 |
+-linux-g++-64:QMAKE_RPATHDIR += ../distrib |
| 304 |
++win32-g++: LIBS += -L../distrib -lcommon |
| 305 |
++linux-g++: LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW |
| 306 |
++linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab |
| 307 |
++linux-g++-32: LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW |
| 308 |
++linux-g++-32:QMAKE_RPATHDIR += /usr/lib/meshlab |
| 309 |
++linux-g++-64: LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW |
| 310 |
++linux-g++-64:QMAKE_RPATHDIR += /usr/lib/meshlab |
| 311 |
+ #CONFIG (release,debug | release) { |
| 312 |
+ # win32-msvc2005:release: LIBS += -L../common/release -lcommon |
| 313 |
+ # win32-msvc2008:release: LIBS += -L../common/release -lcommon |
| 314 |
+@@ -38,7 +38,7 @@ |
| 315 |
+ |
| 316 |
+ #DEFINES += GLEW_STATIC |
| 317 |
+ |
| 318 |
+-INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR/include |
| 319 |
++INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR |
| 320 |
+ CONFIG += stl |
| 321 |
+ CONFIG += console |
| 322 |
+ |
| 323 |
+diff -urN MeshLabSrc_AllInc_v123a/meshlab/src/shared.pri MeshLabSrc_AllInc_v123a-patched/meshlab/src/shared.pri |
| 324 |
+--- MeshLabSrc_AllInc_v123a/meshlab/src/shared.pri 2010-05-05 14:54:07.000000000 +0200 |
| 325 |
++++ MeshLabSrc_AllInc_v123a-patched/meshlab/src/shared.pri 2010-05-16 14:39:36.000000000 +0200 |
| 326 |
+@@ -6,7 +6,7 @@ |
| 327 |
+ QT += xml |
| 328 |
+ |
| 329 |
+ VCGDIR = ../../../../vcglib |
| 330 |
+-GLEWDIR = ../../external/glew-1.5.1 |
| 331 |
++GLEWDIR = /usr/include/GL |
| 332 |
+ |
| 333 |
+ mac:LIBS += ../../common/libcommon.dylib |
| 334 |
+ |
| 335 |
+@@ -15,9 +15,9 @@ |
| 336 |
+ win32-msvc2005: LIBS += ../../distrib/common.lib |
| 337 |
+ win32-msvc2008: LIBS += ../../distrib/common.lib |
| 338 |
+ win32-g++:LIBS += -L../../distrib -lcommon |
| 339 |
+-linux-g++:LIBS += -L../../distrib -lcommon |
| 340 |
+-linux-g++-32:LIBS += -L../../distrib -lcommon |
| 341 |
+-linux-g++-64:LIBS += -L../../distrib -lcommon |
| 342 |
++linux-g++:LIBS += -L../../distrib -lcommon -L/usr/lib -lGLEW |
| 343 |
++linux-g++-32:LIBS += -L../../distrib -lcommon -L/usr/lib -lGLEW |
| 344 |
++linux-g++-64:LIBS += -L../../distrib -lcommon -L/usr/lib -lGLEW |
| 345 |
+ |
| 346 |
+ #CONFIG(debug, debug|release) { |
| 347 |
+ # win32-msvc2005: LIBS += ../../common/debug/common.lib |
| 348 |
|
| 349 |
diff --git a/media-gfx/meshlab/files/meshlab-1.3.0a-unbundle-libs-and-fix-rpath.patch b/media-gfx/meshlab/files/meshlab-1.3.0a-unbundle-libs-and-fix-rpath.patch |
| 350 |
new file mode 100644 |
| 351 |
index 0000000..ee04cb7 |
| 352 |
--- /dev/null |
| 353 |
+++ b/media-gfx/meshlab/files/meshlab-1.3.0a-unbundle-libs-and-fix-rpath.patch |
| 354 |
@@ -0,0 +1,316 @@ |
| 355 |
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/common/common.pro MeshLabSrc_AllInc_v130a_patched/meshlab/src/common/common.pro |
| 356 |
+--- MeshLabSrc_AllInc_v130a/meshlab/src/common/common.pro 2011-01-25 08:49:48.000000000 +0100 |
| 357 |
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/common/common.pro 2011-07-10 19:12:37.000000000 +0200 |
| 358 |
+@@ -1,6 +1,5 @@ |
| 359 |
+ VCGDIR = ../../../vcglib |
| 360 |
+-GLEWDIR = ../external/glew-1.5.1 |
| 361 |
+-GLEWCODE = $$GLEWDIR/src/glew.c |
| 362 |
++GLEWDIR = /usr/include/GL |
| 363 |
+ |
| 364 |
+ |
| 365 |
+ win32-msvc2005:DESTDIR = ../distrib |
| 366 |
+@@ -35,7 +34,7 @@ |
| 367 |
+ cp libcommon.* ../distrib/meshlab.app/Contents/MacOS/" |
| 368 |
+ INCLUDEPATH *= ../.. \ |
| 369 |
+ $$VCGDIR \ |
| 370 |
+- $$GLEWDIR/include |
| 371 |
++ $$GLEWDIR |
| 372 |
+ TEMPLATE = lib |
| 373 |
+ linux-g++:CONFIG += dll |
| 374 |
+ linux-g++:DESTDIR = ../distrib |
| 375 |
+@@ -83,5 +82,4 @@ |
| 376 |
+ scriptinterface.cpp \ |
| 377 |
+ mlparameter.cpp \ |
| 378 |
+ xmlfilterinfo.cpp \ |
| 379 |
+- $$GLEWCODE \ |
| 380 |
+ meshlabdocumentxml.cpp |
| 381 |
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/external/external.pro MeshLabSrc_AllInc_v130a_patched/meshlab/src/external/external.pro |
| 382 |
+--- MeshLabSrc_AllInc_v130a/meshlab/src/external/external.pro 2011-01-25 08:49:46.000000000 +0100 |
| 383 |
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/external/external.pro 2011-07-10 19:58:22.000000000 +0200 |
| 384 |
+@@ -2,9 +2,4 @@ |
| 385 |
+ |
| 386 |
+ TEMPLATE = subdirs |
| 387 |
+ |
| 388 |
+-SUBDIRS = lib3ds-1.3.0/lib3ds \ |
| 389 |
+- bzip2-1.0.5/bzip2-1.0.5.pro \ |
| 390 |
+- muparser_v132/src \ |
| 391 |
+- levmar-2.3/levmar-2.3.pro \ |
| 392 |
+- structuresynth/structuresynth.pro |
| 393 |
+-# openkinect/openkinect.pro |
| 394 |
++SUBDIRS = structuresynth/structuresynth.pro |
| 395 |
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/fgt/filter_func/filter_func.pro MeshLabSrc_AllInc_v130a_patched/meshlab/src/fgt/filter_func/filter_func.pro |
| 396 |
+--- MeshLabSrc_AllInc_v130a/meshlab/src/fgt/filter_func/filter_func.pro 2011-01-25 08:49:30.000000000 +0100 |
| 397 |
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/fgt/filter_func/filter_func.pro 2011-07-10 19:50:52.000000000 +0200 |
| 398 |
+@@ -14,7 +14,7 @@ |
| 399 |
+ win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/muparser.lib |
| 400 |
+ win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/muparser.lib |
| 401 |
+ macx:LIBS += ../../external/lib/macx/libmuparser.a |
| 402 |
+-linux-g++:LIBS += ../../external/lib/linux-g++/libmuparser.a |
| 403 |
+-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libmuparser.a |
| 404 |
+-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libmuparser.a |
| 405 |
+++linux-g++:LIBS += -lmuparser |
| 406 |
+++linux-g++-32:LIBS += -lmuparser |
| 407 |
+++linux-g++-64:LIBS += -lmuparser |
| 408 |
+ win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a |
| 409 |
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/fgt/filter_qhull/filter_qhull.pro MeshLabSrc_AllInc_v130a_patched/meshlab/src/fgt/filter_qhull/filter_qhull.pro |
| 410 |
+--- MeshLabSrc_AllInc_v130a/meshlab/src/fgt/filter_qhull/filter_qhull.pro 2011-01-25 08:49:27.000000000 +0100 |
| 411 |
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/fgt/filter_qhull/filter_qhull.pro 2011-07-10 19:34:15.000000000 +0200 |
| 412 |
+@@ -8,28 +8,14 @@ |
| 413 |
+ SOURCES += filter_qhull.cpp \ |
| 414 |
+ qhull_tools.cpp |
| 415 |
+ |
| 416 |
+-HEADERS += ../../external/qhull-2003.1/src/geom.h \ |
| 417 |
+- ../../external/qhull-2003.1/src/io.h \ |
| 418 |
+- ../../external/qhull-2003.1/src/mem.h \ |
| 419 |
+- ../../external/qhull-2003.1/src/merge.h \ |
| 420 |
+- ../../external/qhull-2003.1/src/poly.h \ |
| 421 |
+- ../../external/qhull-2003.1/src/qhull.h \ |
| 422 |
+- ../../external/qhull-2003.1/src/qset.h \ |
| 423 |
+- ../../external/qhull-2003.1/src/stat.h \ |
| 424 |
+- ../../external/qhull-2003.1/src/user.h |
| 425 |
++HEADERS += /usr/include/qhull/geom.h \ |
| 426 |
++ /usr/include/qhull/io.h \ |
| 427 |
++ /usr/include/qhull/mem.h \ |
| 428 |
++ /usr/include/qhull/merge.h \ |
| 429 |
++ /usr/include/qhull/poly.h \ |
| 430 |
++ /usr/include/qhull/qhull.h \ |
| 431 |
++ /usr/include/qhull/qset.h \ |
| 432 |
++ /usr/include/qhull/stat.h \ |
| 433 |
++ /usr/include/qhull/user.h |
| 434 |
+ |
| 435 |
+-SOURCES += ../../external/qhull-2003.1/src/geom.c \ |
| 436 |
+- ../../external/qhull-2003.1/src/geom2.c \ |
| 437 |
+- ../../external/qhull-2003.1/src/global.c \ |
| 438 |
+- ../../external/qhull-2003.1/src/io.c \ |
| 439 |
+- ../../external/qhull-2003.1/src/mem.c \ |
| 440 |
+- ../../external/qhull-2003.1/src/merge.c \ |
| 441 |
+- ../../external/qhull-2003.1/src/poly.c \ |
| 442 |
+- ../../external/qhull-2003.1/src/poly2.c \ |
| 443 |
+- ../../external/qhull-2003.1/src/qconvex.c \ |
| 444 |
+- ../../external/qhull-2003.1/src/qhull.c \ |
| 445 |
+- ../../external/qhull-2003.1/src/qset.c \ |
| 446 |
+- ../../external/qhull-2003.1/src/stat.c \ |
| 447 |
+- ../../external/qhull-2003.1/src/user.c |
| 448 |
+- |
| 449 |
+-TARGET = filter_qhull |
| 450 |
+\ No newline at end of file |
| 451 |
++TARGET = filter_qhull |
| 452 |
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/fgt/filter_qhull/qhull_tools.h MeshLabSrc_AllInc_v130a_patched/meshlab/src/fgt/filter_qhull/qhull_tools.h |
| 453 |
+--- MeshLabSrc_AllInc_v130a/meshlab/src/fgt/filter_qhull/qhull_tools.h 2011-01-25 08:49:27.000000000 +0100 |
| 454 |
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/fgt/filter_qhull/qhull_tools.h 2011-07-10 19:35:37.000000000 +0200 |
| 455 |
+@@ -55,14 +55,14 @@ |
| 456 |
+ #endif |
| 457 |
+ #include <stdio.h> |
| 458 |
+ #include <stdlib.h> |
| 459 |
+-#include "../../external/qhull-2003.1/src/qhull.h" |
| 460 |
+-#include "../../external/qhull-2003.1/src/mem.h" |
| 461 |
+-#include "../../external/qhull-2003.1/src/qset.h" |
| 462 |
+-#include "../../external/qhull-2003.1/src/geom.h" |
| 463 |
+-#include "../../external/qhull-2003.1/src/merge.h" |
| 464 |
+-#include "../../external/qhull-2003.1/src/poly.h" |
| 465 |
+-#include "../../external/qhull-2003.1/src/io.h" |
| 466 |
+-#include "../../external/qhull-2003.1/src/stat.h" |
| 467 |
++#include "qhull/qhull.h" |
| 468 |
++#include "qhull/mem.h" |
| 469 |
++#include "qhull/qset.h" |
| 470 |
++#include "qhull/geom.h" |
| 471 |
++#include "qhull/merge.h" |
| 472 |
++#include "qhull/poly.h" |
| 473 |
++#include "qhull/io.h" |
| 474 |
++#include "qhull/stat.h" |
| 475 |
+ #if defined(__cplusplus) |
| 476 |
+ } |
| 477 |
+ #endif |
| 478 |
+@@ -71,4 +71,4 @@ |
| 479 |
+ facetT *compute_delaunay(int dim, int numpoints, MeshModel &m); |
| 480 |
+ bool compute_voronoi(int dim, int numpoints, MeshModel &m, MeshModel &pm,float threshold); |
| 481 |
+ bool compute_alpha_shapes(int dim, int numpoints, MeshModel &m, MeshModel &pm,double alpha, bool alphashape); |
| 482 |
+-int visible_points(int dim, int numpoints, MeshModel &m, MeshModel &pm,MeshModel &pm2, vcg::Point3f viewpointP,float threshold,bool convex_hullFP,bool triangVP); |
| 483 |
+\ No newline at end of file |
| 484 |
++int visible_points(int dim, int numpoints, MeshModel &m, MeshModel &pm,MeshModel &pm2, vcg::Point3f viewpointP,float threshold,bool convex_hullFP,bool triangVP); |
| 485 |
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/meshlab/meshlab.pro MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlab/meshlab.pro |
| 486 |
+--- MeshLabSrc_AllInc_v130a/meshlab/src/meshlab/meshlab.pro 2011-02-15 10:39:47.000000000 +0100 |
| 487 |
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlab/meshlab.pro 2011-07-10 19:21:33.000000000 +0200 |
| 488 |
+@@ -1,5 +1,5 @@ |
| 489 |
+ VCGDIR = ../../../vcglib |
| 490 |
+-GLEWDIR = ../external/glew-1.5.1 |
| 491 |
++GLEWDIR = /usr/include/GL |
| 492 |
+ #CONFIG += debug_and_release |
| 493 |
+ DESTDIR = ../distrib |
| 494 |
+ |
| 495 |
+@@ -8,7 +8,7 @@ |
| 496 |
+ # CONFIG += warn_off |
| 497 |
+ INCLUDEPATH *= ../.. \ |
| 498 |
+ $$VCGDIR \ |
| 499 |
+- $$GLEWDIR/include |
| 500 |
++ $$GLEWDIR |
| 501 |
+ DEPENDPATH += $$VCGDIR \ |
| 502 |
+ $$VCGDIR/vcg \ |
| 503 |
+ $$VCGDIR/wrap |
| 504 |
+@@ -108,7 +108,7 @@ |
| 505 |
+ INCLUDEPATH += . \ |
| 506 |
+ .. \ |
| 507 |
+ ../../../vcglib \ |
| 508 |
+- $$GLEWDIR/include |
| 509 |
++ $$GLEWDIR |
| 510 |
+ CONFIG += stl |
| 511 |
+ |
| 512 |
+ macx:LIBS += ../common/libcommon.dylib |
| 513 |
+@@ -128,12 +128,12 @@ |
| 514 |
+ # win32-g++:release:LIBS += -L../common/release -lcommon |
| 515 |
+ #} |
| 516 |
+ |
| 517 |
+-linux-g++:LIBS += -L../distrib -lcommon |
| 518 |
+-linux-g++:QMAKE_RPATHDIR += ../distrib |
| 519 |
+-linux-g++-32:LIBS += -L../distrib -lcommon |
| 520 |
+-linux-g++-32:QMAKE_RPATHDIR += ../distrib |
| 521 |
+-linux-g++-64:LIBS += -L../distrib -lcommon |
| 522 |
+-linux-g++-64:QMAKE_RPATHDIR += ../distrib |
| 523 |
++linux-g++:LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW |
| 524 |
++linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab |
| 525 |
++linux-g++-32:LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW |
| 526 |
++linux-g++-32:QMAKE_RPATHDIR += ../usr/lib/meshlab |
| 527 |
++linux-g++-64:LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW |
| 528 |
++linux-g++-64:QMAKE_RPATHDIR += /usr/lib/meshlab |
| 529 |
+ |
| 530 |
+ |
| 531 |
+ # uncomment in your local copy only in emergency cases. |
| 532 |
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro |
| 533 |
+--- MeshLabSrc_AllInc_v130a/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro 2011-01-25 08:50:05.000000000 +0100 |
| 534 |
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.pro 2011-07-10 19:50:20.000000000 +0200 |
| 535 |
+@@ -24,7 +24,7 @@ |
| 536 |
+ |
| 537 |
+ TARGET = filter_isoparametrization |
| 538 |
+ INCLUDEPATH += ./ \ |
| 539 |
+- ../../external/levmar-2.3/ |
| 540 |
++ /usr/include/levmar/ |
| 541 |
+ |
| 542 |
+ win32-msvc2005:QMAKE_CXXFLAGS += /openmp -D_USE_OMP |
| 543 |
+ win32-msvc2008:QMAKE_CXXFLAGS += /openmp -D_USE_OMP |
| 544 |
+@@ -41,9 +41,10 @@ |
| 545 |
+ win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/levmar.lib |
| 546 |
+ win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/levmar.lib |
| 547 |
+ win32-g++:LIBS += -L../../external/lib/win32-gcc -llevmar |
| 548 |
+-linux-g++:LIBS += -L../../external/lib/linux-g++ -llevmar |
| 549 |
+-linux-g++-32:LIBS += -L../../external/lib/linux-g++-32 -llevmar |
| 550 |
+-linux-g++-64:LIBS += -L../../external/lib/linux-g++-64 -llevmar |
| 551 |
++linux-g++:LIBS += -llevmar |
| 552 |
++linux-g++-32:LIBS += -llevmar |
| 553 |
++linux-g++-64:LIBS += -llevmar |
| 554 |
++ |
| 555 |
+ macx:LIBS += ../../../src/external/lib/macx/liblevmar.a |
| 556 |
+ |
| 557 |
+ # Please never ever uncomment this... |
| 558 |
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro |
| 559 |
+--- MeshLabSrc_AllInc_v130a/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro 2011-01-25 08:49:55.000000000 +0100 |
| 560 |
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlabplugins/io_3ds/io_3ds.pro 2011-07-10 19:28:11.000000000 +0200 |
| 561 |
+@@ -14,7 +14,7 @@ |
| 562 |
+ |
| 563 |
+ TARGET = io_3ds |
| 564 |
+ |
| 565 |
+-INCLUDEPATH += ../../external/lib3ds-1.3.0/ |
| 566 |
++INCLUDEPATH += /usr/include/lib3ds/ |
| 567 |
+ |
| 568 |
+ # Notes on the paths of lib3ds files. |
| 569 |
+ # Once you have compiled the library put the lib files in a dir named lib/XXX/ |
| 570 |
+@@ -25,9 +25,9 @@ |
| 571 |
+ win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/3ds.lib |
| 572 |
+ win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/3ds.lib |
| 573 |
+ win32-g++:LIBS += ../../external/lib/win32-gcc/lib3ds.a |
| 574 |
+-linux-g++:LIBS += ../../external/lib/linux-g++/lib3ds.a |
| 575 |
+-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/lib3ds.a |
| 576 |
+-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/lib3ds.a |
| 577 |
++linux-g++:LIBS += -l3ds |
| 578 |
++linux-g++-32:LIBS += -l3ds |
| 579 |
++linux-g++-64:LIBS += -l3ds |
| 580 |
+ |
| 581 |
+ # unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds |
| 582 |
+ |
| 583 |
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro |
| 584 |
+--- MeshLabSrc_AllInc_v130a/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro 2011-01-25 08:50:02.000000000 +0100 |
| 585 |
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlabplugins/io_epoch/io_epoch.pro 2011-07-10 19:29:27.000000000 +0200 |
| 586 |
+@@ -30,16 +30,16 @@ |
| 587 |
+ win32-msvc2005:LIBS += ../../external/lib/win32-msvc2005/bz2.lib |
| 588 |
+ win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/bz2.lib |
| 589 |
+ win32-g++:LIBS += ../../external/lib/win32-gcc/libbz2.a |
| 590 |
+-linux-g++:LIBS += ../../external/lib/linux-g++/libbz2.a |
| 591 |
+-linux-g++-32:LIBS += ../../external/lib/linux-g++-32/libbz2.a |
| 592 |
+-linux-g++-64:LIBS += ../../external/lib/linux-g++-64/libbz2.a |
| 593 |
++linux-g++:LIBS += -lbz2 |
| 594 |
++linux-g++-32:LIBS += -lbz2 |
| 595 |
++linux-g++-64:LIBS += -lbz2 |
| 596 |
+ |
| 597 |
+ win32-msvc2005:INCLUDEPATH += ../../external/bzip2-1.0.5 |
| 598 |
+ win32-msvc2008:INCLUDEPATH += ../../external/bzip2-1.0.5 |
| 599 |
+ win32-g++:INCLUDEPATH += ../../external/bzip2-1.0.5 |
| 600 |
+-linux-g++:INCLUDEPATH += ../../external/bzip2-1.0.5 |
| 601 |
+-linux-g++-32:INCLUDEPATH += ../../external/bzip2-1.0.5 |
| 602 |
+-linux-g++-64:INCLUDEPATH += ../../external/bzip2-1.0.5 |
| 603 |
++#linux-g++:INCLUDEPATH += ../../external/bzip2-1.0.5 |
| 604 |
++#linux-g++-32:INCLUDEPATH += ../../external/bzip2-1.0.5 |
| 605 |
++#linux-g++-64:INCLUDEPATH += ../../external/bzip2-1.0.5 |
| 606 |
+ |
| 607 |
+ mac:LIBS += -lbz2 |
| 608 |
+ |
| 609 |
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/meshlabserver/meshlabserver.pro MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlabserver/meshlabserver.pro |
| 610 |
+--- MeshLabSrc_AllInc_v130a/meshlab/src/meshlabserver/meshlabserver.pro 2011-01-25 08:49:46.000000000 +0100 |
| 611 |
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/meshlabserver/meshlabserver.pro 2011-07-10 19:23:02.000000000 +0200 |
| 612 |
+@@ -1,4 +1,4 @@ |
| 613 |
+-GLEWDIR = ../external/glew-1.5.1 |
| 614 |
++GLEWDIR = /usr/include/GL |
| 615 |
+ |
| 616 |
+ HEADERS = |
| 617 |
+ |
| 618 |
+@@ -25,12 +25,12 @@ |
| 619 |
+ win32-msvc2008: LIBS += -L../distrib -lcommon |
| 620 |
+ win32-msvc2010: LIBS += -L../distrib -lcommon |
| 621 |
+ win32-g++: LIBS += -L../distrib -lcommon |
| 622 |
+-linux-g++: LIBS += -L../distrib -lcommon |
| 623 |
+-linux-g++:QMAKE_RPATHDIR += ../distrib |
| 624 |
+-linux-g++-32: LIBS += -L../distrib -lcommon |
| 625 |
+-linux-g++-32:QMAKE_RPATHDIR += ../distrib |
| 626 |
+-linux-g++-64: LIBS += -L../distrib -lcommon |
| 627 |
+-linux-g++-64:QMAKE_RPATHDIR += ../distrib |
| 628 |
++linux-g++: LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW |
| 629 |
++linux-g++:QMAKE_RPATHDIR += /usr/lib/meshlab |
| 630 |
++linux-g++-32: LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW |
| 631 |
++linux-g++-32:QMAKE_RPATHDIR += /usr/lib/meshlab |
| 632 |
++linux-g++-64: LIBS += -L../distrib -lcommon -L/usr/lib -lGLEW |
| 633 |
++linux-g++-64:QMAKE_RPATHDIR += /usr/lib/meshlab |
| 634 |
+ #CONFIG (release,debug | release) { |
| 635 |
+ # win32-msvc2005:release: LIBS += -L../common/release -lcommon |
| 636 |
+ # win32-msvc2008:release: LIBS += -L../common/release -lcommon |
| 637 |
+@@ -43,7 +43,7 @@ |
| 638 |
+ |
| 639 |
+ #DEFINES += GLEW_STATIC |
| 640 |
+ |
| 641 |
+-INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR/include |
| 642 |
++INCLUDEPATH += . .. ../../../vcglib $$GLEWDIR |
| 643 |
+ CONFIG += stl |
| 644 |
+ CONFIG += console |
| 645 |
+ |
| 646 |
+diff -urN MeshLabSrc_AllInc_v130a/meshlab/src/shared.pri MeshLabSrc_AllInc_v130a_patched/meshlab/src/shared.pri |
| 647 |
+--- MeshLabSrc_AllInc_v130a/meshlab/src/shared.pri 2011-01-25 08:50:20.000000000 +0100 |
| 648 |
++++ MeshLabSrc_AllInc_v130a_patched/meshlab/src/shared.pri 2011-07-10 19:04:25.000000000 +0200 |
| 649 |
+@@ -8,7 +8,7 @@ |
| 650 |
+ QT += script |
| 651 |
+ |
| 652 |
+ VCGDIR = ../../../../vcglib |
| 653 |
+-GLEWDIR = ../../external/glew-1.5.1 |
| 654 |
++GLEWDIR = /usr/include/GL |
| 655 |
+ |
| 656 |
+ mac:LIBS += ../../common/libcommon.dylib |
| 657 |
+ |
| 658 |
+@@ -17,9 +17,9 @@ |
| 659 |
+ win32-msvc2005: LIBS += ../../distrib/common.lib |
| 660 |
+ win32-msvc2008: LIBS += ../../distrib/common.lib |
| 661 |
+ win32-g++:LIBS += -L../../distrib -lcommon |
| 662 |
+-linux-g++:LIBS += -L../../distrib -lcommon |
| 663 |
+-linux-g++-32:LIBS += -L../../distrib -lcommon |
| 664 |
+-linux-g++-64:LIBS += -L../../distrib -lcommon |
| 665 |
++linux-g++:LIBS += -L../../distrib -lcommon -L/usr/lib -lGLEW |
| 666 |
++linux-g++-32:LIBS += -L../../distrib -lcommon -L/usr/lib -lGLEW |
| 667 |
++linux-g++-64:LIBS += -L../../distrib -lcommon -L/usr/lib -lGLEW |
| 668 |
+ |
| 669 |
+ #CONFIG(debug, debug|release) { |
| 670 |
+ # win32-msvc2005: LIBS += ../../common/debug/common.lib |
| 671 |
|
| 672 |
diff --git a/media-gfx/meshlab/meshlab-1.2.3a-r5.ebuild b/media-gfx/meshlab/meshlab-1.2.3a-r5.ebuild |
| 673 |
new file mode 100644 |
| 674 |
index 0000000..318c461 |
| 675 |
--- /dev/null |
| 676 |
+++ b/media-gfx/meshlab/meshlab-1.2.3a-r5.ebuild |
| 677 |
@@ -0,0 +1,55 @@ |
| 678 |
+# Copyright 1999-2011 Gentoo Foundation |
| 679 |
+# Distributed under the terms of the GNU General Public License v2 |
| 680 |
+# $Header: $ |
| 681 |
+ |
| 682 |
+# TODO: use versionator; first talk to upstream to cleanup their naming |
| 683 |
+# TODO: add slot for version 2, append -${SLOT} |
| 684 |
+ |
| 685 |
+EAPI="3" |
| 686 |
+ |
| 687 |
+inherit eutils multilib qt4-r2 versionator |
| 688 |
+ |
| 689 |
+DESCRIPTION="A mesh processing system for the editing of large unstructured 3D triangular meshes." |
| 690 |
+HOMEPAGE="http://meshlab.sourceforge.net/" |
| 691 |
+SRC_URI="mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.2.3/MeshLabSrc_AllInc_v123a.tgz" |
| 692 |
+ |
| 693 |
+LICENSE="GPL-2" |
| 694 |
+SLOT="0" |
| 695 |
+KEYWORDS="~amd64 ~x86" |
| 696 |
+IUSE="" |
| 697 |
+DEPEND=">=sys-devel/gcc-4.4 |
| 698 |
+ media-libs/glew |
| 699 |
+ sci-libs/levmar |
| 700 |
+ media-libs/lib3ds |
| 701 |
+ >=dev-cpp/muParser-1.30 |
| 702 |
+ <media-libs/qhull-2010.1 |
| 703 |
+ x11-libs/qt-core:4 |
| 704 |
+ x11-libs/qt-opengl:4" |
| 705 |
+RDEPEND="${DEPEND}" |
| 706 |
+ |
| 707 |
+S=${WORKDIR}/MeshLabSrc_AllInc_v${PV//./}/meshlab/src |
| 708 |
+ |
| 709 |
+PATCHES=( |
| 710 |
+ "${FILESDIR}/${PF}-use-system-libs-rpath.patch" |
| 711 |
+) |
| 712 |
+ |
| 713 |
+src_configure() { |
| 714 |
+ eqmake4 meshlabv12.pro |
| 715 |
+} |
| 716 |
+ |
| 717 |
+src_install() { |
| 718 |
+ local my_libdir=/usr/$(get_libdir)/meshlab |
| 719 |
+ |
| 720 |
+ exeinto ${my_libdir} |
| 721 |
+ doexe distrib/{libcommon.so.1.0.0,meshlab{,server}} || die |
| 722 |
+ dosym libcommon.so.1.0.0 ${my_libdir}/libcommon.so.1 || die |
| 723 |
+ dosym libcommon.so.1 ${my_libdir}/libcommon.so || die |
| 724 |
+ dosym ${my_libdir}/meshlab /usr/bin/meshlab || die |
| 725 |
+ dosym ${my_libdir}/meshlabserver /usr/bin/meshlabserver || die |
| 726 |
+ |
| 727 |
+ exeinto ${my_libdir}/plugins |
| 728 |
+ doexe distrib/plugins/*.so || die |
| 729 |
+ |
| 730 |
+ insinto ${my_libdir}/shaders |
| 731 |
+ doins -r distrib/shaders/* || die |
| 732 |
+} |
| 733 |
|
| 734 |
diff --git a/media-gfx/meshlab/meshlab-1.3.0a.ebuild b/media-gfx/meshlab/meshlab-1.3.0a.ebuild |
| 735 |
new file mode 100644 |
| 736 |
index 0000000..23c248b |
| 737 |
--- /dev/null |
| 738 |
+++ b/media-gfx/meshlab/meshlab-1.3.0a.ebuild |
| 739 |
@@ -0,0 +1,61 @@ |
| 740 |
+# Copyright 1999-2010 Gentoo Foundation |
| 741 |
+# Distributed under the terms of the GNU General Public License v2 |
| 742 |
+# $Header: $ |
| 743 |
+ |
| 744 |
+# TODO: use versionator; first talk to upstream to cleanup their naming |
| 745 |
+# TODO: add slot for version 2, append -${SLOT} |
| 746 |
+ |
| 747 |
+EAPI=2 |
| 748 |
+ |
| 749 |
+inherit eutils multilib qt4-r2 versionator |
| 750 |
+ |
| 751 |
+DESCRIPTION="A mesh processing system for the editing of large unstructured 3D triangular meshes." |
| 752 |
+HOMEPAGE="http://meshlab.sourceforge.net/" |
| 753 |
+SRC_URI="mirror://sourceforge/meshlab/meshlab/MeshLab%20v1.3.0/MeshLabSrc_AllInc_v130a.tgz" |
| 754 |
+ |
| 755 |
+LICENSE="GPL-2" |
| 756 |
+SLOT="0" |
| 757 |
+KEYWORDS="~amd64 ~x86" |
| 758 |
+IUSE="" |
| 759 |
+DEPEND=">=sys-devel/gcc-4.3 |
| 760 |
+ media-libs/glew |
| 761 |
+ sci-libs/levmar |
| 762 |
+ media-libs/lib3ds |
| 763 |
+ >=dev-cpp/muParser-1.30 |
| 764 |
+ media-libs/qhull |
| 765 |
+ x11-libs/qt-core:4 |
| 766 |
+ x11-libs/qt-opengl:4" |
| 767 |
+RDEPEND="${DEPEND}" |
| 768 |
+ |
| 769 |
+S=${WORKDIR}/meshlab/src |
| 770 |
+ |
| 771 |
+PATCHES=( |
| 772 |
+ "${FILESDIR}/${PF}-unbundle-libs-and-fix-rpath.patch" |
| 773 |
+) |
| 774 |
+ |
| 775 |
+src_configure() { |
| 776 |
+ eqmake4 external/external.pro |
| 777 |
+ eqmake4 meshlab_full.pro |
| 778 |
+} |
| 779 |
+ |
| 780 |
+src_compile() { |
| 781 |
+ cd external && emake |
| 782 |
+ cd .. && emake |
| 783 |
+} |
| 784 |
+ |
| 785 |
+src_install() { |
| 786 |
+ local my_libdir=/usr/$(get_libdir)/meshlab |
| 787 |
+ |
| 788 |
+ exeinto ${my_libdir} |
| 789 |
+ doexe distrib/{libcommon.so.1.0.0,meshlab{,server}} || die |
| 790 |
+ dosym libcommon.so.1.0.0 ${my_libdir}/libcommon.so.1 || die |
| 791 |
+ dosym libcommon.so.1 ${my_libdir}/libcommon.so || die |
| 792 |
+ dosym ${my_libdir}/meshlab /usr/bin/meshlab || die |
| 793 |
+ dosym ${my_libdir}/meshlabserver /usr/bin/meshlabserver || die |
| 794 |
+ |
| 795 |
+ exeinto ${my_libdir}/plugins |
| 796 |
+ doexe distrib/plugins/*.so || die |
| 797 |
+ |
| 798 |
+ insinto ${my_libdir}/shaders |
| 799 |
+ doins -r distrib/shaders/* || die |
| 800 |
+} |
| 801 |
|
| 802 |
diff --git a/media-gfx/meshlab/metadata.xml b/media-gfx/meshlab/metadata.xml |
| 803 |
new file mode 100644 |
| 804 |
index 0000000..905334b |
| 805 |
--- /dev/null |
| 806 |
+++ b/media-gfx/meshlab/metadata.xml |
| 807 |
@@ -0,0 +1,9 @@ |
| 808 |
+<?xml version="1.0" encoding="UTF-8"?> |
| 809 |
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 810 |
+<pkgmetadata> |
| 811 |
+ <herd>sci</herd> |
| 812 |
+ <maintainer> |
| 813 |
+ <email>gw.fossdev@×××××.com</email> |
| 814 |
+ <name>Gert Wollny</name> |
| 815 |
+ </maintainer> |
| 816 |
+</pkgmetadata> |
Archives