subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: media\-gfx\/meshlab\/"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

2024-02-29 Thread Sam James

commit: c9a290239287bf9a67b1e6ef31d50d8d95954fca
Author: Eli Schwartz  gmail  com>
AuthorDate: Fri Mar  1 00:11:18 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar  1 00:32:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9a29023

media-gfx/meshlab: remove various totally erroneous dependencies

mpir:
mpir is an ancient fork of gmp from 2017. It claims to be focused on
speed. It doesn't build with modern compilers due to Modern C issues,
and it fails to build with LTO as well. Unlike gmp, this will never be
fixed.

meshlab can look for either mpir or gmp, but we depended on BOTH and
only gmp got used. mpir was completely extraneous.

levmar:
It would be great if we could use the system levmar, as meshlab
genuinely depends on it. But it hardcodes a vendored copy:

https://github.com/cnr-isti-vclab/meshlab/blob/bd88167db9839109487f401be50991c4bc990d27/src/external/levmar.cmake

qhull:
Currently, the build logs this:
-- Could NOT find Qhull: missing: libqhull (found 
/usr/lib64/cmake/Qhull/QhullConfig.cmake (found version "8.0.2"))

This happens because cmake is broken, probably. But meshlab 2021
ports to libqhull_r, which "should" work fine. Pity we are stuck in
2020 instead.

We really could and should use the system copy but the build system
cannot and does not detect it, which means we shouldn't be depending
on something we cannot use.

Bug: https://bugs.gentoo.org/905859
Bug: https://bugs.gentoo.org/812950
Signed-off-by: Eli Schwartz  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 .../{meshlab-2020.12-r2.ebuild => meshlab-2020.12-r3.ebuild}   | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/media-gfx/meshlab/meshlab-2020.12-r2.ebuild 
b/media-gfx/meshlab/meshlab-2020.12-r3.ebuild
similarity index 89%
rename from media-gfx/meshlab/meshlab-2020.12-r2.ebuild
rename to media-gfx/meshlab/meshlab-2020.12-r3.ebuild
index 3022559a4e4c..7350616490eb 100644
--- a/media-gfx/meshlab/meshlab-2020.12-r2.ebuild
+++ b/media-gfx/meshlab/meshlab-2020.12-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -17,6 +17,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="double-precision minimal"
 
+# qhull: newer meshlab supports system re-entrant version
+# levmar: build system hardcodes vendored copy
 DEPEND="
dev-cpp/eigen:3
dev-cpp/muParser
@@ -31,9 +33,6 @@ DEPEND="
media-libs/glew:0=
=media-libs/lib3ds-1*
media-libs/openctm:=
-   media-libs/qhull:=
-   sci-libs/levmar
-   sci-libs/mpir:=
 "
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

2023-10-21 Thread Andreas Sturmlechner

commit: d95a2615e43c05a00b94048221e9ab5a30f45e37
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 21 19:29:53 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 21 21:04:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d95a2615

media-gfx/meshlab: update EAPI 7 -> 8, drop unused, add missing deps

CMAKE_BUILD_TYPE=Release was ignored by eclass so setting it was a no-op.

Bug: https://bugs.gentoo.org/915788
Bug: https://bugs.gentoo.org/763837
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/meshlab/meshlab-2020.12-r2.ebuild | 58 +
 1 file changed, 58 insertions(+)

diff --git a/media-gfx/meshlab/meshlab-2020.12-r2.ebuild 
b/media-gfx/meshlab/meshlab-2020.12-r2.ebuild
new file mode 100644
index ..3022559a4e4c
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-2020.12-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VCG_VERSION="2020.12"
+inherit cmake xdg
+
+DESCRIPTION="System for processing and editing unstructured 3D triangular 
meshes"
+HOMEPAGE="https://www.meshlab.net/";
+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"
+S="${WORKDIR}/meshlab-Meshlab-${PV}/src"
+
+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
+   dev-qt/qtgui:5
+   dev-qt/qtdeclarative:5
+   dev-qt/qtnetwork:5
+   dev-qt/qtopengl:5
+   dev-qt/qtwidgets:5
+   dev-qt/qtxml:5
+   media-libs/glew:0=
+   =media-libs/lib3ds-1*
+   media-libs/openctm:=
+   media-libs/qhull:=
+   sci-libs/levmar
+   sci-libs/mpir:=
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+   "${FILESDIR}/${P}-disable-updates.patch"
+   "${FILESDIR}/${P}-find-plugins.patch"
+)
+
+src_unpack() {
+   unpack ${P}.tar.gz
+   cd "${S}" || die
+   unpack vcglib-2020.12.tar.gz
+   mv vcglib-2020.12/* vcglib || die
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DBUILD_MINI=$(usex minimal)
+   -DBUILD_WITH_DOUBLE_SCALAR=$(usex double-precision)
+   )
+   cmake_src_configure
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

2023-10-21 Thread Andreas Sturmlechner

commit: b1cf46a5ff4855e442290baa65854eb73e3c0a60
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat Oct 21 19:40:25 2023 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat Oct 21 21:04:19 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1cf46a5

media-gfx/meshlab: drop 2020.12-r1

Closes: https://bugs.gentoo.org/915788
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/meshlab/meshlab-2020.12-r1.ebuild | 64 -
 1 file changed, 64 deletions(-)

diff --git a/media-gfx/meshlab/meshlab-2020.12-r1.ebuild 
b/media-gfx/meshlab/meshlab-2020.12-r1.ebuild
deleted file mode 100644
index 172c5a559c36..
--- a/media-gfx/meshlab/meshlab-2020.12-r1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2021 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/qtdeclarative-5.12:5
-   >=dev-qt/qtopengl-5.12:5
-   >=dev-qt/qtscript-5.12:5
-   >=dev-qt/qtxml-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
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

2021-06-03 Thread Sam James

commit: 893f5db5a4d99ad19534661341e49d545d4510fa
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun  2 23:55:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  3 19:14:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=893f5db5

media-gfx/meshlab: fix BadDefaultUseFlags

-foo in IUSE is discouraged. It is equivalent (in every meaningful case) to 
'foo' but confuses parsing
tools like e.g. packages.gentoo.org.

Dropping '-' from these flags has no impact on the actual default behaviour.

See: 
https://devmanual.gentoo.org/general-concepts/use-flags/index.html#iuse-defaults
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Sam James  gentoo.org>

 media-gfx/meshlab/meshlab-2020.12-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-gfx/meshlab/meshlab-2020.12-r1.ebuild 
b/media-gfx/meshlab/meshlab-2020.12-r1.ebuild
index f4ed995d10c..172c5a559c3 100644
--- a/media-gfx/meshlab/meshlab-2020.12-r1.ebuild
+++ b/media-gfx/meshlab/meshlab-2020.12-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/Meshlab-${PV}.tar.gz
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="double-precision -minimal"
+IUSE="double-precision minimal"
 
 DEPEND="
dev-cpp/eigen:3

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

2021-03-11 Thread Dennis Lamm

commit: b417a68322195dc355aaf90763d5485b45cefe6e
Author: Dennis Lamm  gentoo  org>
AuthorDate: Thu Mar 11 20:14:57 2021 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Fri Mar 12 04:19:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b417a683

media-gfx/meshlab: drop old

Signed-off-by: Dennis Lamm  gentoo.org>
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Closes: https://github.com/gentoo/gentoo/pull/19884
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/meshlab/meshlab-2020.12.ebuild | 63 
 1 file changed, 63 deletions(-)

diff --git a/media-gfx/meshlab/meshlab-2020.12.ebuild 
b/media-gfx/meshlab/meshlab-2020.12.ebuild
deleted file mode 100644
index 03fbb0d1f0e..000
--- a/media-gfx/meshlab/meshlab-2020.12.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2021 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/qtxml-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
-}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

2021-03-05 Thread Dennis Lamm

commit: 126ebdd99471f430d7b1b7d8d973e3e2cc9a3d55
Author: Dennis Lamm  gentoo  org>
AuthorDate: Sat Mar  6 05:41:59 2021 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Sat Mar  6 06:01:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=126ebdd9

media-gfx/meshlab: added missing dependency

Closes: https://bugs.gentoo.org/763837
Signed-off-by: Dennis Lamm  gentoo.org>

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Closes: https://github.com/gentoo/gentoo/pull/19789
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/meshlab/meshlab-2020.12-r1.ebuild | 64 +
 1 file changed, 64 insertions(+)

diff --git a/media-gfx/meshlab/meshlab-2020.12-r1.ebuild 
b/media-gfx/meshlab/meshlab-2020.12-r1.ebuild
new file mode 100644
index 000..f4ed995d10c
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-2020.12-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2021 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/qtdeclarative-5.12:5
+   >=dev-qt/qtopengl-5.12:5
+   >=dev-qt/qtscript-5.12:5
+   >=dev-qt/qtxml-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
+}

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/, media-gfx/meshlab/files/2016.12/

2021-01-09 Thread Dennis Lamm

commit: a238909f1edd38c6528c88832665e256d1bdeea8
Author: Dennis Lamm  gentoo  org>
AuthorDate: Thu Jan  7 22:49:58 2021 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Sat Jan  9 08:17:41 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a238909f

media-gfx/meshlab: drop old

Signed-off-by: Dennis Lamm  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/18987
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/meshlab/Manifest |   2 -
 .../files/2016.12/0001-compile-server.patch|  22 ---
 .../files/2016.12/0001-depend-on-system-glew.patch |  72 -
 .../files/2016.12/0001-disable-edit-quality.patch  |  25 
 .../files/2016.12/0001-disable-filter-layer.patch  |  25 
 .../files/2016.12/0001-disable-filter-ssynth.patch |  25 
 .../2016.12/0001-remove-not-sane-plugins.patch |  25 
 .../0001-set-shader-and-texture-paths.patch| 164 -
 .../0001-update-1.3.3-pluginmanager.patch.patch|  29 
 .../files/2016.12/0001-use-external-bzip.patch |  51 ---
 .../files/2016.12/0001-use-external-glew.patch |  95 
 .../files/2016.12/0001-use-external-jhead.patch|  56 ---
 .../files/2016.12/0001-use-external-lib3ds.patch   |  48 --
 .../files/2016.12/0001-use-external-muParser.patch |  37 -
 .../files/2016.12/0001-use-external-openctm.patch  |  43 --
 .../files/2016.12/meshlab-2016.12-align1.patch |  16 --
 .../files/2016.12/meshlab-2016.12-align2.patch |  11 --
 .../files/2016.12/meshlab-2016.12-asString.patch   |  62 
 .../2016.12/meshlab-2016.12-fix-plugins-path.patch |  17 ---
 .../files/2016.12/meshlab-2016.12-qprintable.patch |  20 ---
 .../files/2016.12/meshlab-2016.12-qt-5.15.patch|  33 -
 .../2016.12/meshlab-2016.12-qt-includes.patch  |  22 ---
 .../2016.12/meshlab-2016.12-remove-header.patch|  38 -
 .../files/2016.12/remove-edit_mutualcorrs.patch|  10 --
 .../meshlab/files/2016.12/remove-io_TXT.patch  |  10 --
 media-gfx/meshlab/meshlab-2016.12-r4.ebuild| 113 --
 26 files changed, 1071 deletions(-)

diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 0a2b15bdb8d..0f1b247f501 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -1,4 +1,2 @@
-DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 
53dda75b51198d529d35ae64e1b9d8ec240ec6031835e6cde2ff1ad21403086112a6f4b9acf5c6f53328787078b3e1a90cc177f5e009834b310cdf6b168c59b0
 SHA512 
68bf863fc390725a949578b545bc749bbe2c07ca75d1461772cfd6a4b095f11b64b5b0e8b729f83fea1bb9e3ca4b41123cdea3799a8eee0de587eb7bf1d8
 DIST meshlab-2020.12.tar.gz 111438055 BLAKE2B 
4969c1f8f60be6ff55effd710c0bceb290ad6ac01153c233fd6a943f15e86189c04c06aa474ea89899d31b77d6960ffabbda6a12c3107d750469945e0c73c335
 SHA512 
0a00493f3e622a7bb0b70ddf0e1710376b47bd844aa785782a62f31a46ae1ee4b493c1e4ae0184f51f30be263f84efc0073e266d50748adc10ef229f107e4c87
-DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 
91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae75330c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626
 SHA512 
55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211
 DIST vcglib-2020.12.tar.gz 6777201 BLAKE2B 
9e2e3eb4ae7b930a8a334d58ee4bdadaf43e9a031d523471d17ca39d241c0dd66ec846a360cbcccd53d8728a2c7a6b6fa7d7a3efc04c01515ac3366b10f01aa8
 SHA512 
d7eec0c9c847e6ade7a3bee9aa1cddbb6855c388b15e2b35889ce998ea9a1c7afb0034ec31c38de3cbc2d867c8d8a474b13e4e2e3218e636926967abe4e54924

diff --git a/media-gfx/meshlab/files/2016.12/0001-compile-server.patch 
b/media-gfx/meshlab/files/2016.12/0001-compile-server.patch
deleted file mode 100644
index 6e2e31af9bd..000
--- a/media-gfx/meshlab/files/2016.12/0001-compile-server.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 188c3465b9cc5be7c72b21e012a89b9d07e6e2c4 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour 
-Date: Mon, 20 Nov 2017 14:40:02 +0330
-Subject: [PATCH] compile server
-

- meshlab_mini.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/meshlab_mini.pro b/meshlab_mini.pro
-index abe0259..b18771e 100644
 a/meshlab_mini.pro
-+++ b/meshlab_mini.pro
-@@ -34,4 +34,4 @@ SUBDIRS   = common \
- #meshlabplugins/filter_unsharp \
- #meshlabplugins/io_collada \
- #meshlabplugins/io_x3d \
--#meshlabserver
-+meshlabserver
--- 
-2.15.0
-

diff --git a/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch 
b/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch
deleted file mode 100644
index d8c5bb1f5aa..000
--- a/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 58a86b4c48ef89faa5d4d16c502d5350fb1c5df3 Mon Sep 17 00:00:00 2001
-From: Sobhan Mohammadpour 
-Date: Thu, 23 Nov 2017 00:57:42 +0330
-Subject: [P

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

2021-01-05 Thread Sam James

commit: 1cd7f8ce8195d34e8bebce9ca2c8d963df1dd8e9
Author: Sam James  gentoo  org>
AuthorDate: Tue Jan  5 23:41:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Jan  5 23:44:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cd7f8ce

media-gfx/meshlab: subscribe to media-libs/qhull subslot (+ others)

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 media-gfx/meshlab/meshlab-2016.12-r4.ebuild | 10 +-
 media-gfx/meshlab/meshlab-2020.12.ebuild| 12 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild 
b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
index 505a20ab0b5..07d45d2ba90 100644
--- a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
+++ b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -24,12 +24,12 @@ DEPEND="dev-cpp/eigen:3
dev-qt/qtscript:5
dev-qt/qtxmlpatterns:5
>=media-gfx/jhead-3.00-r2
-   media-libs/glew:0
-   media-libs/qhull
+   media-libs/glew:0=
+   media-libs/qhull:=
=media-libs/lib3ds-1*
-   media-libs/openctm
+   media-libs/openctm:=
sci-libs/levmar
-   sci-libs/mpir"
+   sci-libs/mpir:="
 
 RDEPEND="${DEPEND}"
 

diff --git a/media-gfx/meshlab/meshlab-2020.12.ebuild 
b/media-gfx/meshlab/meshlab-2020.12.ebuild
index 7a0a7558ae2..03fbb0d1f0e 100644
--- a/media-gfx/meshlab/meshlab-2020.12.ebuild
+++ b/media-gfx/meshlab/meshlab-2020.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,18 +19,18 @@ IUSE="double-precision -minimal"
 DEPEND="
dev-cpp/eigen:3
dev-cpp/muParser
-   dev-libs/gmp
+   dev-libs/gmp:=
>=dev-qt/qtcore-5.12:5
>=dev-qt/qtopengl-5.12:5
>=dev-qt/qtscript-5.12:5
>=dev-qt/qtxml-5.12:5
>=dev-qt/qtxmlpatterns-5.12:5
-   media-libs/glew:0
+   media-libs/glew:0=
=media-libs/lib3ds-1*
-   media-libs/openctm
-   media-libs/qhull
+   media-libs/openctm:=
+   media-libs/qhull:=
sci-libs/levmar
-   sci-libs/mpir"
+   sci-libs/mpir:="
 
 RDEPEND="${DEPEND}"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

2021-01-05 Thread Dennis Lamm

commit: 5ea0b4089a4575d1662a01da65de3421df3375be
Author: Dennis Lamm  gentoo  org>
AuthorDate: Tue Jan  5 11:16:03 2021 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Tue Jan  5 11:38:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ea0b408

media-gfx/meshlab: bug #762802

Closes: https://bugs.gentoo.org/762802

Signed-off-by: Dennis Lamm  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/18950
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/meshlab/meshlab-2020.12.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/meshlab/meshlab-2020.12.ebuild 
b/media-gfx/meshlab/meshlab-2020.12.ebuild
index 53eb1c1ee97..7a0a7558ae2 100644
--- a/media-gfx/meshlab/meshlab-2020.12.ebuild
+++ b/media-gfx/meshlab/meshlab-2020.12.ebuild
@@ -23,6 +23,7 @@ DEPEND="
>=dev-qt/qtcore-5.12:5
>=dev-qt/qtopengl-5.12:5
>=dev-qt/qtscript-5.12:5
+   >=dev-qt/qtxml-5.12:5
>=dev-qt/qtxmlpatterns-5.12:5
media-libs/glew:0
=media-libs/lib3ds-1*

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/, media-gfx/meshlab/files/

2020-12-31 Thread Dennis Lamm

commit: a57eb56c941eecbbc6f502070d24d85c30928ebd
Author: Dennis Lamm  gentoo  org>
AuthorDate: Thu Dec 31 12:36:29 2020 +
Commit: Dennis Lamm  gentoo  org>
CommitDate: Thu Dec 31 14:23:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a57eb56c

media-gfx/meshlab: version bump to 2012.12

Closes: https://bugs.gentoo.org/744025

Signed-off-by: Dennis Lamm  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/1
Signed-off-by: Dennis Lamm  gentoo.org>

 media-gfx/meshlab/Manifest |  2 +
 .../files/meshlab-2020.12-disable-updates.patch| 38 +
 .../files/meshlab-2020.12-find-plugins.patch   | 39 ++
 media-gfx/meshlab/meshlab-2020.12.ebuild   | 62 ++
 media-gfx/meshlab/metadata.xml | 22 
 5 files changed, 154 insertions(+), 9 deletions(-)

diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 4e546dc7ad7..0a2b15bdb8d 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 
68bf863fc390725a949578b545bc749bbe2c07ca75d1461772cfd6a4b095f11b64b5b0e8b729f83fea1bb9e3ca4b41123cdea3799a8eee0de587eb7bf1d8
+DIST meshlab-2020.12.tar.gz 111438055 BLAKE2B 
4969c1f8f60be6ff55effd710c0bceb290ad6ac01153c233fd6a943f15e86189c04c06aa474ea89899d31b77d6960ffabbda6a12c3107d750469945e0c73c335
 SHA512 
0a00493f3e622a7bb0b70ddf0e1710376b47bd844aa785782a62f31a46ae1ee4b493c1e4ae0184f51f30be263f84efc0073e266d50748adc10ef229f107e4c87
 DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 
91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae75330c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626
 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 000..d8cadf06d9b
--- /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 000..0d3c4c118ce
--- /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 
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");
++

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

2020-07-02 Thread Andreas Sturmlechner

commit: 3eaad036268693f4e4d28e2a72ef91074c136536
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Jun 22 22:43:11 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jul  2 09:29:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3eaad036

media-gfx/meshlab: Drop 2016.12-r2 and 2016.12-r3

r4 is in ~arch for a long time (>1.5 years), both older ebuilds are
broken by current ~arch Qt5 (5.15.0).

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/meshlab/meshlab-2016.12-r2.ebuild | 108 ---
 media-gfx/meshlab/meshlab-2016.12-r3.ebuild | 109 
 2 files changed, 217 deletions(-)

diff --git a/media-gfx/meshlab/meshlab-2016.12-r2.ebuild 
b/media-gfx/meshlab/meshlab-2016.12-r2.ebuild
deleted file mode 100644
index 2c5cb0f61d0..000
--- a/media-gfx/meshlab/meshlab-2016.12-r2.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="the open source system for processing and editing 3D triangular 
meshes"
-HOMEPAGE="http://www.meshlab.net";
-VCG_VERSION="1.0.1"
-SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> 
${P}.tar.gz
-
https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> 
vcglib-${VCG_VERSION}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-minimal"
-DEPEND="dev-cpp/eigen:3
-   dev-cpp/muParser
-   dev-qt/qtcore:5
-   dev-qt/qtopengl:5
-   dev-qt/qtscript:5
-   dev-qt/qtxmlpatterns:5
-   >=media-gfx/jhead-3.00-r2
-   media-libs/glew:0
-   media-libs/qhull
-   =media-libs/lib3ds-1*
-   media-libs/openctm
-   sci-libs/levmar
-   sci-libs/mpir"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/meshlab-${PV}/src"
-
-PATCHES=(
-   "${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
-   #remove ot working plugins
-   "${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch"
-   "${FILESDIR}/${PV}/remove-io_TXT.patch"
-   #since structure synth doesn't seem to be compiling
-   "${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
-   #this has been fixed in the tree
-   "${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
-   #this causes segfaults
-   "${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
-   #for when we use minimal
-   "${FILESDIR}/${PV}/0001-compile-server.patch"
-   "${FILESDIR}/${PV}/0001-use-external-lib3ds.patch"
-   "${FILESDIR}/${PV}/0001-use-external-openctm.patch"
-   "${FILESDIR}/${PV}/0001-use-external-muParser.patch"
-   "${FILESDIR}/${PV}/0001-use-external-bzip.patch"
-   "${FILESDIR}/${PV}/0001-use-external-jhead.patch"
-   "${FILESDIR}/${PV}/0001-use-external-glew.patch"
-   #cause gnu stack quickstart related qa
-   "${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch"
-   "${FILESDIR}/${PV}/${P}-fix-plugins-path.patch"
-   "${FILESDIR}/${PV}/${P}-align1.patch"
-   "${FILESDIR}/${PV}/${P}-align2.patch"
-   )
-
-src_prepare() {
-   mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die 
"vcglib mv failed"
-   default
-   #proof of patchset
-   #remove libs that are being used from the system
-   rm -r "external/lib3ds-1.3.0" || die "rm failed"
-   rm -r "external/OpenCTM-1.0.3" || die "rm failed"
-   rm -r "external/muparser_v132" || die "rm failed"
-   rm -r "external/muparser_v225" || die "rm failed"
-   rm -r "external/bzip2-1.0.5" || die "rm failed"
-   rm -r "external/jhead-2.95" || die "rm failed"
-   rm -r "external/glew-1.5.1" || die "rm failed"
-   rm -r "external/glew-1.7.0" || die "rm failed"
-   #we still depend on lm.h
-   #rm -r "external"
-   rm -r "distrib/plugins/U3D_W32" || die
-   rm -r "distrib/plugins/U3D_OSX" || die
-
-   # Fix bug 638796
-   cd "${WORKDIR}" || die
-   eapply "${FILESDIR}/${PV}/${P}-remove-header.patch"
-}
-
-src_configure() {
-   use minimal || eqmake5 -r meshlab_full.pro
-   use minimal && eqmake5 -r meshlab_mini.pro
-}
-
-src_install() {
-   dobin distrib/{meshlab,meshlabserver}
-   dolib distrib/libcommon.so.1.0.0
-   dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1
-   dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so
-   exeinto /usr/$(get_libdir)/meshlab/plugins
-   doexe distrib/plugins/*.so
-   insinto /usr/share/meshlab/shaders
-   doins -r distrib/shaders/*
-   insinto /usr/share/meshlab/plugins
-   doins -r distrib/plugins/*
-   insinto /usr/share/meshlab/textures
-   doins -r di

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/, media-gfx/meshlab/files/2016.12/

2020-06-22 Thread Andreas Sturmlechner

commit: 0881f14b2da1e08e0f038fc5c18aac11bf63cd6c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 21 12:02:33 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun 22 18:31:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0881f14b

media-gfx/meshlab: Fix build with Qt 5.15

Closes: https://bugs.gentoo.org/727764
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/2016.12/meshlab-2016.12-qt-5.15.patch| 33 ++
 media-gfx/meshlab/meshlab-2016.12-r4.ebuild|  1 +
 2 files changed, 34 insertions(+)

diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch 
b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch
new file mode 100644
index 000..ab052cd69eb
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-5.15.patch
@@ -0,0 +1,33 @@
+From c57222e79f1c7840e1ed01a4abd17d089f5e5185 Mon Sep 17 00:00:00 2001
+From: alemuntoni 
+Date: Tue, 26 May 2020 12:35:03 +0200
+Subject: [PATCH] missing include
+
+---
+ meshlab/glarea.cpp  | 1 +
+ meshlab/meshlab.pro | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/meshlab/glarea.cpp b/meshlab/glarea.cpp
+index 6c0421062..dfd7af229 100644
+--- a/meshlab/glarea.cpp
 b/meshlab/glarea.cpp
+@@ -34,6 +34,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ #include 
+ #include 
+diff --git a/meshlab/meshlab.pro b/meshlab/meshlab.pro
+index 26ef88d00..842eb5ea5 100644
+--- a/meshlab/meshlab.pro
 b/meshlab/meshlab.pro
+@@ -1,5 +1,6 @@
+ # You have to copy the file by hand into the meshlab.app/Contents/Resources 
directory.
+ # ICON += images/meshlab_obj.icns
++QT += gui
+ QT += opengl
+ QT += xml
+ QT += xmlpatterns

diff --git a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild 
b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
index 35b63858d6b..505a20ab0b5 100644
--- a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
+++ b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
@@ -62,6 +62,7 @@ PATCHES=(
"${FILESDIR}/${PV}/${P}-asString.patch"
"${FILESDIR}/${PV}/${P}-qprintable.patch"
"${FILESDIR}/${PV}/${P}-qt-includes.patch"
+   "${FILESDIR}/${PV}/${P}-qt-5.15.patch"
 )
 
 src_prepare() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

2020-06-22 Thread Andreas Sturmlechner

commit: dd17ac1e1c3f2767544d347fdca60692128b0708
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Jun 21 11:54:47 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Jun 22 18:31:26 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd17ac1e

media-gfx/meshlab: EAPI-7 bump, add missing desktop.eclass

Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/meshlab/meshlab-2016.12-r4.ebuild | 65 +++--
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild 
b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
index bea9e285755..35b63858d6b 100644
--- a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
+++ b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
@@ -1,21 +1,22 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit qmake-utils
+inherit desktop qmake-utils
 
-DESCRIPTION="the open source system for processing and editing 3D triangular 
meshes"
+DESCRIPTION="The open source system for processing and editing 3D triangular 
meshes"
 HOMEPAGE="http://www.meshlab.net";
 VCG_VERSION="1.0.1"
 SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> 
${P}.tar.gz
-
https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> 
vcglib-${VCG_VERSION}.tar.gz
+   https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz 
-> vcglib-${VCG_VERSION}.tar.gz
 "
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="-minimal"
+
 DEPEND="dev-cpp/eigen:3
dev-cpp/muParser
dev-qt/qtcore:5
@@ -35,33 +36,33 @@ RDEPEND="${DEPEND}"
 S="${WORKDIR}/meshlab-${PV}/src"
 
 PATCHES=(
-   "${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
-   #remove ot working plugins
-   "${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch"
-   "${FILESDIR}/${PV}/remove-io_TXT.patch"
-   #since structure synth doesn't seem to be compiling
-   "${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
-   #this has been fixed in the tree
-   "${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
-   #this causes segfaults
-   "${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
-   #for when we use minimal
-   "${FILESDIR}/${PV}/0001-compile-server.patch"
-   "${FILESDIR}/${PV}/0001-use-external-lib3ds.patch"
-   "${FILESDIR}/${PV}/0001-use-external-openctm.patch"
-   "${FILESDIR}/${PV}/0001-use-external-muParser.patch"
-   "${FILESDIR}/${PV}/0001-use-external-bzip.patch"
-   "${FILESDIR}/${PV}/0001-use-external-jhead.patch"
-   "${FILESDIR}/${PV}/0001-use-external-glew.patch"
-   #cause gnu stack quickstart related qa
-   "${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch"
-   "${FILESDIR}/${PV}/${P}-fix-plugins-path.patch"
-   "${FILESDIR}/${PV}/${P}-align1.patch"
-   "${FILESDIR}/${PV}/${P}-align2.patch"
-   "${FILESDIR}/${PV}/${P}-asString.patch"
-   "${FILESDIR}/${PV}/${P}-qprintable.patch"
-   "${FILESDIR}/${PV}/${P}-qt-includes.patch"
-   )
+   "${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
+   #remove ot working plugins
+   "${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch"
+   "${FILESDIR}/${PV}/remove-io_TXT.patch"
+   #since structure synth doesn't seem to be compiling
+   "${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
+   #this has been fixed in the tree
+   "${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
+   #this causes segfaults
+   "${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
+   #for when we use minimal
+   "${FILESDIR}/${PV}/0001-compile-server.patch"
+   "${FILESDIR}/${PV}/0001-use-external-lib3ds.patch"
+   "${FILESDIR}/${PV}/0001-use-external-openctm.patch"
+   "${FILESDIR}/${PV}/0001-use-external-muParser.patch"
+   "${FILESDIR}/${PV}/0001-use-external-bzip.patch"
+   "${FILESDIR}/${PV}/0001-use-external-jhead.patch"
+   "${FILESDIR}/${PV}/0001-use-external-glew.patch"
+   #cause gnu stack quickstart related qa
+   "${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch"
+   "${FILESDIR}/${PV}/${P}-fix-plugins-path.patch"
+   "${FILESDIR}/${PV}/${P}-align1.patch"
+   "${FILESDIR}/${PV}/${P}-align2.patch"
+   "${FILESDIR}/${PV}/${P}-asString.patch"
+   "${FILESDIR}/${PV}/${P}-qprintable.patch"
+   "${FILESDIR}/${PV}/${P}-qt-includes.patch"
+)
 
 src_prepare() {
mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die 
"vcglib mv failed"
@@ -93,7 +94,7 @@ src_configure() {
 
 src_install() {
dobin distrib/{meshlab,meshlabserver}
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/files/2016.12/, media-gfx/meshlab/

2019-01-03 Thread Amy Liffey

commit: ff0d1adb28af2bd042e1374ba7c16aa87662cb85
Author: Amy Liffey  gentoo  org>
AuthorDate: Thu Jan  3 16:49:10 2019 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Thu Jan  3 16:49:10 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff0d1adb

media-gfx/meshlab: Add fedora patches

Closes: https://bugs.gentoo.org/660542
Submitted-by:  yahoo.com>
Signed-off-by: Amy Liffey  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 .../files/2016.12/meshlab-2016.12-qprintable.patch |  20 
 .../2016.12/meshlab-2016.12-qt-includes.patch  |  22 
 media-gfx/meshlab/meshlab-2016.12-r4.ebuild| 111 +
 3 files changed, 153 insertions(+)

diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qprintable.patch 
b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qprintable.patch
new file mode 100644
index 000..61965baa9a9
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qprintable.patch
@@ -0,0 +1,20 @@
+--- a/meshlabserver/mainserver.cpp
 b/meshlabserver/mainserver.cpp
+@@ -897,7 +897,7 @@
+ }
+ 
+   if (meshDocument.size() < outmeshlist.size())
+-  fprintf(logfp, "Error: trying to save %i meshes, but only %i 
available in the project\n", qPrintable(outmeshlist.size()), 
qPrintable(meshDocument.size()));
++  fprintf(logfp, "Error: trying to save %i meshes, but only %i 
available in the project\n", outmeshlist.size(), meshDocument.size());
+   else
+   {
+   for (int ii = 0; ii < outmeshlist.size(); ++ii)
+@@ -911,7 +911,7 @@
+   fprintf(logfp, "Output mesh %s has NOT 
been saved\n", qPrintable(outmeshlist[ii].filename));
+   }
+   else
+-  fprintf(logfp, "Invalid layer %i. Output mesh 
%s will not be saved\n", qPrintable(ii), qPrintable(outmeshlist[ii].filename));
++  fprintf(logfp, "Invalid layer %i. Output mesh 
%s will not be saved\n", ii, qPrintable(outmeshlist[ii].filename));
+   }
+ 
+   }

diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-includes.patch 
b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-includes.patch
new file mode 100644
index 000..0991bfc71e1
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-includes.patch
@@ -0,0 +1,22 @@
+--- a/meshlabplugins/render_gdp/shaderDialog.h
 b/meshlabplugins/render_gdp/shaderDialog.h
+@@ -32,6 +32,8 @@
+ #include "shaderStructs.h"
+ #include "ui_shaderDialog.h"
+ #include 
++#include 
++#include 
+ 
+ class QGLWidget;
+ 
+--- a/meshlabplugins/edit_paint/paintbox.cpp
 b/meshlabplugins/edit_paint/paintbox.cpp
+@@ -23,6 +23,7 @@
+ 
+ #include "paintbox.h"
+ #include 
++#include 
+ 
+ Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : QWidget(parent, 
flags)
+ {
+ 

diff --git a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild 
b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
new file mode 100644
index 000..b9df6e46bbc
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="the open source system for processing and editing 3D triangular 
meshes"
+HOMEPAGE="http://www.meshlab.net";
+VCG_VERSION="1.0.1"
+SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+
https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> 
vcglib-${VCG_VERSION}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="-minimal"
+DEPEND="dev-cpp/eigen:3
+   dev-cpp/muParser
+   dev-qt/qtcore:5
+   dev-qt/qtopengl:5
+   dev-qt/qtscript:5
+   dev-qt/qtxmlpatterns:5
+   >=media-gfx/jhead-3.00-r2
+   media-libs/glew:0
+   media-libs/qhull
+   =media-libs/lib3ds-1*
+   media-libs/openctm
+   sci-libs/levmar
+   sci-libs/mpir"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/meshlab-${PV}/src"
+
+PATCHES=(
+   "${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
+   #remove ot working plugins
+   "${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch"
+   "${FILESDIR}/${PV}/remove-io_TXT.patch"
+   #since structure synth doesn't seem to be compiling
+   "${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
+   #this has been fixed in the tree
+   "${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
+   #this causes segfaults
+   "${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
+   #for when we use minimal
+   "${FILESDIR}/${PV}/0001-compile-server.patch"
+   "${FILESDIR}/${PV}/0001-use-external-lib3ds.patch"
+   "${FILESDIR}/${PV}/0001-use-external-openctm.patch"
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/, media-gfx/meshlab/files/2016.12/

2018-09-04 Thread Amy Liffey

commit: a1e4a213fb6bdf0c313e0a04e5e2327e28679625
Author: Amy Liffey  gentoo  org>
AuthorDate: Wed Sep  5 05:46:18 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Wed Sep  5 05:46:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1e4a213

media-gfx/meshlab: fix asString crash

- Added patch from fedora
Suggested-by: Miro Hrončok  hroncok.cz>
Closes: https://bugs.gentoo.org/660542
Package-Manager: Portage-2.3.40, Repoman-2.3.9

 .../files/2016.12/meshlab-2016.12-asString.patch   |  62 
 media-gfx/meshlab/meshlab-2016.12-r3.ebuild| 109 +
 2 files changed, 171 insertions(+)

diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-asString.patch 
b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-asString.patch
new file mode 100644
index 000..7e58790590a
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-asString.patch
@@ -0,0 +1,62 @@
+From e1410053455a497d32b1e896eb7e99a7224b6832 Mon Sep 17 00:00:00 2001
+From: Miro Hrončok 
+Date: Aug 29 2018 20:40:58 +
+Subject: Fix FTBFS (#1604819)
+
+
+---
+
+diff --git a/meshlab-2016.12-qprintable.patch 
b/meshlab-2016.12-qprintable.patch
+new file mode 100644
+index 000..9a916f6
+--- /dev/null
 b/meshlab-2016.12-qprintable.patch
+@@ -0,0 +1,20 @@
++--- a/src/meshlabserver/mainserver.cpp2016-12-23 11:24:59.0 
+0100
+ b/src/meshlabserver/mainserver.cpp.a  2018-08-29 20:32:03.009295180 
+0200
++@@ -897,7 +897,7 @@
++ }
++ 
++  if (meshDocument.size() < outmeshlist.size())
++- fprintf(logfp, "Error: trying to save %i meshes, but only %i 
available in the project\n", qPrintable(outmeshlist.size()), 
qPrintable(meshDocument.size()));
+++ fprintf(logfp, "Error: trying to save %i meshes, but only %i 
available in the project\n", outmeshlist.size(), meshDocument.size());
++  else
++  {
++  for (int ii = 0; ii < outmeshlist.size(); ++ii)
++@@ -911,7 +911,7 @@
++  fprintf(logfp, "Output mesh %s has NOT 
been saved\n", qPrintable(outmeshlist[ii].filename));
++  }
++  else
++- fprintf(logfp, "Invalid layer %i. Output mesh 
%s will not be saved\n", qPrintable(ii), qPrintable(outmeshlist[ii].filename));
+++ fprintf(logfp, "Invalid layer %i. Output mesh 
%s will not be saved\n", ii, qPrintable(outmeshlist[ii].filename));
++  }
++ 
++  }
+diff --git a/meshlab-2016.12-qt-includes.patch 
b/meshlab-2016.12-qt-includes.patch
+new file mode 100644
+index 000..66e4f67
+--- /dev/null
 b/meshlab-2016.12-qt-includes.patch
+@@ -0,0 +1,21 @@
++--- a/src/meshlabplugins/render_gdp/shaderDialog.h2016-12-23 
11:24:59.0 +0100
+ b/src/meshlabplugins/render_gdp/shaderDialog.h.a  2018-08-29 
20:55:01.414996789 +0200
++@@ -32,6 +32,8 @@
++ #include "shaderStructs.h"
++ #include "ui_shaderDialog.h"
++ #include 
+++#include 
+++#include 
++ 
++ class QGLWidget;
++ 
++--- ./meshlab-2016.12/src/meshlabplugins/edit_paint/paintbox.cpp  
2016-12-23 11:24:59.0 +0100
+ ./meshlab-2016.12/src/meshlabplugins/edit_paint/paintbox.cpp.a
2018-08-29 21:19:42.411581082 +0200
++@@ -23,6 +23,7 @@
++ 
++ #include "paintbox.h"
++ #include 
+++#include 
++ 
++ Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : 
QWidget(parent, flags)
++ {
+

diff --git a/media-gfx/meshlab/meshlab-2016.12-r3.ebuild 
b/media-gfx/meshlab/meshlab-2016.12-r3.ebuild
new file mode 100644
index 000..4fc8458b15a
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-2016.12-r3.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="the open source system for processing and editing 3D triangular 
meshes"
+HOMEPAGE="http://www.meshlab.net";
+VCG_VERSION="1.0.1"
+SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+
https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> 
vcglib-${VCG_VERSION}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="-minimal"
+DEPEND="dev-cpp/eigen:3
+   dev-cpp/muParser
+   dev-qt/qtcore:5
+   dev-qt/qtopengl:5
+   dev-qt/qtscript:5
+   dev-qt/qtxmlpatterns:5
+   >=media-gfx/jhead-3.00-r2
+   media-libs/glew:0
+   media-libs/qhull
+   =media-libs/lib3ds-1*
+   media-libs/openctm
+   sci-libs/levmar
+   sci-libs/mpir"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/meshlab-${PV}/src"
+
+PATCHES=(
+   "${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
+   #remove ot working plugins
+   "${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch"
+   "${FILESDIR}/${PV}/remove-io_TXT.patch"
+   #since structure synth doesn't seem

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

2018-09-04 Thread Amy Liffey

commit: 07414a023a7680ee5a877d5d8745eec65758bc43
Author: Amy Liffey  gentoo  org>
AuthorDate: Wed Sep  5 05:46:53 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Wed Sep  5 05:46:53 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07414a02

media-gfx/meshlab: remove old revisions

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-gfx/meshlab/meshlab-2016.12-r1.ebuild | 104 
 media-gfx/meshlab/meshlab-2016.12.ebuild| 102 ---
 2 files changed, 206 deletions(-)

diff --git a/media-gfx/meshlab/meshlab-2016.12-r1.ebuild 
b/media-gfx/meshlab/meshlab-2016.12-r1.ebuild
deleted file mode 100644
index 92057cb311a..000
--- a/media-gfx/meshlab/meshlab-2016.12-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit qmake-utils
-
-DESCRIPTION="the open source system for processing and editing 3D triangular 
meshes"
-HOMEPAGE="http://www.meshlab.net";
-VCG_VERSION="1.0.1"
-SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> 
${P}.tar.gz
-
https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> 
vcglib-${VCG_VERSION}.tar.gz
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="-minimal"
-DEPEND="dev-cpp/eigen:3
-   dev-cpp/muParser
-   dev-qt/qtcore:5
-   dev-qt/qtopengl:5
-   dev-qt/qtscript:5
-   dev-qt/qtxmlpatterns:5
-   >=media-gfx/jhead-3.00-r2
-   media-libs/glew:0
-   media-libs/qhull
-   =media-libs/lib3ds-1*
-   media-libs/openctm
-   sci-libs/levmar
-   sci-libs/mpir"
-
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/meshlab-${PV}/src"
-
-PATCHES=(
-   "${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
-   #remove ot working plugins
-   "${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch"
-   "${FILESDIR}/${PV}/remove-io_TXT.patch"
-   #since structure synth doesn't seem to be compiling
-   "${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
-   #this has been fixed in the tree
-   "${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
-   #this causes segfaults
-   "${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
-   #for when we use minimal
-   "${FILESDIR}/${PV}/0001-compile-server.patch"
-   "${FILESDIR}/${PV}/0001-use-external-lib3ds.patch"
-   "${FILESDIR}/${PV}/0001-use-external-openctm.patch"
-   "${FILESDIR}/${PV}/0001-use-external-muParser.patch"
-   "${FILESDIR}/${PV}/0001-use-external-bzip.patch"
-   "${FILESDIR}/${PV}/0001-use-external-jhead.patch"
-   "${FILESDIR}/${PV}/0001-use-external-glew.patch"
-   #cause gnu stack quickstart related qa
-   "${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch"
-   "${FILESDIR}/${PV}/${P}-fix-plugins-path.patch"
-   "${FILESDIR}/${PV}/${P}-align1.patch"
-   "${FILESDIR}/${PV}/${P}-align2.patch"
-   )
-
-src_prepare(){
-   mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die 
"vcglib mv failed"
-   default
-   #proof of patchset
-   #remove libs that are being used from the system
-   rm -r "external/lib3ds-1.3.0" || die "rm failed"
-   rm -r "external/OpenCTM-1.0.3" || die "rm failed"
-   rm -r "external/muparser_v132" || die "rm failed"
-   rm -r "external/muparser_v225" || die "rm failed"
-   rm -r "external/bzip2-1.0.5" || die "rm failed"
-   rm -r "external/jhead-2.95" || die "rm failed"
-   rm -r "external/glew-1.5.1" || die "rm failed"
-   rm -r "external/glew-1.7.0" || die "rm failed"
-   #we still depend on lm.h
-   #rm -r "external"
-   rm -r "distrib/plugins/U3D_W32" || die
-   rm -r "distrib/plugins/U3D_OSX" || die
-}
-
-src_configure() {
-   use minimal || eqmake5 -r meshlab_full.pro
-   use minimal && eqmake5 -r meshlab_mini.pro
-}
-
-src_install() {
-   dobin distrib/{meshlab,meshlabserver}
-   dolib distrib/libcommon.so.1.0.0
-   dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1
-   dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so
-   exeinto /usr/$(get_libdir)/meshlab/plugins
-   doexe distrib/plugins/*.so
-   insinto /usr/share/meshlab/shaders
-   doins -r distrib/shaders/*
-   insinto /usr/share/meshlab/plugins
-   doins -r distrib/plugins/*
-   insinto /usr/share/meshlab/textures
-   doins -r distrib/textures/*
-   insinto /usr/share/meshlab/sample
-   doins -r distrib/sample/*
-   newicon "${S}"/meshlab/images/eye512.png "${PN}".png
-   make_desktop_entry meshlab "Meshlab" "${PN}" Graphics
-}

diff --git a/media-gfx/meshlab/meshlab-2016.12.ebuild 
b/media-gfx/meshlab/meshlab-2

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

2018-04-13 Thread Aaron Bauman

commit: 07f032236d99ed09feacea2fd711bad8cc25f34e
Author: Marty E. Plummer  startmail  com>
AuthorDate: Wed Apr 11 00:02:52 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Apr 13 23:21:33 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07f03223

media-gfx/meshlab: remove trailing whitespace

Package-Manager: Portage-2.3.28, Repoman-2.3.9

 media-gfx/meshlab/meshlab-2016.12-r1.ebuild | 4 ++--
 media-gfx/meshlab/meshlab-2016.12.ebuild| 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/media-gfx/meshlab/meshlab-2016.12-r1.ebuild 
b/media-gfx/meshlab/meshlab-2016.12-r1.ebuild
index 824261918cd..92057cb311a 100644
--- a/media-gfx/meshlab/meshlab-2016.12-r1.ebuild
+++ b/media-gfx/meshlab/meshlab-2016.12-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -43,7 +43,7 @@ PATCHES=(
"${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
#this has been fixed in the tree
"${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
-   #this causes segfaults 
+   #this causes segfaults
"${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
#for when we use minimal
"${FILESDIR}/${PV}/0001-compile-server.patch"

diff --git a/media-gfx/meshlab/meshlab-2016.12.ebuild 
b/media-gfx/meshlab/meshlab-2016.12.ebuild
index 38e9c08bf73..6d45ceecb02 100644
--- a/media-gfx/meshlab/meshlab-2016.12.ebuild
+++ b/media-gfx/meshlab/meshlab-2016.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -44,7 +44,7 @@ PATCHES=(
"${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
#this has been fixed in the tree
"${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
-   #this causes segfaults 
+   #this causes segfaults
"${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
#for when we use minimal
"${FILESDIR}/${PV}/0001-compile-server.patch"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/, media-gfx/meshlab/files/2016.12/

2018-01-13 Thread Amy Liffey

commit: bcc5a4f75d7ddd502fc8a7b7ae0f080134987ba2
Author: Amy Liffey  gentoo  org>
AuthorDate: Sat Jan 13 10:22:32 2018 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sat Jan 13 10:25:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bcc5a4f7

media-gfx/meshlab: remove readheader

Submitted-by: Jura  slie.ru>
Closes: https://bugs.gentoo.org/638796
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 .../2016.12/meshlab-2016.12-remove-header.patch|  38 
 media-gfx/meshlab/meshlab-2016.12-r2.ebuild| 108 +
 2 files changed, 146 insertions(+)

diff --git 
a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-remove-header.patch 
b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-remove-header.patch
new file mode 100644
index 000..8aeace8546a
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/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.0 
+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 >  & shots,
+  std::vector & 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.0 
+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 >  & shots,
+  std::vector & image_filenames,
+  const char * filename,const char * filename_images, 
CallBackPos *cb=0)

diff --git a/media-gfx/meshlab/meshlab-2016.12-r2.ebuild 
b/media-gfx/meshlab/meshlab-2016.12-r2.ebuild
new file mode 100644
index 000..adc2830aa0f
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-2016.12-r2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="the open source system for processing and editing 3D triangular 
meshes"
+HOMEPAGE="http://www.meshlab.net";
+VCG_VERSION="1.0.1"
+SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+
https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> 
vcglib-${VCG_VERSION}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="-minimal"
+DEPEND="dev-cpp/eigen:3
+   dev-cpp/muParser
+   dev-qt/qtcore:5
+   dev-qt/qtopengl:5
+   dev-qt/qtscript:5
+   dev-qt/qtxmlpatterns:5
+   >=media-gfx/jhead-3.00-r2
+   media-libs/glew:0
+   media-libs/qhull
+   =media-libs/lib3ds-1*
+   media-libs/openctm
+   sci-libs/levmar
+   sci-libs/mpir"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/meshlab-${PV}/src"
+
+PATCHES=(
+   "${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
+   #remove ot working plugins
+   "${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch"
+   "${FILESDIR}/${PV}/remove-io_TXT.patch"
+   #since structure synth doesn't seem to be compiling
+   "${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch"
+   #this has been fixed in the tree
+   "${FILESDIR}/${PV}/0001-disable-edit-quality.patch"
+   #this causes segfaults
+   "${FILESDIR}/${PV}/0001-disable-filter-layer.patch"
+   #for when we use minimal
+   "${FILESDIR}/${PV}/0001-compile-server.patch"
+   "${FILESDIR}/${PV}/0001-use-external-lib3ds.patch"
+   "${FILESDIR}/${PV}/0001-use-external-openctm.patch"
+   "${FILESDIR}/${PV}/0001-use-external-muParser.patch"
+   "${FILESDIR}/${PV}/0001-use-external-bzip.patch"
+   "${FILESDIR}/${PV}/0001-use-external-jhead.patch"
+   "${FILESDIR}/${PV}/0001-use-external-glew.patch"
+   #cause gnu stack quickstart related qa
+   "${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch"
+   "${FILESDIR}/${PV}/${P}-fix-plugins-path.patch"
+   "${FILESDIR}/${PV}/${P}-align1.patch"
+   "${FILESDIR}/${PV}/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/files/2016.12/, media-gfx/meshlab/

2017-12-27 Thread Amy Liffey

commit: b5adf61fc5ab5b1d96143e1ebb5f62d7ea26b5f0
Author: Amy Liffey  gentoo  org>
AuthorDate: Wed Dec 27 16:16:45 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Wed Dec 27 16:21:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5adf61f

media-gfx/meshlab: fix align and plugin path

- Align fix -> Submitted-by:luc_pierard_de_maujouy  yahoo.fr
Closes: https://bugs.gentoo.org/638796

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 .../files/2016.12/meshlab-2016.12-align1.patch |  16 
 .../files/2016.12/meshlab-2016.12-align2.patch |  11 +++
 .../2016.12/meshlab-2016.12-fix-plugins-path.patch |  17 
 media-gfx/meshlab/meshlab-2016.12-r1.ebuild| 104 +
 4 files changed, 148 insertions(+)

diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align1.patch 
b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align1.patch
new file mode 100644
index 000..cdba89c0ac3
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align1.patch
@@ -0,0 +1,16 @@
+--- a/meshlabplugins/edit_align/align/AlignGlobal.cpp  2016-12-23 
13:24:59.0 +0300
 b/meshlabplugins/edit_align/align/AlignGlobal.cpp  2017-11-26 
03:05:11.010113483 +0300
+@@ -429,11 +429,11 @@
+ 
+ **/
+ 
+-bool AlignGlobal::GlobalAlign(const std::map &Names,  const 
double epsilon, int maxiter, bool Rigid, FILE *elfp, CallBack* cb )
++bool AlignGlobal::GlobalAlign(const std::map &Names,  const 
double epsilon, int maxiter, bool Rigid, FILE *elfp, CallBackPos* cb )
+ {
+   double change;
+   int step, localmaxiter;
+-  cb("Global Alignment...");
++  cb(0,"Global Alignment...");
+   LOG(elfp,"\n\nGlobalAlignment (target eps 
%7.3f)\n",epsilon);
+ 
+   queue  Q;

diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align2.patch 
b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align2.patch
new file mode 100644
index 000..455eec096c8
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-align2.patch
@@ -0,0 +1,11 @@
+--- a/meshlabplugins/edit_align/align/AlignGlobal.h2016-12-23 
13:24:59.0 +0300
 b/meshlabplugins/edit_align/align/AlignGlobal.h2017-11-26 
03:10:09.210116792 +0300
+@@ -115,7 +115,7 @@
+   Node *ChooseDormantWithMostActiveLink  ();
+   void MakeAllDormant();
+   void Clear();
+-  bool GlobalAlign(const std::map &Names,const double 
epsilon, int maxiter, bool Rigid, FILE *elfp=0, CallBack * cb=DummyCallBack );
++  bool GlobalAlign(const std::map &Names,const double 
epsilon, int maxiter, bool Rigid, FILE *elfp=0, CallBackPos * 
cb=DummyCallBackPos );
+ 
+ bool CheckGraph();
+ 

diff --git 
a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-fix-plugins-path.patch 
b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-fix-plugins-path.patch
new file mode 100644
index 000..d7b17fe904b
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-fix-plugins-path.patch
@@ -0,0 +1,17 @@
+diff --git a/common/pluginmanager.cpp b/common/pluginmanager.cpp
+index 5354055..9a523d4 100644
+--- a/common/pluginmanager.cpp
 b/common/pluginmanager.cpp
+@@ -189,7 +189,11 @@ QString PluginManager::osDependentFileBaseName(const 
QString &plname)
+ 
+ QString PluginManager::getBaseDirPath()
+ {
+-  QDir baseDir(qApp->applicationDirPath());
++  #if defined(Q_OS_LINUX)
++  QDir baseDir("/usr/share/meshlab");
++  #else
++  QDir baseDir(qApp->applicationDirPath());
++  #endif
+ 
+ #if defined(Q_OS_WIN)
+   // Windows:

diff --git a/media-gfx/meshlab/meshlab-2016.12-r1.ebuild 
b/media-gfx/meshlab/meshlab-2016.12-r1.ebuild
new file mode 100644
index 000..824261918cd
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-2016.12-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit qmake-utils
+
+DESCRIPTION="the open source system for processing and editing 3D triangular 
meshes"
+HOMEPAGE="http://www.meshlab.net";
+VCG_VERSION="1.0.1"
+SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> 
${P}.tar.gz
+
https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> 
vcglib-${VCG_VERSION}.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="-minimal"
+DEPEND="dev-cpp/eigen:3
+   dev-cpp/muParser
+   dev-qt/qtcore:5
+   dev-qt/qtopengl:5
+   dev-qt/qtscript:5
+   dev-qt/qtxmlpatterns:5
+   >=media-gfx/jhead-3.00-r2
+   media-libs/glew:0
+   media-libs/qhull
+   =media-libs/lib3ds-1*
+   media-libs/openctm
+   sci-libs/levmar
+   sci-libs/mpir"
+
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/meshlab-${PV}/src"
+
+PATCHES=(
+   "${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch"
+   #remove ot working plugins
+   "${FILESDIR}/${PV}/remove-edit_mutualcorrs.patc

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

2017-12-08 Thread Amy Liffey

commit: e2a4f195ee304178d839510290862eabf891c2ae
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri Dec  8 15:15:02 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri Dec  8 15:16:47 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2a4f195

media-gfx/meshlab: add missing dep qtscript

Reported-by:François Delègue  francois-delegue.fr>

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 media-gfx/meshlab/meshlab-2016.12.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-gfx/meshlab/meshlab-2016.12.ebuild 
b/media-gfx/meshlab/meshlab-2016.12.ebuild
index dcef47388f3..38e9c08bf73 100644
--- a/media-gfx/meshlab/meshlab-2016.12.ebuild
+++ b/media-gfx/meshlab/meshlab-2016.12.ebuild
@@ -20,6 +20,7 @@ DEPEND="dev-cpp/eigen:3
dev-cpp/muParser
dev-qt/qtcore:5
dev-qt/qtopengl:5
+   dev-qt/qtscript:5
dev-qt/qtxmlpatterns:5
>=media-gfx/jhead-3.00-r2
media-libs/glew:0

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/, media-gfx/meshlab/files/2016.12/

2017-11-25 Thread Amy Liffey

commit: 50087cd3c5c379d2948644e13c9bd48554270f69
Author: Sobhan Mohammadpour  gmail  com>
AuthorDate: Sat Nov 25 08:32:10 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sat Nov 25 10:25:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50087cd3

media-gfx/meshlab: version bump to 2016.12

- Bump to 2016.12
- Patches readded external: muParser, bzip ( Amynka )
- Add ~x86 keyword ( Amynka )
Closes: #6291
Closes: https://bugs.gentoo.org/607228

 media-gfx/meshlab/Manifest |   2 +
 .../files/2016.12/0001-compile-server.patch|  22 +++
 .../files/2016.12/0001-depend-on-system-glew.patch |  72 +
 .../files/2016.12/0001-disable-edit-quality.patch  |  25 
 .../files/2016.12/0001-disable-filter-layer.patch  |  25 
 .../files/2016.12/0001-disable-filter-ssynth.patch |  25 
 .../2016.12/0001-remove-not-sane-plugins.patch |  25 
 .../0001-set-shader-and-texture-paths.patch| 164 +
 .../0001-update-1.3.3-pluginmanager.patch.patch|  29 
 .../files/2016.12/0001-use-external-bzip.patch |  51 +++
 .../files/2016.12/0001-use-external-glew.patch |  95 
 .../files/2016.12/0001-use-external-jhead.patch|  56 +++
 .../files/2016.12/0001-use-external-lib3ds.patch   |  48 ++
 .../files/2016.12/0001-use-external-muParser.patch |  37 +
 .../files/2016.12/0001-use-external-openctm.patch  |  43 ++
 .../files/2016.12/remove-edit_mutualcorrs.patch|  10 ++
 .../meshlab/files/2016.12/remove-io_TXT.patch  |  10 ++
 media-gfx/meshlab/meshlab-2016.12.ebuild   | 101 +
 18 files changed, 840 insertions(+)

diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 8bed7d39099..621bcabd578 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -1,2 +1,4 @@
 DIST MeshLabSrc_AllInc_v132.tgz 12874196 SHA256 
d57f0a99a55421aac54a66e2475d48f00f7b1752f9587cd69cf9b5b9c1a519b1 SHA512 
40ef1f887d18e2146d6001d9c290bb76f6fc27caf13a1256a4061d5e2c43fd8dfdc843ace2cb83c6370648c2c5be3a22e2d5b31698df46e0695890d6a20651ac
 WHIRLPOOL 
aa6da94a8d5b9d28c9b787fe307774b7223e57278ed45c3bf1a823da9f5a9b59fd058a466f3f4dea3c4c57e3934b0aed88b1446f20e746349881c1bc965fec36
 DIST MeshLabSrc_AllInc_v133.tgz 13390531 SHA256 
c9829cd1f58713f1f82d546af1ee69291b52a0f94585f803174fb9e55654980f SHA512 
ec155292be10ebe17a7d41b26d51cce88e1f00b692b8adb29462a2c3cb15444c6f27067a3396e4427cd694c82424910ba80f32f536b5f5d46d6765b2461cef43
 WHIRLPOOL 
f1f938e7eb8d648f2a8ac4399420d947efe403f19cc163b4a4e28f8cf620ae5aa22d17503e3b5ca7920996e78dfbb41dbd89447d61bd95e4a2f69420f2196d5d
+DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 
53dda75b51198d529d35ae64e1b9d8ec240ec6031835e6cde2ff1ad21403086112a6f4b9acf5c6f53328787078b3e1a90cc177f5e009834b310cdf6b168c59b0
 SHA512 
68bf863fc390725a949578b545bc749bbe2c07ca75d1461772cfd6a4b095f11b64b5b0e8b729f83fea1bb9e3ca4b41123cdea3799a8eee0de587eb7bf1d8
+DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 
91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae75330c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626
 SHA512 
55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211

diff --git a/media-gfx/meshlab/files/2016.12/0001-compile-server.patch 
b/media-gfx/meshlab/files/2016.12/0001-compile-server.patch
new file mode 100644
index 000..6e2e31af9bd
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/0001-compile-server.patch
@@ -0,0 +1,22 @@
+From 188c3465b9cc5be7c72b21e012a89b9d07e6e2c4 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour 
+Date: Mon, 20 Nov 2017 14:40:02 +0330
+Subject: [PATCH] compile server
+
+---
+ meshlab_mini.pro | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meshlab_mini.pro b/meshlab_mini.pro
+index abe0259..b18771e 100644
+--- a/meshlab_mini.pro
 b/meshlab_mini.pro
+@@ -34,4 +34,4 @@ SUBDIRS   = common \
+ #meshlabplugins/filter_unsharp \
+ #meshlabplugins/io_collada \
+ #meshlabplugins/io_x3d \
+-#meshlabserver
++meshlabserver
+-- 
+2.15.0
+

diff --git a/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch 
b/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch
new file mode 100644
index 000..d8c5bb1f5aa
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/0001-depend-on-system-glew.patch
@@ -0,0 +1,72 @@
+From 58a86b4c48ef89faa5d4d16c502d5350fb1c5df3 Mon Sep 17 00:00:00 2001
+From: Sobhan Mohammadpour 
+Date: Thu, 23 Nov 2017 00:57:42 +0330
+Subject: [PATCH] depend-on-system-glew
+
+---
+ common/common.pro   | 7 +--
+ meshlab/meshlab.pro | 2 --
+ 2 files changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/common/common.pro b/common/common.pro
+index 51cdcb5..85849dc 100644
+--- a/common/common.pro
 b/common/common.pro
+@@ -1,7 +1,6 @@
+ include

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

2017-11-25 Thread Amy Liffey

commit: 67a7c1a6fb85aebcf5c14586d1aea85a41d2b999
Author: Amy Liffey  gentoo  org>
AuthorDate: Sat Nov 25 10:22:58 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sat Nov 25 10:25:55 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67a7c1a6

media-gfx/meshlab: fix metadata

Package-Manager: Portage-2.3.13, Repoman-2.3.3

 media-gfx/meshlab/metadata.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/media-gfx/meshlab/metadata.xml b/media-gfx/meshlab/metadata.xml
index 2c2e1a6a68f..0b461a28eac 100644
--- a/media-gfx/meshlab/metadata.xml
+++ b/media-gfx/meshlab/metadata.xml
@@ -9,11 +9,11 @@
Gentoo 3D print


- 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.
-
+   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.
+   

meshlab

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/files/1.3.2/, media-gfx/meshlab/, ...

2017-11-25 Thread Amy Liffey

commit: aff5eaa946f533f5e199d2d32e3279a505102280
Author: Amy Liffey  gentoo  org>
AuthorDate: Sat Nov 25 10:24:28 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Sat Nov 25 10:25:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aff5eaa9

media-gfx/meshlab: remove old

Closes: https://bugs.gentoo.org/589980
Package-Manager: Portage-2.3.13, Repoman-2.3.3

 media-gfx/meshlab/Manifest |   2 -
 .../meshlab/files/1.3.2/01_crash-on-save.patch |  29 
 media-gfx/meshlab/files/1.3.2/02_cstddef.patch |  46 ---
 .../meshlab/files/1.3.2/03_disable-updates.patch   |  21 ---
 media-gfx/meshlab/files/1.3.2/05_externals.patch   |  25 
 .../meshlab/files/1.3.2/06_format-security.patch   |  44 ---
 media-gfx/meshlab/files/1.3.2/07_gcc47.patch   | 105 ---
 media-gfx/meshlab/files/1.3.2/08_lib3ds.patch  |  32 -
 media-gfx/meshlab/files/1.3.2/09_libbz2.patch  |  31 -
 media-gfx/meshlab/files/1.3.2/10_muparser.patch|  30 -
 media-gfx/meshlab/files/1.3.2/11_openctm.patch |  31 -
 media-gfx/meshlab/files/1.3.2/12_overflow.patch|  23 
 media-gfx/meshlab/files/1.3.2/13_pluginsdir.patch  |  21 ---
 media-gfx/meshlab/files/1.3.2/14_ply_numeric.patch |  32 -
 media-gfx/meshlab/files/1.3.2/15_qhull.patch   |  67 --
 media-gfx/meshlab/files/1.3.2/16_shadersdir.patch  |  49 ---
 .../meshlab/files/1.3.2/17_structuresynth.patch|  48 ---
 media-gfx/meshlab/files/1.3.2/18_glew.c18p1.patch  | 146 -
 .../files/1.3.2/19_CONFLICTS_IN_rpath.patch|  32 -
 media-gfx/meshlab/files/1.3.2/20_rpath.c18p2.patch |  43 --
 media-gfx/meshlab/files/1.3.2/21_RESOLUTION.patch  |  29 
 media-gfx/meshlab/files/1.3.2/22_aliasing.patch|  43 --
 media-gfx/meshlab/files/1.3.3/gcc-4.7.patch|  12 --
 media-gfx/meshlab/files/1.3.3/lapack.patch |  11 --
 media-gfx/meshlab/files/1.3.3/meshrender.patch |  15 ---
 media-gfx/meshlab/files/1.3.3/mpir.patch   |  10 --
 media-gfx/meshlab/files/1.3.3/pluginmanager.patch  |  14 --
 media-gfx/meshlab/files/1.3.3/qt-4.8.patch |  11 --
 media-gfx/meshlab/files/1.3.3/rfx.patch|  14 --
 media-gfx/meshlab/files/1.3.3/rmmeshrender.patch   |  15 ---
 media-gfx/meshlab/files/1.3.3/rpath.patch  |  39 --
 media-gfx/meshlab/files/1.3.3/structuresynth.patch |  11 --
 media-gfx/meshlab/meshlab-1.3.2.ebuild |  83 
 media-gfx/meshlab/meshlab-1.3.3-r1.ebuild  |  72 --
 34 files changed, 1236 deletions(-)

diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index 621bcabd578..4e546dc7ad7 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -1,4 +1,2 @@
-DIST MeshLabSrc_AllInc_v132.tgz 12874196 SHA256 
d57f0a99a55421aac54a66e2475d48f00f7b1752f9587cd69cf9b5b9c1a519b1 SHA512 
40ef1f887d18e2146d6001d9c290bb76f6fc27caf13a1256a4061d5e2c43fd8dfdc843ace2cb83c6370648c2c5be3a22e2d5b31698df46e0695890d6a20651ac
 WHIRLPOOL 
aa6da94a8d5b9d28c9b787fe307774b7223e57278ed45c3bf1a823da9f5a9b59fd058a466f3f4dea3c4c57e3934b0aed88b1446f20e746349881c1bc965fec36
-DIST MeshLabSrc_AllInc_v133.tgz 13390531 SHA256 
c9829cd1f58713f1f82d546af1ee69291b52a0f94585f803174fb9e55654980f SHA512 
ec155292be10ebe17a7d41b26d51cce88e1f00b692b8adb29462a2c3cb15444c6f27067a3396e4427cd694c82424910ba80f32f536b5f5d46d6765b2461cef43
 WHIRLPOOL 
f1f938e7eb8d648f2a8ac4399420d947efe403f19cc163b4a4e28f8cf620ae5aa22d17503e3b5ca7920996e78dfbb41dbd89447d61bd95e4a2f69420f2196d5d
 DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 
53dda75b51198d529d35ae64e1b9d8ec240ec6031835e6cde2ff1ad21403086112a6f4b9acf5c6f53328787078b3e1a90cc177f5e009834b310cdf6b168c59b0
 SHA512 
68bf863fc390725a949578b545bc749bbe2c07ca75d1461772cfd6a4b095f11b64b5b0e8b729f83fea1bb9e3ca4b41123cdea3799a8eee0de587eb7bf1d8
 DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 
91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae75330c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626
 SHA512 
55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211

diff --git a/media-gfx/meshlab/files/1.3.2/01_crash-on-save.patch 
b/media-gfx/meshlab/files/1.3.2/01_crash-on-save.patch
deleted file mode 100644
index 84c5ced8dc6..000
--- a/media-gfx/meshlab/files/1.3.2/01_crash-on-save.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Teemu Ikonen 
-Subject: Fix crash on project save (closes: #718583)
-Git-Branch: p/crash-on-save
-Git-Diff: 532bdd9a6bde03cf47da8fb63fee60..cfc9473d1fa0e565d0aad4994fbb31
-
-Patch from upstream SVN commit [r6114].
-
- meshlab/src/meshlab/mainwindow_RunTime.cpp |8 ++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/meshlab/src/meshlab/mainwindow_RunTime.cpp 
b/meshlab/src/meshlab/mainwindow_RunTime.cpp
-index 8f5057c..3273cec 100644
 a/meshlab/src/meshl

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

2017-08-11 Thread Amy Liffey

commit: f27e3bf00ccc94fcd7e5b3a0e10d3888ebe87e3e
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri Aug 11 19:52:36 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri Aug 11 19:56:54 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f27e3bf0

media-gfx/meshlab: fix homepage

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-gfx/meshlab/meshlab-1.3.2.ebuild| 2 +-
 media-gfx/meshlab/meshlab-1.3.3-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/meshlab/meshlab-1.3.2.ebuild 
b/media-gfx/meshlab/meshlab-1.3.2.ebuild
index 587c5dbe263..8e91280e50f 100644
--- a/media-gfx/meshlab/meshlab-1.3.2.ebuild
+++ b/media-gfx/meshlab/meshlab-1.3.2.ebuild
@@ -6,7 +6,7 @@ EAPI=5
 inherit eutils versionator multilib qt4-r2
 
 DESCRIPTION="A mesh processing system"
-HOMEPAGE="http://meshlab.sourceforge.net/";
+HOMEPAGE="https://meshlab.sourceforge.net/";
 MY_PV="$(delete_all_version_separators ${PV})"
 
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/MeshLab%20v${PV}/MeshLabSrc_AllInc_v${MY_PV}.tgz"
 

diff --git a/media-gfx/meshlab/meshlab-1.3.3-r1.ebuild 
b/media-gfx/meshlab/meshlab-1.3.3-r1.ebuild
index 8cfb26c0df4..badcfa5d477 100644
--- a/media-gfx/meshlab/meshlab-1.3.3-r1.ebuild
+++ b/media-gfx/meshlab/meshlab-1.3.3-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit eutils versionator
 
 DESCRIPTION="A mesh processing system"
-HOMEPAGE="http://meshlab.sourceforge.net/";
+HOMEPAGE="https://meshlab.sourceforge.net/";
 MY_PV="$(delete_all_version_separators ${PV})"
 
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/MeshLab%20v${PV}/MeshLabSrc_AllInc_v${MY_PV}.tgz"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/files/1.3.3/, media-gfx/meshlab/

2017-08-11 Thread Amy Liffey

commit: 63a246e7653f2940e57e4c8a2cfb7394aca6269a
Author: Amy Liffey  gentoo  org>
AuthorDate: Fri Aug 11 12:41:07 2017 +
Commit: Amy Liffey  gentoo  org>
CommitDate: Fri Aug 11 12:45:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63a246e7

media-gfx/meshlab: EAPI 6 bump ,fix bug #614776

- Add patch structuresynth build failure
Submitted-by: CaptainBlood  yahoo.fr>

- Fix slot glew

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 media-gfx/meshlab/files/1.3.3/gcc-4.7.patch|  4 +--
 media-gfx/meshlab/files/1.3.3/lapack.patch |  4 +--
 media-gfx/meshlab/files/1.3.3/meshrender.patch |  4 +--
 media-gfx/meshlab/files/1.3.3/mpir.patch   |  4 +--
 media-gfx/meshlab/files/1.3.3/pluginmanager.patch  |  4 +--
 media-gfx/meshlab/files/1.3.3/qt-4.8.patch |  4 +--
 media-gfx/meshlab/files/1.3.3/rfx.patch|  4 +--
 media-gfx/meshlab/files/1.3.3/rmmeshrender.patch   |  4 +--
 media-gfx/meshlab/files/1.3.3/rpath.patch  |  8 +++---
 media-gfx/meshlab/files/1.3.3/structuresynth.patch | 11 
 media-gfx/meshlab/meshlab-1.3.2.ebuild |  4 +--
 ...eshlab-1.3.3.ebuild => meshlab-1.3.3-r1.ebuild} | 31 --
 12 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch 
b/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch
index b918ca52ec4..6329f23e794 100644
--- a/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch
+++ b/media-gfx/meshlab/files/1.3.3/gcc-4.7.patch
@@ -1,7 +1,7 @@
 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
+--- a/vcglib/wrap/ply/plystuff.h
 b/vcglib/wrap/ply/plystuff.h
 @@ -75,6 +75,7 @@ using namespace vcg;
  #define pb_close  _close
  #define DIR_SEP "\\"

diff --git a/media-gfx/meshlab/files/1.3.3/lapack.patch 
b/media-gfx/meshlab/files/1.3.3/lapack.patch
index 81c09463405..e2742eb 100644
--- a/media-gfx/meshlab/files/1.3.3/lapack.patch
+++ b/media-gfx/meshlab/files/1.3.3/lapack.patch
@@ -1,6 +1,6 @@
 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.0 
+1000
-+++ meshlab/src/external/levmar-2.3/lm.h   2010-05-13 20:17:35.488505907 
+1000
+--- a/meshlab/src/external/levmar-2.3/lm.h 2010-04-28 17:30:47.0 
+1000
 b/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 */

diff --git a/media-gfx/meshlab/files/1.3.3/meshrender.patch 
b/media-gfx/meshlab/files/1.3.3/meshrender.patch
index 382e21ca2f0..33eb1cbf703 100644
--- a/media-gfx/meshlab/files/1.3.3/meshrender.patch
+++ b/media-gfx/meshlab/files/1.3.3/meshrender.patch
@@ -1,5 +1,5 @@
 meshlab/src/meshlabplugins/render_gdp/meshrender.cpp   2014-02-07 
10:38:28.0 +0100
-+++ meshlab/src/meshlabplugins/render_gdb/meshrender.cpp   2015-11-15 
22:17:39.848179962 +0100
+--- a/meshlab/src/meshlabplugins/render_gdp/meshrender.cpp 2014-02-07 
10:38:28.0 +0100
 b/meshlab/src/meshlabplugins/render_gdb/meshrender.cpp 2015-11-15 
22:17:39.848179962 +0100
 @@ -36,8 +36,11 @@
/*QAction * qaNone = new QAction("None", this); 
qaNone->setCheckable(false);

diff --git a/media-gfx/meshlab/files/1.3.3/mpir.patch 
b/media-gfx/meshlab/files/1.3.3/mpir.patch
index a3f8d051d89..fae203e18a1 100644
--- a/media-gfx/meshlab/files/1.3.3/mpir.patch
+++ b/media-gfx/meshlab/files/1.3.3/mpir.patch
@@ -1,6 +1,6 @@
 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.0 +1100
-+++ meshlab/src/meshlabplugins/filter_csg/filter_csg.pro   2014-06-01 
21:10:24.521095356 +1000
+--- a/meshlab/src/meshlabplugins/filter_csg/filter_csg.pro 2014-04-02 
02:59:31.0 +1100
 b/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

diff --git a/media-gfx/meshlab/files/1.3.3/pluginmanager.patch 
b/media-gfx/meshlab/files/1.3.3/pluginmanager.patch
index 00f3ba8c182..853015da4d0 100644
--- a/media-gfx/meshlab/files/1.3.3/pluginmanager.patch
+++ b/media-gfx/meshlab/files/1.3.3/pluginmanager.patch
@@ -1,5 +1,5 @@
 meshlab/src/common/pluginmanager.cpp~  2014-04-01 17:07:40.0 
+0200
-+++ meshlab/src/common/pluginmanager.cpp   2015-11-15 20:58:53.708227793 
+0100
+--- a/meshlab/src/common/pluginmanager.cpp

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

2016-05-14 Thread Amy Winston

commit: db696dacc9188d710d8ad1484d0e1a0e8a91216f
Author: Amy Winston  gentoo  org>
AuthorDate: Sat May 14 14:32:02 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Sat May 14 14:32:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db696dac

media-gfx/meshlab: add missing dep bug #581496

Package-Manager: portage-2.2.26

 media-gfx/meshlab/meshlab-1.3.3.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-gfx/meshlab/meshlab-1.3.3.ebuild 
b/media-gfx/meshlab/meshlab-1.3.3.ebuild
index e8d6cb2..d8276f9 100644
--- a/media-gfx/meshlab/meshlab-1.3.3.ebuild
+++ b/media-gfx/meshlab/meshlab-1.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,6 +19,7 @@ DEPEND="dev-cpp/eigen:3
dev-cpp/muParser
dev-qt/qtcore:4
dev-qt/qtopengl:4
+   dev-qt/qtxmlpatterns:4
media-libs/glew
media-libs/qhull
=media-libs/lib3ds-1*

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/, media-gfx/meshlab/files/1.3.3/

2015-11-17 Thread Amy Winston

commit: 294ebb1f6ae70e2db2d3bf624191abf4f7b67caf
Author: Amy Winston  gentoo  org>
AuthorDate: Tue Nov 17 17:58:11 2015 +
Commit: Amy Winston  gentoo  org>
CommitDate: Tue Nov 17 17:59:16 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=294ebb1f

media-gfx/meshlab: patches for plugins added bug #558758. By Dominik Joe 
Pantucek.

Package-Manager: portage-2.2.20.1

 media-gfx/meshlab/files/1.3.3/meshrender.patch| 15 +++
 media-gfx/meshlab/files/1.3.3/pluginmanager.patch | 14 ++
 media-gfx/meshlab/files/1.3.3/rfx.patch   | 14 ++
 media-gfx/meshlab/files/1.3.3/rmmeshrender.patch  | 15 +++
 media-gfx/meshlab/meshlab-1.3.3.ebuild|  6 +-
 5 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/media-gfx/meshlab/files/1.3.3/meshrender.patch 
b/media-gfx/meshlab/files/1.3.3/meshrender.patch
new file mode 100644
index 000..382e21c
--- /dev/null
+++ b/media-gfx/meshlab/files/1.3.3/meshrender.patch
@@ -0,0 +1,15 @@
+--- meshlab/src/meshlabplugins/render_gdp/meshrender.cpp   2014-02-07 
10:38:28.0 +0100
 meshlab/src/meshlabplugins/render_gdb/meshrender.cpp   2015-11-15 
22:17:39.848179962 +0100
+@@ -36,8 +36,11 @@
+   /*QAction * qaNone = new QAction("None", this); 
+   qaNone->setCheckable(false);
+   actionList << qaNone;*/
+-
++#if defined(Q_OS_LINUX)
++  QDir shadersDir = QDir("/usr/share/meshlab");
++#else
+   QDir shadersDir = QDir(qApp->applicationDirPath());
++#endif
+ #if defined(Q_OS_WIN)
+   if (shadersDir.dirName() == "debug" || shadersDir.dirName() == 
"release" || shadersDir.dirName() == "plugins"  )
+   shadersDir.cdUp();

diff --git a/media-gfx/meshlab/files/1.3.3/pluginmanager.patch 
b/media-gfx/meshlab/files/1.3.3/pluginmanager.patch
new file mode 100644
index 000..00f3ba8
--- /dev/null
+++ b/media-gfx/meshlab/files/1.3.3/pluginmanager.patch
@@ -0,0 +1,14 @@
+--- meshlab/src/common/pluginmanager.cpp~  2014-04-01 17:07:40.0 
+0200
 meshlab/src/common/pluginmanager.cpp   2015-11-15 20:58:53.708227793 
+0100
+@@ -178,7 +178,11 @@
+ 
+ QString PluginManager::getBaseDirPath()
+ {
++#if defined(Q_OS_LINUX)
++  QDir baseDir("/usr/lib/meshlab");
++#else
+   QDir baseDir(qApp->applicationDirPath());
++#endif
+ 
+ #if defined(Q_OS_WIN)
+   // Windows:

diff --git a/media-gfx/meshlab/files/1.3.3/rfx.patch 
b/media-gfx/meshlab/files/1.3.3/rfx.patch
new file mode 100644
index 000..9cac559
--- /dev/null
+++ b/media-gfx/meshlab/files/1.3.3/rfx.patch
@@ -0,0 +1,14 @@
+--- meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp~  2014-02-07 
10:38:29.0 +0100
 meshlab/src/meshlabplugins/render_rfx/render_rfx.cpp   2015-11-16 
00:07:34.868113218 +0100
+@@ -55,7 +55,11 @@
+ 
+ void RenderRFX::initActionList()
+ {
++#if defined(Q_OS_LINUX)
++  QDir shadersDir("/usr/share/meshlab");
++#else
+   QDir shadersDir = PluginManager::getBaseDirPath();
++#endif
+ 
+ #if defined(Q_OS_WIN)
+   if (shadersDir.dirName() == "debug"   ||

diff --git a/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch 
b/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch
new file mode 100644
index 000..59f
--- /dev/null
+++ b/media-gfx/meshlab/files/1.3.3/rmmeshrender.patch
@@ -0,0 +1,15 @@
+--- meshlab/src/plugins_unsupported/render_rm/rmmeshrender.cpp~
2013-05-22 17:08:53.0 +0200
 meshlab/src/plugins_unsupported/render_rm/rmmeshrender.cpp 2015-11-15 
23:18:04.678143277 +0100
+@@ -63,7 +63,12 @@
+ 
+ void RmMeshShaderRenderPlugin::initActionList() {
+ 
++#if defined(Q_OS_LINUX)
++  QDir shadersDir = QDir("/usr/share/meshlab/shaders");
++#else
+   QDir shadersDir = QDir(qApp->applicationDirPath());
++#endif
++
+ #if defined(Q_OS_WIN)
+   if (shadersDir.dirName() == "debug" ||
+   shadersDir.dirName() == "release" ||

diff --git a/media-gfx/meshlab/meshlab-1.3.3.ebuild 
b/media-gfx/meshlab/meshlab-1.3.3.ebuild
index 10241aa..e8d6cb2 100644
--- a/media-gfx/meshlab/meshlab-1.3.3.ebuild
+++ b/media-gfx/meshlab/meshlab-1.3.3.ebuild
@@ -36,7 +36,11 @@ src_prepare() {
"${FILESDIR}/${PV}"/lapack.patch \
"${FILESDIR}/${PV}"/mpir.patch \
"${FILESDIR}/${PV}"/qt-4.8.patch \
-   "${FILESDIR}/${PV}"/rpath.patch
+   "${FILESDIR}/${PV}"/rpath.patch \
+   "${FILESDIR}/${PV}"/pluginmanager.patch \
+   "${FILESDIR}/${PV}"/meshrender.patch \
+   "${FILESDIR}/${PV}"/rmmeshrender.patch \
+   "${FILESDIR}/${PV}"/rfx.patch
 }
 
 src_configure() {

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/, media-gfx/meshlab/files/2016.12/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/, media-gfx/meshlab/files/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/, media-gfx/meshlab/files/2016.12/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/files/2016.12/, media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/, media-gfx/meshlab/files/2016.12/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/, media-gfx/meshlab/files/2016.12/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/files/2016.12/, media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/, media-gfx/meshlab/files/2016.12/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/files/1.3.2/, media-gfx/meshlab/, ...

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/files/1.3.3/, media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/

[gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/, media-gfx/meshlab/files/1.3.3/

27 matches

Site Navigation

Mail list logo

Footer information