| 1 |
amynka 15/07/25 19:30:40 |
| 2 |
|
| 3 |
Added: lapack.patch mpir.patch gcc-4.7.patch rpath.patch |
| 4 |
qt-4.8.patch |
| 5 |
Log: |
| 6 |
Version bump bug #525948. |
| 7 |
|
| 8 |
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 34E69781) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.1 media-gfx/meshlab/files/1.3.3/lapack.patch |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/meshlab/files/1.3.3/lapack.patch?rev=1.1&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/meshlab/files/1.3.3/lapack.patch?rev=1.1&content-type=text/plain |
| 15 |
|
| 16 |
Index: lapack.patch |
| 17 |
=================================================================== |
| 18 |
diff -Nur meshlab.orig/src/external/levmar-2.3/lm.h meshlab/src/external/levmar-2.3/lm.h |
| 19 |
--- meshlab.orig/src/external/levmar-2.3/lm.h 2010-04-28 17:30:47.000000000 +1000 |
| 20 |
+++ meshlab/src/external/levmar-2.3/lm.h 2010-05-13 20:17:35.488505907 +1000 |
| 21 |
@@ -27,7 +27,6 @@ |
| 22 |
|
| 23 |
/* specify whether to use LAPACK or not. The first option is strongly recommended */ |
| 24 |
#define HAVE_LAPACK /* use LAPACK */ |
| 25 |
- #undef HAVE_LAPACK /* uncomment this to force not using LAPACK */ |
| 26 |
|
| 27 |
/* to avoid the overhead of repeated mallocs(), routines in Axb.c can be instructed to |
| 28 |
* retain working memory between calls. Such a choice, however, renders these routines |
| 29 |
|
| 30 |
|
| 31 |
|
| 32 |
1.1 media-gfx/meshlab/files/1.3.3/mpir.patch |
| 33 |
|
| 34 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/meshlab/files/1.3.3/mpir.patch?rev=1.1&view=markup |
| 35 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/meshlab/files/1.3.3/mpir.patch?rev=1.1&content-type=text/plain |
| 36 |
|
| 37 |
Index: mpir.patch |
| 38 |
=================================================================== |
| 39 |
diff -Nur meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro meshlab/src/meshlabplugins/filter_csg/filter_csg.pro |
| 40 |
--- meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro 2014-04-02 02:59:31.000000000 +1100 |
| 41 |
+++ meshlab/src/meshlabplugins/filter_csg/filter_csg.pro 2014-06-01 21:10:24.521095356 +1000 |
| 42 |
@@ -18,6 +18,4 @@ |
| 43 |
win32-msvc2008:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib |
| 44 |
win32-msvc2010:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib |
| 45 |
win32-msvc2012:LIBS += ../../external/lib/win32-msvc2008/mpirxx.lib ../../external/lib/win32-msvc2008/mpir.lib |
| 46 |
-linux-g++:INCLUDEPATH += ../../external/inc/linux-g++/mpir-2.4.0 |
| 47 |
-linux-g++:LIBS += ../../external/lib/linux-g++/libmpirxx.a ../../external/lib/linux-g++/libmpir.a |
| 48 |
|
| 49 |
|
| 50 |
|
| 51 |
|
| 52 |
1.1 media-gfx/meshlab/files/1.3.3/gcc-4.7.patch |
| 53 |
|
| 54 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch?rev=1.1&view=markup |
| 55 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch?rev=1.1&content-type=text/plain |
| 56 |
|
| 57 |
Index: gcc-4.7.patch |
| 58 |
=================================================================== |
| 59 |
diff --git vcglib/wrap/ply/plystuff.h vcglib/wrap/ply/plystuff.h |
| 60 |
index 3e41e63..4af9508 100644 |
| 61 |
--- vcglib/wrap/ply/plystuff.h |
| 62 |
+++ vcglib/wrap/ply/plystuff.h |
| 63 |
@@ -75,6 +75,7 @@ using namespace vcg; |
| 64 |
#define pb_close _close |
| 65 |
#define DIR_SEP "\\" |
| 66 |
#else |
| 67 |
+#include <unistd.h> |
| 68 |
#define pb_mkdir(n) mkdir(n,0755) |
| 69 |
#define pb_access access |
| 70 |
#define pb_stat stat |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
1.1 media-gfx/meshlab/files/1.3.3/rpath.patch |
| 75 |
|
| 76 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/meshlab/files/1.3.3/rpath.patch?rev=1.1&view=markup |
| 77 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/meshlab/files/1.3.3/rpath.patch?rev=1.1&content-type=text/plain |
| 78 |
|
| 79 |
Index: rpath.patch |
| 80 |
=================================================================== |
| 81 |
diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro |
| 82 |
--- meshlab.orig/src/meshlab/meshlab.pro 2012-05-31 00:32:44.000000000 +1000 |
| 83 |
+++ meshlab/src/meshlab/meshlab.pro 2012-08-06 21:26:01.405784190 +1000 |
| 84 |
@@ -130,11 +130,11 @@ |
| 85 |
#} |
| 86 |
|
| 87 |
-linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU |
| 88 |
+linux-g++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -lGLEW |
| 89 |
-linux-g++:QMAKE_RPATHDIR += ../distrib |
| 90 |
+linux-g++:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\' |
| 91 |
-linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU |
| 92 |
+linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib -lcommon -lGLU -lGLEW |
| 93 |
-linux-g++-32:QMAKE_RPATHDIR += ../distrib |
| 94 |
+linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\' |
| 95 |
-linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU |
| 96 |
+linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib -lcommon -lGLU -lGLEW |
| 97 |
-linux-g++-64:QMAKE_RPATHDIR += ../distrib |
| 98 |
+linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\' |
| 99 |
|
| 100 |
# uncomment in your local copy only in emergency cases. |
| 101 |
# We should never be too permissive |
| 102 |
diff -Nur meshlab.orig/src/meshlabserver/meshlabserver.pro meshlab/src/meshlabserver/meshlabserver.pro |
| 103 |
--- meshlab.orig/src/meshlabserver/meshlabserver.pro 2011-10-15 03:34:48.000000000 +1100 |
| 104 |
+++ meshlab/src/meshlabserver/meshlabserver.pro 2012-08-06 21:26:34.609557938 +1000 |
| 105 |
@@ -26,11 +26,11 @@ |
| 106 |
win32-msvc2010: LIBS += -L../distrib -lcommon |
| 107 |
win32-g++: LIBS += -L../distrib -lcommon |
| 108 |
linux-g++: LIBS += -L../distrib -lcommon |
| 109 |
-linux-g++:QMAKE_RPATHDIR += ../distrib |
| 110 |
+linux-g++:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\' |
| 111 |
linux-g++-32: LIBS += -L../distrib -lcommon |
| 112 |
-linux-g++-32:QMAKE_RPATHDIR += ../distrib |
| 113 |
+linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\' |
| 114 |
linux-g++-64: LIBS += -L../distrib -lcommon |
| 115 |
-linux-g++-64:QMAKE_RPATHDIR += ../distrib |
| 116 |
+linux-g++-64:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\' |
| 117 |
#CONFIG (release,debug | release) { |
| 118 |
# win32-msvc2005:release: LIBS += -L../common/release -lcommon |
| 119 |
# win32-msvc2008:release: LIBS += -L../common/release -lcommon |
| 120 |
|
| 121 |
|
| 122 |
|
| 123 |
1.1 media-gfx/meshlab/files/1.3.3/qt-4.8.patch |
| 124 |
|
| 125 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/meshlab/files/1.3.3/qt-4.8.patch?rev=1.1&view=markup |
| 126 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/meshlab/files/1.3.3/qt-4.8.patch?rev=1.1&content-type=text/plain |
| 127 |
|
| 128 |
Index: qt-4.8.patch |
| 129 |
=================================================================== |
| 130 |
diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro |
| 131 |
--- meshlab.orig/src/meshlab/meshlab.pro 2011-02-15 20:39:47.000000000 +1100 |
| 132 |
+++ meshlab/src/meshlab/meshlab.pro 2012-01-07 11:57:18.055586086 +1100 |
| 133 |
@@ -85,6 +85,7 @@ |
| 134 |
QT += xmlpatterns |
| 135 |
QT += network |
| 136 |
QT += script |
| 137 |
+unix:LIBS += -lGLU |
| 138 |
|
| 139 |
|
| 140 |
# the following line is needed to avoid mismatch between |
Archives