summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiroslav Šulc <fordfrog@gentoo.org>2019-12-05 15:59:19 +0100
committerMiroslav Šulc <fordfrog@gentoo.org>2019-12-05 15:59:28 +0100
commite53475a4479fdcd9a80f490fe5e24bc1e488cca3 (patch)
treee41f17b268bf9b489d28dacba336230817238687
parentmedia-gfx/meshlab-9999: updated (diff)
downloadfordfrog-e53475a4479fdcd9a80f490fe5e24bc1e488cca3.tar.gz
fordfrog-e53475a4479fdcd9a80f490fe5e24bc1e488cca3.tar.bz2
fordfrog-e53475a4479fdcd9a80f490fe5e24bc1e488cca3.zip
media-gfx/meshlab-9999: fixes
1) updated patch 2) added dep 3) setting qmake flags on configuration Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Miroslav Šulc <fordfrog@gentoo.org>
-rw-r--r--media-gfx/meshlab/Manifest4
-rw-r--r--media-gfx/meshlab/files/9999-use-external-libs.patch160
-rw-r--r--media-gfx/meshlab/files/meshlab-9999-disable-bundled-libs.patch21
-rw-r--r--media-gfx/meshlab/meshlab-9999.ebuild20
4 files changed, 38 insertions, 167 deletions
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 0328066a9..d282fbcc8 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -1,3 +1,3 @@
-AUX 9999-use-external-libs.patch 5824 BLAKE2B 29b2fb94778254ed834a1e58791c2612d1494fe848ddcb46c94dd14edc60c8c9228ca4347169f812beab903ddb59f34d92ec40d4bcc3a763a62df67a99d95670 SHA512 c3d0bad371dccd4b27b3bdeea9f8297999233d2e56d85adbc8efa0c704aa459943f3a7033f929eec6863688300418d458bae340f61b66ffcfa9b71992527ffcf
-EBUILD meshlab-9999.ebuild 2110 BLAKE2B 8181d75f22e8a1191df3c6c86b8f128dde10ca0cef7a89314d8d843556b82c83918ad3bfecc527d09b0e1baea2518739eb993414eb54e644bfd8caab9f6bb533 SHA512 31f3826c60c5d907f6e64047af5622f95c5be783f24257c0597c391546a8cab5c0748281389bbf9bb31de1306fcab0d8189d5408e8bad24db41b1ef458a093b7
+AUX meshlab-9999-disable-bundled-libs.patch 717 BLAKE2B 98c74d8b6379ebbeb2654955855bfe1a9e40c909fe48e2f18d4ba4f066c062c18411ba9654b8374d9e18524c7c3bdc017cd20b222c2608d3c2aee868f4c7710e SHA512 e77696157ecf6204e0c444c1bee113a25f0737b2d1af110d70be180772d0d59cf2391291dde662a725a34eb4b181ceecbcdbc1315b683aea7515f54df778a668
+EBUILD meshlab-9999.ebuild 2325 BLAKE2B 795c979dfd7a7399b70e6f2244e28b940fc0cfd1ea5773db2b341212150c159e8379830884bf56d726ff33eff1c5f4b5776dc12b0d0087ce1008899cded3e9c3 SHA512 0c18fcd32eceb0405848036d73080ce97edc21d44a4325a1de8a0e81200738a0db130b50271d22d6f4d8d5389c87b48972ac2ef718b727eedfc0142487dc272e
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
deleted file mode 100644
index f634614a3..000000000
--- a/media-gfx/meshlab/files/9999-use-external-libs.patch
+++ /dev/null
@@ -1,160 +0,0 @@
-diff --git a/common/common.pro b/common/common.pro
-index cf4cccff..e75f1bb4 100644
---- a/common/common.pro
-+++ b/common/common.pro
-@@ -1,7 +1,4 @@
- include (../general.pri)
--EXIF_DIR = ../external/jhead-2.95
--
--GLEWCODE = $$GLEWDIR/src/glew.c
-
- win32-msvc2005:DESTDIR = ../distrib
- win32-msvc2008:DESTDIR = ../distrib
-@@ -44,7 +41,6 @@ fi;\
- INCLUDEPATH *= ../.. \
- $$VCGDIR \
- $$EIGENDIR \
-- $$GLEWDIR/include \
- $$EXIF_DIR
- TEMPLATE = lib
-
-@@ -69,7 +65,6 @@ QT += script
-
- TARGET = common
- DEPENDPATH += .
--DEFINES += GLEW_STATIC
-
- win32-msvc:DEFINES += _CRT_SECURE_NO_WARNINGS
-
-@@ -102,7 +97,6 @@ SOURCES += filterparameter.cpp \
- mlapplication.cpp \
- scriptsyntax.cpp \
- searcher.cpp \
-- $$GLEWCODE \
- meshlabdocumentxml.cpp \
- meshlabdocumentbundler.cpp \
- ml_shared_data_context.cpp
-diff --git a/general.pri b/general.pri
-index 4cb5102c..b90d7546 100644
---- a/general.pri
-+++ b/general.pri
-@@ -7,7 +7,6 @@ DEFINES += MESHLAB_SCALAR=float
-
- VCGDIR = ../../../vcglib
- EIGENDIR = $$VCGDIR/eigenlib
--GLEWDIR = ../external/glew-2.1.0
-
- CONFIG += c++11
-
-diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
-index 5f542b87..fbf27bff 100644
---- a/meshlab/meshlab.pro
-+++ b/meshlab/meshlab.pro
-@@ -1,7 +1,6 @@
- include (../general.pri)
- #CONFIG += debug_and_release
- DESTDIR = ../distrib
--EXIF_DIR = ../external/jhead-2.95
-
- DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x000000
-
-@@ -9,9 +8,7 @@ INCLUDEPATH *= . \
- .. \
- ../.. \
- $$VCGDIR \
-- $$EIGENDIR \
-- $$GLEWDIR/include \
-- $$EXIF_DIR
-+ $$EIGENDIR
- DEPENDPATH += $$VCGDIR \
- $$VCGDIR/vcg \
- $$VCGDIR/wrap
-@@ -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:LIBS += -L$$PWD/../external/lib/linux-g++ -ljhead -L../distrib -lcommon -lGLU
-+linux:LIBS += -L$$PWD/../external/lib/linux-g++ -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
-index ef6b654c..026c66be 100644
---- a/meshlabplugins/filter_func/filter_func.pro
-+++ b/meshlabplugins/filter_func/filter_func.pro
-@@ -8,7 +8,6 @@ TARGET = filter_func
-
-
- DEFINES += _UNICODE
--INCLUDEPATH += ../../external/muparser_v225/include
-
- # Note: we need static libs so when building muparser lib use
- # ./configure --enable-shared=no
-@@ -22,7 +21,4 @@ win32-msvc2013:LIBS += ../../external/lib/win32-msvc2013/muparser.lib
- win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/muparser.lib
-
- macx:LIBS += $$MACLIBDIR/libmuparser.a
--linux-g++:LIBS += $$PWD/../../external/lib/linux-g++/libmuparser.a
--linux-g++-32:LIBS += $$PWD/../../external/lib/linux-g++-32/libmuparser.a
--linux-g++-64:LIBS += $$PWD/../../external/lib/linux-g++-64/libmuparser.a
- win32-g++:LIBS += ../../external/lib/win32-gcc/libmuparser.a
-diff --git a/meshlabplugins/io_3ds/io_3ds.pro b/meshlabplugins/io_3ds/io_3ds.pro
-index 85b4a744..2cfad82d 100644
---- a/meshlabplugins/io_3ds/io_3ds.pro
-+++ b/meshlabplugins/io_3ds/io_3ds.pro
-@@ -10,11 +10,9 @@ HEADERS = meshio.h \
-
- SOURCES += meshio.cpp \
-
--DEFINES += LIB3DS_STATIC
-
- TARGET = io_3ds
-
--INCLUDEPATH += ../../external/lib3ds-1.3.0/
-
- # Notes on the paths of lib3ds files.
- # Once you have compiled the library put the lib files in a dir named lib/XXX/
-@@ -26,9 +24,6 @@ win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/3ds.lib
- 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 += $$PWD/../../external/lib/linux-g++/lib3ds.a
--linux-g++-32:LIBS += $$PWD/../../external/lib/linux-g++-32/lib3ds.a
--linux-g++-64:LIBS += $$PWD/../../external/lib/linux-g++-64/lib3ds.a
-
- # unix:LIBS += -L../../../../code/lib/lib3ds-1.3.0/lib3ds/lib/unix -l3ds
-
-diff --git a/meshlabplugins/io_ctm/io_ctm.pro b/meshlabplugins/io_ctm/io_ctm.pro
-index fc060de0..59528e0c 100644
---- a/meshlabplugins/io_ctm/io_ctm.pro
-+++ b/meshlabplugins/io_ctm/io_ctm.pro
-@@ -3,7 +3,6 @@ HEADERS += io_ctm.h \
- $$VCGDIR/wrap/io_trimesh/import_ctm.h \
- $$VCGDIR/wrap/io_trimesh/export_ctm.h
- SOURCES += io_ctm.cpp
--INCLUDEPATH += ../../external/OpenCTM-1.0.3/lib
- TARGET = io_ctm
-
- win32-msvc.net:QMAKE_CXXFLAGS += /DOPENCTM_STATIC
-@@ -21,8 +20,5 @@ win32-msvc2010:LIBS += ../../external/lib/win32-msvc2010/openctm.lib
- win32-msvc2012:LIBS += ../../external/lib/win32-msvc2012/openctm.lib
- win32-msvc2015:LIBS += ../../external/lib/win32-msvc2015/openctm.lib
- win32-g++:LIBS += ../../external/lib/win32-gcc/libopenctm.a
--linux-g++:LIBS += $$PWD/../../external/lib/linux-g++/libopenctm.a
--linux-g++-32:LIBS += $$PWD/../../external/lib/linux-g++-32/libopenctm.a
--linux-g++-64:LIBS += $$PWD/../../external/lib/linux-g++-64/libopenctm.a
- #macx:LIBS += ../../external/lib/macx/libopenctm.a
- macx:LIBS += $$MACLIBDIR/libopenctm.a
-diff --git a/meshlabserver/meshlabserver.pro b/meshlabserver/meshlabserver.pro
-index e97962a1..058e2512 100644
---- a/meshlabserver/meshlabserver.pro
-+++ b/meshlabserver/meshlabserver.pro
-@@ -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: 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-9999-disable-bundled-libs.patch b/media-gfx/meshlab/files/meshlab-9999-disable-bundled-libs.patch
new file mode 100644
index 000000000..db2041c64
--- /dev/null
+++ b/media-gfx/meshlab/files/meshlab-9999-disable-bundled-libs.patch
@@ -0,0 +1,21 @@
+diff --git a/external/external.pro b/external/external.pro
+index 966e9888..91e23daf 100644
+--- a/external/external.pro
++++ b/external/external.pro
+@@ -2,11 +2,12 @@ config += debug_and_release
+
+ TEMPLATE = subdirs
+
+-SUBDIRS = muparser_v225/src \
+- levmar-2.3/levmar-2.3.pro \
+- structuresynth-1.5/structuresynth.pro \
+- jhead-2.95/jhead-2.95.pro \
++#SUBDIRS = muparser_v225/src \
++# levmar-2.3/levmar-2.3.pro \
++# structuresynth-1.5/structuresynth.pro \
++# jhead-2.95/jhead-2.95.pro \
+ # openkinect/openkinect.pro
++SUBDIRS = structuresynth-1.5/structuresynth.pro
+
+ !CONFIG(system_bzip2) SUBDIRS += bzip2-1.0.5/bzip2-1.0.5.pro
+ !CONFIG(system_openctm) SUBDIRS += OpenCTM-1.0.3/openctm.pro
diff --git a/media-gfx/meshlab/meshlab-9999.ebuild b/media-gfx/meshlab/meshlab-9999.ebuild
index 472b1c06f..4d5c6ac9f 100644
--- a/media-gfx/meshlab/meshlab-9999.ebuild
+++ b/media-gfx/meshlab/meshlab-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit qmake-utils git-r3
+inherit qmake-utils desktop xdg git-r3
DESCRIPTION="the open source system for processing and editing 3D triangular meshes"
HOMEPAGE="http://www.meshlab.net"
@@ -15,7 +15,9 @@ LICENSE="GPL-2"
SLOT="0"
KEYWORDS=""
IUSE="-minimal"
-DEPEND="dev-cpp/eigen:3
+DEPEND="
+ app-arch/bzip2
+ dev-cpp/eigen:3
dev-cpp/muParser
dev-qt/qtcore:5
dev-qt/qtopengl:5
@@ -34,7 +36,7 @@ RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}/src"
PATCHES=(
- "${FILESDIR}"/${PV}-use-external-libs.patch
+ "${FILESDIR}"/${P}-disable-bundled-libs.patch
)
src_unpack() {
@@ -57,8 +59,16 @@ src_prepare(){
}
src_configure() {
- eqmake5 -r external/external.pro
- eqmake5 -r meshlab_$(use minimal && echo minimal || echo full).pro
+ local qmake_flags=(
+ 'CONFIG+=system_eigen3'
+ 'CONFIG+=system_glew'
+ 'CONFIG+=system_lib3ds'
+ 'CONFIG+=system_openctm'
+ 'CONFIG+=system_bzip2'
+ )
+
+ eqmake5 -r external/external.pro ${qmake_flags}
+ eqmake5 -r meshlab_$(use minimal && echo minimal || echo full).pro ${qmake_flags}
}
src_install() {