diff options
-rw-r--r-- | media-gfx/meshlab/Manifest | 5 | ||||
-rw-r--r-- | media-gfx/meshlab/files/9999-use-external-libs.patch | 61 | ||||
-rw-r--r-- | media-gfx/meshlab/files/meshlab-2016.12-remove-header.patch | 38 | ||||
-rw-r--r-- | media-gfx/meshlab/meshlab-9999.ebuild | 6 |
4 files changed, 69 insertions, 41 deletions
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest index f93717053..e25b0e9b3 100644 --- a/media-gfx/meshlab/Manifest +++ b/media-gfx/meshlab/Manifest @@ -1,3 +1,4 @@ -AUX 9999-use-external-libs.patch 6780 BLAKE2B 2d1bf5f1a4e988089ee0673716a6873b44bd0937567f631c8801b91ef09aebb0077a828f95f301e12220064a3a4c7f4c7f2628f981c2ff05c6863d57b54df001 SHA512 680c9d6d41c1b05b839ddb07caff5ae9facc793f8898253a4f8b5613f3ddba140a045562280a3115fbfad2e2dbad3af9599298998b2e3de4277cfbf6d3829d7a -EBUILD meshlab-9999.ebuild 1919 BLAKE2B aaaa852a5f2f7fbce35c23ea5de42aaa7cc23eb2224b3254763fda732f643b2160666abec75110250722b32b3eac52bcb2fa9e9e220c1f45b680ca5c408e3024 SHA512 4ac0270fd4d1d66d53ae96ac7db3b26a61f0bba627039c54a1793d77e319aba3146ed380e17e27714c2ccbdb68171dd0aa0d963b1b0dae3952538c9531685771 +AUX 9999-use-external-libs.patch 5816 BLAKE2B efc9459cb0a6ea4b1dc025976dd75a4d939d26a4122c9217eae8c7b672b7ab36e970f62f8a264ba42e258fc419dc900928b30801d44a3cf3e943bbb15e21f84f SHA512 a6b1c1e6110225f908c350b88ac255395bf42beded0adc9962c09b6fd002b99879254447e1e1ab9ecaa59f976951569d6580795682daeccce0db414fbcf0f037 +AUX meshlab-2016.12-remove-header.patch 1481 BLAKE2B c52f2eb980ebec98a534d2f5f6eadb9b89719e1d28d6fdc2912348fbe715103f2ca67684e29d1fa77b9b305cf552c12eb667634bfa22a0fad0312012e9b7b99d SHA512 ea0e24aa94d2595ed340c91c7a17e4028b2792bf316dfea0d8062324583dde62c03bb2d6af74317b9e448c657e5418100f40b18b172344697fe53e36657a45fc +EBUILD meshlab-9999.ebuild 2015 BLAKE2B a03c5d924b0e69cbdf1408cc67e79c67a5e0fe2dd978ab8dc9841c8ad4990d3f319ed2f85ce7183e25d6ce944e7c23ffa7929685c657bf117d08828059ae6231 SHA512 ded17725b18d97bf93fe437c51123c90bc5ed813c8853fb0e7649df4a12d09d32c91d57fec62a5fbbb0b187d21b8c821374d101f7ffaa9938e697d5dc28252ea MISC metadata.xml 249 BLAKE2B 54d645d97d1d7247d704241142448ad8492c53d9aa7d69a7fcc51df476d08b6226fef93ec880696d52d90af056a1b296006eeb1798b58799d5b66b8edc336d81 SHA512 8ff95dedc1dff6414020296e10ae064acd622ded48000f43fa5e43bc834699f8cab267d48b382f087942a42fbefc343ced091b1c6db0feab95551ebe2cf18d25 diff --git a/media-gfx/meshlab/files/9999-use-external-libs.patch b/media-gfx/meshlab/files/9999-use-external-libs.patch index 2a39451d4..8dd5a3cb1 100644 --- a/media-gfx/meshlab/files/9999-use-external-libs.patch +++ b/media-gfx/meshlab/files/9999-use-external-libs.patch @@ -1,5 +1,5 @@ diff --git a/common/common.pro b/common/common.pro -index dc89adeb..3d9404b3 100644 +index cf4cccff..e75f1bb4 100644 --- a/common/common.pro +++ b/common/common.pro @@ -1,7 +1,4 @@ @@ -10,26 +10,23 @@ index dc89adeb..3d9404b3 100644 win32-msvc2005:DESTDIR = ../distrib win32-msvc2008:DESTDIR = ../distrib -@@ -56,8 +53,7 @@ fi;\ - " +@@ -44,7 +41,6 @@ fi;\ INCLUDEPATH *= ../.. \ $$VCGDIR \ -- $$EIGENDIR \ -- $$GLEWDIR/include -+ $$EIGENDIR + $$EIGENDIR \ +- $$GLEWDIR/include \ + $$EXIF_DIR TEMPLATE = lib - linux-g++:CONFIG += dll - linux-g++:DESTDIR = ../distrib -@@ -84,8 +80,6 @@ QT += script + +@@ -69,7 +65,6 @@ QT += script TARGET = common DEPENDPATH += . --INCLUDEPATH += . $$EXIF_DIR -DEFINES += GLEW_STATIC - win32-msvc2005:DEFINES += _CRT_SECURE_NO_WARNINGS - win32-msvc2008:DEFINES += _CRT_SECURE_NO_WARNINGS - win32-msvc2010:DEFINES += _CRT_SECURE_NO_WARNINGS -@@ -123,7 +117,6 @@ SOURCES += filterparameter.cpp \ + + win32-msvc:DEFINES += _CRT_SECURE_NO_WARNINGS + +@@ -102,7 +97,6 @@ SOURCES += filterparameter.cpp \ mlapplication.cpp \ scriptsyntax.cpp \ searcher.cpp \ @@ -38,19 +35,19 @@ index dc89adeb..3d9404b3 100644 meshlabdocumentbundler.cpp \ ml_shared_data_context.cpp diff --git a/general.pri b/general.pri -index fa9dcdc8..57352f4e 100644 +index d12a066e..be41ffce 100644 --- a/general.pri +++ b/general.pri @@ -7,7 +7,6 @@ DEFINES += MESHLAB_SCALAR=float VCGDIR = ../../../vcglib EIGENDIR = $$VCGDIR/eigenlib --GLEWDIR = ../external/glew-1.7.0 +-GLEWDIR = ../external/glew-2.1.0 CONFIG += c++11 diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro -index 2661143f..0df2cd77 100644 +index efaa6614..b9e5d321 100644 --- a/meshlab/meshlab.pro +++ b/meshlab/meshlab.pro @@ -1,7 +1,6 @@ @@ -72,19 +69,13 @@ index 2661143f..0df2cd77 100644 DEPENDPATH += $$VCGDIR \ $$VCGDIR/vcg \ $$VCGDIR/wrap -@@ -154,11 +151,11 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -ljhead -L../distrib -lcom +@@ -154,7 +151,7 @@ win32-g++:LIBS += -L../external/lib/win32-gcc -ljhead -L../distrib -lcom # win32-g++:release:LIBS += -L../common/release -lcommon #} --linux-g++:LIBS += -L$$PWD/../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -+linux-g++:LIBS += -L$$PWD/../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU -lGLEW - linux-g++:QMAKE_RPATHDIR += ../distrib --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++-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:LIBS += -L$$PWD/../external/lib/linux -ljhead -L../distrib -lcommon -lGLU ++linux:LIBS += -L$$PWD/../external/lib/linux -ljhead -L../distrib -lcommon -lGLU -lGLEW + linux:QMAKE_RPATHDIR += ../distrib # uncomment in your local copy only in emergency cases. diff --git a/meshlabplugins/filter_func/filter_func.pro b/meshlabplugins/filter_func/filter_func.pro @@ -155,21 +146,15 @@ index fc060de0..59528e0c 100644 #macx:LIBS += ../../external/lib/macx/libopenctm.a macx:LIBS += $$MACLIBDIR/libopenctm.a diff --git a/meshlabserver/meshlabserver.pro b/meshlabserver/meshlabserver.pro -index 4df0a6f0..78892c78 100644 +index e97962a1..058e2512 100644 --- a/meshlabserver/meshlabserver.pro +++ b/meshlabserver/meshlabserver.pro -@@ -29,11 +29,11 @@ win32-msvc2010: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32 +@@ -29,7 +29,7 @@ win32-msvc2010: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32 win32-msvc2012: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32 win32-msvc2015: LIBS += -L../distrib -lcommon -lopengl32 -lGLU32 win32-g++: LIBS += -L../distrib -lcommon --linux-g++: LIBS += -L../distrib -lcommon -+linux-g++: LIBS += -L../distrib -lcommon -lGLEW - linux-g++:QMAKE_RPATHDIR += ../distrib --linux-g++-32: LIBS += -L../distrib -lcommon -+linux-g++-32: LIBS += -L../distrib -lcommon -lGLEW - linux-g++-32:QMAKE_RPATHDIR += ../distrib --linux-g++-64: LIBS += -L../distrib -lcommon -+linux-g++-64: LIBS += -L../distrib -lcommon -lGLEW - linux-g++-64:QMAKE_RPATHDIR += ../distrib +-linux: LIBS += -L../distrib -lcommon ++linux: LIBS += -L../distrib -lcommon -lGLEW + linux:QMAKE_RPATHDIR += ../distrib #CONFIG (release,debug | release) { # win32-msvc2005:release: LIBS += -L../common/release -lcommon diff --git a/media-gfx/meshlab/files/meshlab-2016.12-remove-header.patch b/media-gfx/meshlab/files/meshlab-2016.12-remove-header.patch new file mode 100644 index 000000000..8aeace854 --- /dev/null +++ b/media-gfx/meshlab/files/meshlab-2016.12-remove-header.patch @@ -0,0 +1,38 @@ +diff -ru vcglib/wrap/io_trimesh/import_nvm.h vcglib/wrap/io_trimesh/import_nvm.h +--- a/vcglib/wrap/io_trimesh/import_nvm.h 2016-12-29 12:54:58.000000000 +0300 ++++ b/vcglib/wrap/io_trimesh/import_nvm.h 2017-12-28 12:20:14.591670159 +0300 +@@ -85,15 +85,6 @@ + return true;
+ }
+
+-static bool ReadHeader(const char * filename,unsigned int &/*num_cams*/, unsigned int &/*num_points*/){
+- FILE *fp = fopen(filename, "r");
+- if(!fp) return false;
+- ReadHeader(fp);
+- fclose(fp);
+- return true;
+-}
+-
+-
+ static int Open( OpenMeshType &m, std::vector<Shot<ScalarType> > & shots,
+ std::vector<std::string > & image_filenames,
+ const char * filename, CallBackPos *cb=0)
+diff -ru vcglib/wrap/io_trimesh/import_out.h vcglib/wrap/io_trimesh/import_out.h +--- a/vcglib/wrap/io_trimesh/import_out.h 2016-12-29 12:54:58.000000000 +0300 ++++ b/vcglib/wrap/io_trimesh/import_out.h 2017-12-28 12:20:48.434017234 +0300 +@@ -85,15 +85,6 @@ + return true;
+ }
+
+-static bool ReadHeader(const char * filename,unsigned int &/*num_cams*/, unsigned int &/*num_points*/){
+- FILE *fp = fopen(filename, "r");
+- if(!fp) return false;
+- ReadHeader(fp);
+- fclose(fp);
+- return true;
+-}
+-
+-
+ static int Open( OpenMeshType &m, std::vector<Shot<ScalarType> > & shots,
+ std::vector<std::string > & image_filenames,
+ const char * filename,const char * filename_images, CallBackPos *cb=0)
diff --git a/media-gfx/meshlab/meshlab-9999.ebuild b/media-gfx/meshlab/meshlab-9999.ebuild index 4f6917aa9..75daa000b 100644 --- a/media-gfx/meshlab/meshlab-9999.ebuild +++ b/media-gfx/meshlab/meshlab-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -50,6 +50,10 @@ src_prepare(){ rm -r "distrib/plugins/U3D_W32" || die rm -r "distrib/plugins/U3D_OSX" || die + + # Fix bug 638796 + cd "${WORKDIR}" || die + eapply "${FILESDIR}/${PN}-2016.12-remove-header.patch" } src_configure() { |