summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Lamm <expeditioneer@gentoo.org>2020-12-31 13:36:29 +0100
committerDennis Lamm <expeditioneer@gentoo.org>2020-12-31 15:23:35 +0100
commita57eb56c941eecbbc6f502070d24d85c30928ebd (patch)
tree12eb9bf65985c14d401ef670879961b570a4073d
parentmail-client/roundcube: Add candrews@gentoo.org as a maintainer (diff)
downloadgentoo-a57eb56c941eecbbc6f502070d24d85c30928ebd.tar.gz
gentoo-a57eb56c941eecbbc6f502070d24d85c30928ebd.tar.bz2
gentoo-a57eb56c941eecbbc6f502070d24d85c30928ebd.zip
media-gfx/meshlab: version bump to 2012.12
Closes: https://bugs.gentoo.org/744025 Signed-off-by: Dennis Lamm <expeditioneer@gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/18888 Signed-off-by: Dennis Lamm <expeditioneer@gentoo.org>
-rw-r--r--media-gfx/meshlab/Manifest2
-rw-r--r--media-gfx/meshlab/files/meshlab-2020.12-disable-updates.patch38
-rw-r--r--media-gfx/meshlab/files/meshlab-2020.12-find-plugins.patch39
-rw-r--r--media-gfx/meshlab/meshlab-2020.12.ebuild62
-rw-r--r--media-gfx/meshlab/metadata.xml22
5 files changed, 154 insertions, 9 deletions
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 4e546dc7ad72..0a2b15bdb8de 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -1,2 +1,4 @@
DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 53dda75b51198d529d35ae64e1b9d8ec240ec6031835e6cde2ff1ad21403086112a6f4b9acf5c6f53328787078b3e1a90cc177f5e009834b310cdf6b168c59b0 SHA512 68bf863fc390725a949578b545bc749bbe2c07ca75d1461772c7777fd6a4b095f11b64b5b0e8b729f83fea1bb9e3ca4b41123cdea3799a8eee0de587eb7bf1d8
+DIST meshlab-2020.12.tar.gz 111438055 BLAKE2B 4969c1f8f60be6ff55effd710c0bceb290ad6ac01153c233fd6a943f15e86189c04c06aa474ea89899d31b77d6960ffabbda6a12c3107d750469945e0c73c335 SHA512 0a00493f3e622a7bb0b70ddf0e1710376b47bd844aa785782a62f31a46ae1ee4b493c1e4ae0184f51f30be263f84efc0073e266d50748adc10ef229f107e4c87
DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae753777730c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626 SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211
+DIST vcglib-2020.12.tar.gz 6777201 BLAKE2B 9e2e3eb4ae7b930a8a334d58ee4bdadaf43e9a031d523471d17ca39d241c0dd66ec846a360cbcccd53d8728a2c7a6b6fa7d7a3efc04c01515ac3366b10f01aa8 SHA512 d7eec0c9c847e6ade7a3bee9aa1cddbb6855c388b15e2b35889ce998ea9a1c7afb0034ec31c38de3cbc2d867c8d8a474b13e4e2e3218e636926967abe4e54924
diff --git a/media-gfx/meshlab/files/meshlab-2020.12-disable-updates.patch b/media-gfx/meshlab/files/meshlab-2020.12-disable-updates.patch
new file mode 100644
index 000000000000..d8cadf06d9b7
--- /dev/null
+++ b/media-gfx/meshlab/files/meshlab-2020.12-disable-updates.patch
@@ -0,0 +1,38 @@
+--- a/meshlab/mainwindow_Init.cpp
++++ b/meshlab/mainwindow_Init.cpp
+@@ -607,7 +607,6 @@
+ helpMenu->addAction(onlineHelpAct);
+ helpMenu->addAction(onscreenHelpAct);
+ helpMenu->addAction(submitBugAct);
+- helpMenu->addAction(checkUpdatesAct);
+
+ fillEditMenu();
+ fillRenderMenu();
+--- a/meshlab/mainwindow_RunTime.cpp
++++ b/meshlab/mainwindow_RunTime.cpp
+@@ -2623,7 +2623,9 @@
+
+ void MainWindow::helpOnline()
+ {
++#if defined(__ENABLE_AUTO_STATS__)
+ checkForUpdates(false);
++#endif
+ QDesktopServices::openUrl(QUrl("http://www.meshlab.net/#support"));
+ }
+
+@@ -2882,6 +2884,7 @@
+ void MainWindow::showEvent(QShowEvent * event)
+ {
+ QWidget::showEvent(event);
++#if defined(__ENABLE_AUTO_STATS__)
+ QSettings settings;
+ QSettings::setDefaultFormat(QSettings::NativeFormat);
+ const QString versioncheckeddatestring("lastTimeMeshLabVersionCheckedOnStart");
+@@ -2902,6 +2905,7 @@
+ settings.setValue(versioncheckeddatestring, todayStr);
+ }
+ sendUsAMail();
++#endif
+ }
+
+ void MainWindow::meshAdded(int mid)
diff --git a/media-gfx/meshlab/files/meshlab-2020.12-find-plugins.patch b/media-gfx/meshlab/files/meshlab-2020.12-find-plugins.patch
new file mode 100644
index 000000000000..0d3c4c118ceb
--- /dev/null
+++ b/media-gfx/meshlab/files/meshlab-2020.12-find-plugins.patch
@@ -0,0 +1,39 @@
+--- a/common/CMakeLists.txt
++++ b/common/CMakeLists.txt
+@@ -75,6 +75,11 @@
+ endif()
+ add_library(meshlab-common ${TARGET_TYPE} ${SOURCES} ${HEADERS} ${RESOURCES})
+
++if(NOT WIN32 AND NOT APPLE)
++ target_compile_definitions(
++ meshlab-common PRIVATE MESHLAB_LIB_INSTALL_DIR="${MESHLAB_LIB_INSTALL_DIR}")
++endif()
++
+ target_include_directories(meshlab-common PRIVATE ${EXTERNAL_DIR}/easyexif/)
+ target_link_libraries(
+ meshlab-common
+--- a/common/pluginmanager.cpp
++++ b/common/pluginmanager.cpp
+@@ -225,7 +225,21 @@ QMap<QString, RichParameterList> PluginManager::generateFilterParameterMap()
+ QString PluginManager::getBaseDirPath()
+ {
+ QDir baseDir(qApp->applicationDirPath());
+-
++
++#if defined(Q_OS_LINUX)
++ if (baseDir.dirName() == "bin") {
++ baseDir.cdUp();
++#ifdef MESHLAB_LIB_INSTALL_DIR
++ baseDir.cd(MESHLAB_LIB_INSTALL_DIR);
++#else
++ baseDir.cd("lib");
++ if(baseDir.exists("meshlab")) {
++ baseDir.cd("meshlab");
++ }
++#endif // MESHLAB_LIB_INSTALL_DIR
++ }
++#endif
++
+ #if defined(Q_OS_WIN)
+ // Windows:
+ // during development with visual studio binary could be in the debug/release subdir.
diff --git a/media-gfx/meshlab/meshlab-2020.12.ebuild b/media-gfx/meshlab/meshlab-2020.12.ebuild
new file mode 100644
index 000000000000..53eb1c1ee974
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-2020.12.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake xdg-utils
+
+DESCRIPTION="A system for processing and editing unstructured 3D triangular meshes"
+HOMEPAGE="http://www.meshlab.net"
+VCG_VERSION="2020.12"
+SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/Meshlab-${PV}.tar.gz -> ${P}.tar.gz
+ https://github.com/cnr-isti-vclab/vcglib/archive/${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="double-precision -minimal"
+
+DEPEND="
+ dev-cpp/eigen:3
+ dev-cpp/muParser
+ dev-libs/gmp
+ >=dev-qt/qtcore-5.12:5
+ >=dev-qt/qtopengl-5.12:5
+ >=dev-qt/qtscript-5.12:5
+ >=dev-qt/qtxmlpatterns-5.12:5
+ media-libs/glew:0
+ =media-libs/lib3ds-1*
+ media-libs/openctm
+ media-libs/qhull
+ sci-libs/levmar
+ sci-libs/mpir"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/meshlab-Meshlab-${PV}/src"
+
+PATCHES=(
+ "${FILESDIR}/${P}-disable-updates.patch"
+ "${FILESDIR}/${P}-find-plugins.patch"
+)
+
+src_unpack() {
+ unpack ${P}.tar.gz
+ cd "${S}"
+ unpack vcglib-2020.12.tar.gz
+ mv vcglib-2020.12/* vcglib
+}
+
+src_configure() {
+ CMAKE_BUILD_TYPE=Release
+
+ local mycmakeargs=(
+ -DBUILD_MINI=$(usex minimal)
+ -DBUILD_WITH_DOUBLE_SCALAR=$(usex double-precision)
+ )
+ cmake_src_configure
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+}
diff --git a/media-gfx/meshlab/metadata.xml b/media-gfx/meshlab/metadata.xml
index 5454c9e8ca1b..95901ec9bfc4 100644
--- a/media-gfx/meshlab/metadata.xml
+++ b/media-gfx/meshlab/metadata.xml
@@ -1,20 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>amynka@gentoo.org</email>
- </maintainer>
<maintainer type="project">
<email>3dprint@gentoo.org</email>
<name>Gentoo 3D print</name>
</maintainer>
- <longdescription lang="en">
- Printrun is a set of G-code sending applications for RepRap.
- It consists of printcore (dumb G-code sender), pronsole (featured command line
- G-code sender), pronterface (featured G-code sender with graphical user
- interface), and a small collection of helpful scripts.
+ <maintainer type="person">
+ <email>amynka@gentoo.org</email>
+ </maintainer>
+ <longdescription>
+ MeshLab is an open source, portable, and extensible system for the processing and editing of unstructured 3D
+ triangular meshes. The system is aimed to help the processing of the typical not-so-small unstructured models
+ arising in 3D scanning, providing a set of tools for editing, cleaning, healing, inspecting, rendering and
+ converting these kinds of meshes.
</longdescription>
+ <use>
+ <flag name="double-precision">Use double type instead of float type for scalars</flag>
+ </use>
<upstream>
- <remote-id type="sourceforge">meshlab</remote-id>
+ <bugs-to>https://github.com/cnr-isti-vclab/meshlab/issues</bugs-to>
+ <remote-id type="github">cnr-isti-vclab/meshlab</remote-id>
</upstream>
</pkgmetadata>