amynka 15/07/25 19:30:40
Added: lapack.patch mpir.patch gcc-4.7.patch rpath.patch
qt-4.8.patch
Log:
Version bump bug #525948.
(Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key
34E69781)
Revision Changes Path
1.1 media-gfx/meshlab/files/1.3.3/lapack.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/meshlab/files/1.3.3/lapack.patch?rev=1.1&view=markup
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
Index: lapack.patch
===================================================================
diff -Nur meshlab.orig/src/external/levmar-2.3/lm.h
meshlab/src/external/levmar-2.3/lm.h
--- meshlab.orig/src/external/levmar-2.3/lm.h 2010-04-28 17:30:47.000000000
+1000
+++ meshlab/src/external/levmar-2.3/lm.h 2010-05-13 20:17:35.488505907
+1000
@@ -27,7 +27,6 @@
/* specify whether to use LAPACK or not. The first option is strongly
recommended */
#define HAVE_LAPACK /* use LAPACK */
- #undef HAVE_LAPACK /* uncomment this to force not using LAPACK */
/* to avoid the overhead of repeated mallocs(), routines in Axb.c can be
instructed to
* retain working memory between calls. Such a choice, however, renders these
routines
1.1 media-gfx/meshlab/files/1.3.3/mpir.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/meshlab/files/1.3.3/mpir.patch?rev=1.1&view=markup
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
Index: mpir.patch
===================================================================
diff -Nur meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro
meshlab/src/meshlabplugins/filter_csg/filter_csg.pro
--- meshlab.orig/src/meshlabplugins/filter_csg/filter_csg.pro 2014-04-02
02:59:31.000000000 +1100
+++ meshlab/src/meshlabplugins/filter_csg/filter_csg.pro 2014-06-01
21:10:24.521095356 +1000
@@ -18,6 +18,4 @@
win32-msvc2008:LIBS +=
../../external/lib/win32-msvc2008/mpirxx.lib
../../external/lib/win32-msvc2008/mpir.lib
win32-msvc2010:LIBS +=
../../external/lib/win32-msvc2008/mpirxx.lib
../../external/lib/win32-msvc2008/mpir.lib
win32-msvc2012:LIBS +=
../../external/lib/win32-msvc2008/mpirxx.lib
../../external/lib/win32-msvc2008/mpir.lib
-linux-g++:INCLUDEPATH += ../../external/inc/linux-g++/mpir-2.4.0
-linux-g++:LIBS += ../../external/lib/linux-g++/libmpirxx.a
../../external/lib/linux-g++/libmpir.a
1.1 media-gfx/meshlab/files/1.3.3/gcc-4.7.patch
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
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
Index: gcc-4.7.patch
===================================================================
diff --git vcglib/wrap/ply/plystuff.h vcglib/wrap/ply/plystuff.h
index 3e41e63..4af9508 100644
--- vcglib/wrap/ply/plystuff.h
+++ 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
1.1 media-gfx/meshlab/files/1.3.3/rpath.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/meshlab/files/1.3.3/rpath.patch?rev=1.1&view=markup
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
Index: rpath.patch
===================================================================
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++:LIBS += -L../external/lib/linux-g++ -ljhead -L../distrib -lcommon
-lGLU -lGLEW
-linux-g++:QMAKE_RPATHDIR += ../distrib
+linux-g++:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
-linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib
-lcommon -lGLU
+linux-g++-32:LIBS += -L../external/lib/linux-g++-32 -ljhead -L../distrib
-lcommon -lGLU -lGLEW
-linux-g++-32:QMAKE_RPATHDIR += ../distrib
+linux-g++-32:QMAKE_LFLAGS += -Wl,-rpath,\''$'$ORIGIN\'
-linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib
-lcommon -lGLU
+linux-g++-64:LIBS += -L../external/lib/linux-g++-64 -ljhead -L../distrib
-lcommon -lGLU -lGLEW
-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
1.1 media-gfx/meshlab/files/1.3.3/qt-4.8.patch
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
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
Index: qt-4.8.patch
===================================================================
diff -Nur meshlab.orig/src/meshlab/meshlab.pro meshlab/src/meshlab/meshlab.pro
--- meshlab.orig/src/meshlab/meshlab.pro 2011-02-15 20:39:47.000000000
+1100
+++ meshlab/src/meshlab/meshlab.pro 2012-01-07 11:57:18.055586086 +1100
@@ -85,6 +85,7 @@
QT += xmlpatterns
QT += network
QT += script
+unix:LIBS += -lGLU
# the following line is needed to avoid mismatch between
