public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/
@ 2016-05-14 14:32 Amy Winston
  0 siblings, 0 replies; 16+ messages in thread
From: Amy Winston @ 2016-05-14 14:32 UTC (permalink / raw
  To: gentoo-commits

commit:     db696dacc9188d710d8ad1484d0e1a0e8a91216f
Author:     Amy Winston <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat May 14 14:32:02 2016 +0000
Commit:     Amy Winston <amynka <AT> gentoo <DOT> org>
CommitDate: Sat May 14 14:32:02 2016 +0000
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*


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/
@ 2017-08-11 19:57 Amy Liffey
  0 siblings, 0 replies; 16+ messages in thread
From: Amy Liffey @ 2017-08-11 19:57 UTC (permalink / raw
  To: gentoo-commits

commit:     f27e3bf00ccc94fcd7e5b3a0e10d3888ebe87e3e
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 11 19:52:36 2017 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Fri Aug 11 19:56:54 2017 +0000
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"
 


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/
@ 2017-11-25 10:26 Amy Liffey
  0 siblings, 0 replies; 16+ messages in thread
From: Amy Liffey @ 2017-11-25 10:26 UTC (permalink / raw
  To: gentoo-commits

commit:     67a7c1a6fb85aebcf5c14586d1aea85a41d2b999
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 25 10:22:58 2017 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sat Nov 25 10:25:55 2017 +0000
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 @@
 		<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.
-</longdescription>
+	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.
+	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">meshlab</remote-id>
 	</upstream>


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/
@ 2017-12-08 15:17 Amy Liffey
  0 siblings, 0 replies; 16+ messages in thread
From: Amy Liffey @ 2017-12-08 15:17 UTC (permalink / raw
  To: gentoo-commits

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

media-gfx/meshlab: add missing dep qtscript

Reported-by:François Delègue <ecrire <AT> 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


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/
@ 2018-04-13 23:22 Aaron Bauman
  0 siblings, 0 replies; 16+ messages in thread
From: Aaron Bauman @ 2018-04-13 23:22 UTC (permalink / raw
  To: gentoo-commits

commit:     07f032236d99ed09feacea2fd711bad8cc25f34e
Author:     Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Wed Apr 11 00:02:52 2018 +0000
Commit:     Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Fri Apr 13 23:21:33 2018 +0000
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"


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/
@ 2018-09-05  5:56 Amy Liffey
  0 siblings, 0 replies; 16+ messages in thread
From: Amy Liffey @ 2018-09-05  5:56 UTC (permalink / raw
  To: gentoo-commits

commit:     07414a023a7680ee5a877d5d8745eec65758bc43
Author:     Amy Liffey <amynka <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  5 05:46:53 2018 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Wed Sep  5 05:46:53 2018 +0000
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..00000000000
--- 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-2016.12.ebuild
deleted file mode 100644
index 6d45ceecb02..00000000000
--- a/media-gfx/meshlab/meshlab-2016.12.ebuild
+++ /dev/null
@@ -1,102 +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"
-		"${FILESDIR}/${PV}/0001-update-1.3.3-pluginmanager.patch.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"
-	)
-
-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
-}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/
@ 2020-06-22 18:32 Andreas Sturmlechner
  0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2020-06-22 18:32 UTC (permalink / raw
  To: gentoo-commits

commit:     dd17ac1e1c3f2767544d347fdca60692128b0708
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 11:54:47 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 18:31:26 2020 +0000
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 <asturm <AT> 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}
-	dolib distrib/libcommon.so.1.0.0
+	dolib.so 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


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/
@ 2020-07-02  9:29 Andreas Sturmlechner
  0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2020-07-02  9:29 UTC (permalink / raw
  To: gentoo-commits

commit:     3eaad036268693f4e4d28e2a72ef91074c136536
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 22 22:43:11 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Jul  2 09:29:20 2020 +0000
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 <asturm <AT> 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..00000000000
--- 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 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-r3.ebuild b/media-gfx/meshlab/meshlab-2016.12-r3.ebuild
deleted file mode 100644
index 9cd64b0952c..00000000000
--- a/media-gfx/meshlab/meshlab-2016.12-r3.ebuild
+++ /dev/null
@@ -1,109 +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"
-		"${FILESDIR}/${PV}/${P}-asString.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 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
-}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/
@ 2021-01-05 11:38 Dennis Lamm
  0 siblings, 0 replies; 16+ messages in thread
From: Dennis Lamm @ 2021-01-05 11:38 UTC (permalink / raw
  To: gentoo-commits

commit:     5ea0b4089a4575d1662a01da65de3421df3375be
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 11:16:03 2021 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 11:38:46 2021 +0000
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 <expeditioneer <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/18950
Signed-off-by: Dennis Lamm <expeditioneer <AT> 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*


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/
@ 2021-01-05 23:44 Sam James
  0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2021-01-05 23:44 UTC (permalink / raw
  To: gentoo-commits

commit:     1cd7f8ce8195d34e8bebce9ca2c8d963df1dd8e9
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  5 23:41:39 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan  5 23:44:23 2021 +0000
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 <sam <AT> 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}"
 


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/
@ 2021-03-06  6:01 Dennis Lamm
  0 siblings, 0 replies; 16+ messages in thread
From: Dennis Lamm @ 2021-03-06  6:01 UTC (permalink / raw
  To: gentoo-commits

commit:     126ebdd99471f430d7b1b7d8d973e3e2cc9a3d55
Author:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
AuthorDate: Sat Mar  6 05:41:59 2021 +0000
Commit:     Dennis Lamm <expeditioneer <AT> gentoo <DOT> org>
CommitDate: Sat Mar  6 06:01:14 2021 +0000
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 <expeditioneer <AT> 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 <expeditioneer <AT> 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 00000000000..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
+}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/
@ 2021-03-12  4:19 Dennis Lamm
  0 siblings, 0 replies; 16+ messages in thread
From: Dennis Lamm @ 2021-03-12  4:19 UTC (permalink / raw
  To: gentoo-commits

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

media-gfx/meshlab: drop old

Signed-off-by: Dennis Lamm <expeditioneer <AT> 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 <expeditioneer <AT> 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..00000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/
@ 2021-06-03 19:15 Sam James
  0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2021-06-03 19:15 UTC (permalink / raw
  To: gentoo-commits

commit:     893f5db5a4d99ad19534661341e49d545d4510fa
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun  2 23:55:23 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun  3 19:14:53 2021 +0000
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 <sam <AT> 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


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/
@ 2023-10-21 21:04 Andreas Sturmlechner
  0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2023-10-21 21:04 UTC (permalink / raw
  To: gentoo-commits

commit:     b1cf46a5ff4855e442290baa65854eb73e3c0a60
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 19:40:25 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 21 21:04:19 2023 +0000
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 <asturm <AT> 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..000000000000
--- 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
-}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/
@ 2023-10-21 21:04 Andreas Sturmlechner
  0 siblings, 0 replies; 16+ messages in thread
From: Andreas Sturmlechner @ 2023-10-21 21:04 UTC (permalink / raw
  To: gentoo-commits

commit:     d95a2615e43c05a00b94048221e9ab5a30f45e37
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 21 19:29:53 2023 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Oct 21 21:04:19 2023 +0000
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 <asturm <AT> 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 000000000000..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
+}


^ permalink raw reply related	[flat|nested] 16+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/
@ 2024-03-01  0:32 Sam James
  0 siblings, 0 replies; 16+ messages in thread
From: Sam James @ 2024-03-01  0:32 UTC (permalink / raw
  To: gentoo-commits

commit:     c9a290239287bf9a67b1e6ef31d50d8d95954fca
Author:     Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Fri Mar  1 00:11:18 2024 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Mar  1 00:32:31 2024 +0000
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 <eschwartz93 <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> 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}"
 


^ permalink raw reply related	[flat|nested] 16+ messages in thread

end of thread, other threads:[~2024-03-01  0:32 UTC | newest]

Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-05 11:38 [gentoo-commits] repo/gentoo:master commit in: media-gfx/meshlab/ Dennis Lamm
  -- strict thread matches above, loose matches on Subject: below --
2024-03-01  0:32 Sam James
2023-10-21 21:04 Andreas Sturmlechner
2023-10-21 21:04 Andreas Sturmlechner
2021-06-03 19:15 Sam James
2021-03-12  4:19 Dennis Lamm
2021-03-06  6:01 Dennis Lamm
2021-01-05 23:44 Sam James
2020-07-02  9:29 Andreas Sturmlechner
2020-06-22 18:32 Andreas Sturmlechner
2018-09-05  5:56 Amy Liffey
2018-04-13 23:22 Aaron Bauman
2017-12-08 15:17 Amy Liffey
2017-11-25 10:26 Amy Liffey
2017-08-11 19:57 Amy Liffey
2016-05-14 14:32 Amy Winston

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox