1 |
commit: ff0d1adb28af2bd042e1374ba7c16aa87662cb85 |
2 |
Author: Amy Liffey <amynka <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 3 16:49:10 2019 +0000 |
4 |
Commit: Amy Liffey <amynka <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jan 3 16:49:10 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff0d1adb |
7 |
|
8 |
media-gfx/meshlab: Add fedora patches |
9 |
|
10 |
Closes: https://bugs.gentoo.org/660542 |
11 |
Submitted-by: <myoung008 <AT> yahoo.com> |
12 |
Signed-off-by: Amy Liffey <amynka <AT> gentoo.org> |
13 |
Package-Manager: Portage-2.3.49, Repoman-2.3.11 |
14 |
|
15 |
.../files/2016.12/meshlab-2016.12-qprintable.patch | 20 ++++ |
16 |
.../2016.12/meshlab-2016.12-qt-includes.patch | 22 ++++ |
17 |
media-gfx/meshlab/meshlab-2016.12-r4.ebuild | 111 +++++++++++++++++++++ |
18 |
3 files changed, 153 insertions(+) |
19 |
|
20 |
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 |
21 |
new file mode 100644 |
22 |
index 00000000000..61965baa9a9 |
23 |
--- /dev/null |
24 |
+++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qprintable.patch |
25 |
@@ -0,0 +1,20 @@ |
26 |
+--- a/meshlabserver/mainserver.cpp |
27 |
++++ b/meshlabserver/mainserver.cpp |
28 |
+@@ -897,7 +897,7 @@ |
29 |
+ } |
30 |
+ |
31 |
+ if (meshDocument.size() < outmeshlist.size()) |
32 |
+- fprintf(logfp, "Error: trying to save %i meshes, but only %i available in the project\n", qPrintable(outmeshlist.size()), qPrintable(meshDocument.size())); |
33 |
++ fprintf(logfp, "Error: trying to save %i meshes, but only %i available in the project\n", outmeshlist.size(), meshDocument.size()); |
34 |
+ else |
35 |
+ { |
36 |
+ for (int ii = 0; ii < outmeshlist.size(); ++ii) |
37 |
+@@ -911,7 +911,7 @@ |
38 |
+ fprintf(logfp, "Output mesh %s has NOT been saved\n", qPrintable(outmeshlist[ii].filename)); |
39 |
+ } |
40 |
+ else |
41 |
+- fprintf(logfp, "Invalid layer %i. Output mesh %s will not be saved\n", qPrintable(ii), qPrintable(outmeshlist[ii].filename)); |
42 |
++ fprintf(logfp, "Invalid layer %i. Output mesh %s will not be saved\n", ii, qPrintable(outmeshlist[ii].filename)); |
43 |
+ } |
44 |
+ |
45 |
+ } |
46 |
|
47 |
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 |
48 |
new file mode 100644 |
49 |
index 00000000000..0991bfc71e1 |
50 |
--- /dev/null |
51 |
+++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-qt-includes.patch |
52 |
@@ -0,0 +1,22 @@ |
53 |
+--- a/meshlabplugins/render_gdp/shaderDialog.h |
54 |
++++ b/meshlabplugins/render_gdp/shaderDialog.h |
55 |
+@@ -32,6 +32,8 @@ |
56 |
+ #include "shaderStructs.h" |
57 |
+ #include "ui_shaderDialog.h" |
58 |
+ #include <QMap> |
59 |
++#include <QLineEdit> |
60 |
++#include <QSlider> |
61 |
+ |
62 |
+ class QGLWidget; |
63 |
+ |
64 |
+--- a/meshlabplugins/edit_paint/paintbox.cpp |
65 |
++++ b/meshlabplugins/edit_paint/paintbox.cpp |
66 |
+@@ -23,6 +23,7 @@ |
67 |
+ |
68 |
+ #include "paintbox.h" |
69 |
+ #include <QFileDialog> |
70 |
++#include <QAction> |
71 |
+ |
72 |
+ Paintbox::Paintbox(QWidget * parent, Qt::WindowFlags flags) : QWidget(parent, flags) |
73 |
+ { |
74 |
+ |
75 |
|
76 |
diff --git a/media-gfx/meshlab/meshlab-2016.12-r4.ebuild b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild |
77 |
new file mode 100644 |
78 |
index 00000000000..b9df6e46bbc |
79 |
--- /dev/null |
80 |
+++ b/media-gfx/meshlab/meshlab-2016.12-r4.ebuild |
81 |
@@ -0,0 +1,111 @@ |
82 |
+# Copyright 1999-2019 Gentoo Authors |
83 |
+# Distributed under the terms of the GNU General Public License v2 |
84 |
+ |
85 |
+EAPI=6 |
86 |
+ |
87 |
+inherit qmake-utils |
88 |
+ |
89 |
+DESCRIPTION="the open source system for processing and editing 3D triangular meshes" |
90 |
+HOMEPAGE="http://www.meshlab.net" |
91 |
+VCG_VERSION="1.0.1" |
92 |
+SRC_URI="https://github.com/cnr-isti-vclab/meshlab/archive/v${PV}.tar.gz -> ${P}.tar.gz |
93 |
+ https://github.com/cnr-isti-vclab/vcglib/archive/v${VCG_VERSION}.tar.gz -> vcglib-${VCG_VERSION}.tar.gz |
94 |
+" |
95 |
+ |
96 |
+LICENSE="GPL-2" |
97 |
+SLOT="0" |
98 |
+KEYWORDS="~amd64 ~x86" |
99 |
+IUSE="-minimal" |
100 |
+DEPEND="dev-cpp/eigen:3 |
101 |
+ dev-cpp/muParser |
102 |
+ dev-qt/qtcore:5 |
103 |
+ dev-qt/qtopengl:5 |
104 |
+ dev-qt/qtscript:5 |
105 |
+ dev-qt/qtxmlpatterns:5 |
106 |
+ >=media-gfx/jhead-3.00-r2 |
107 |
+ media-libs/glew:0 |
108 |
+ media-libs/qhull |
109 |
+ =media-libs/lib3ds-1* |
110 |
+ media-libs/openctm |
111 |
+ sci-libs/levmar |
112 |
+ sci-libs/mpir" |
113 |
+ |
114 |
+RDEPEND="${DEPEND}" |
115 |
+ |
116 |
+S="${WORKDIR}/meshlab-${PV}/src" |
117 |
+ |
118 |
+PATCHES=( |
119 |
+ "${FILESDIR}/${PV}/0001-set-shader-and-texture-paths.patch" |
120 |
+ #remove ot working plugins |
121 |
+ "${FILESDIR}/${PV}/remove-edit_mutualcorrs.patch" |
122 |
+ "${FILESDIR}/${PV}/remove-io_TXT.patch" |
123 |
+ #since structure synth doesn't seem to be compiling |
124 |
+ "${FILESDIR}/${PV}/0001-disable-filter-ssynth.patch" |
125 |
+ #this has been fixed in the tree |
126 |
+ "${FILESDIR}/${PV}/0001-disable-edit-quality.patch" |
127 |
+ #this causes segfaults |
128 |
+ "${FILESDIR}/${PV}/0001-disable-filter-layer.patch" |
129 |
+ #for when we use minimal |
130 |
+ "${FILESDIR}/${PV}/0001-compile-server.patch" |
131 |
+ "${FILESDIR}/${PV}/0001-use-external-lib3ds.patch" |
132 |
+ "${FILESDIR}/${PV}/0001-use-external-openctm.patch" |
133 |
+ "${FILESDIR}/${PV}/0001-use-external-muParser.patch" |
134 |
+ "${FILESDIR}/${PV}/0001-use-external-bzip.patch" |
135 |
+ "${FILESDIR}/${PV}/0001-use-external-jhead.patch" |
136 |
+ "${FILESDIR}/${PV}/0001-use-external-glew.patch" |
137 |
+ #cause gnu stack quickstart related qa |
138 |
+ "${FILESDIR}/${PV}/0001-remove-not-sane-plugins.patch" |
139 |
+ "${FILESDIR}/${PV}/${P}-fix-plugins-path.patch" |
140 |
+ "${FILESDIR}/${PV}/${P}-align1.patch" |
141 |
+ "${FILESDIR}/${PV}/${P}-align2.patch" |
142 |
+ "${FILESDIR}/${PV}/${P}-asString.patch" |
143 |
+ "${FILESDIR}/${PV}/${P}-qprintable.patch" |
144 |
+ "${FILESDIR}/${PV}/${P}-qt-includes.patch" |
145 |
+ ) |
146 |
+ |
147 |
+src_prepare(){ |
148 |
+ mv "${WORKDIR}/vcglib-${VCG_VERSION}" "${WORKDIR}/vcglib" || die "vcglib mv failed" |
149 |
+ default |
150 |
+ #proof of patchset |
151 |
+ #remove libs that are being used from the system |
152 |
+ rm -r "external/lib3ds-1.3.0" || die "rm failed" |
153 |
+ rm -r "external/OpenCTM-1.0.3" || die "rm failed" |
154 |
+ rm -r "external/muparser_v132" || die "rm failed" |
155 |
+ rm -r "external/muparser_v225" || die "rm failed" |
156 |
+ rm -r "external/bzip2-1.0.5" || die "rm failed" |
157 |
+ rm -r "external/jhead-2.95" || die "rm failed" |
158 |
+ rm -r "external/glew-1.5.1" || die "rm failed" |
159 |
+ rm -r "external/glew-1.7.0" || die "rm failed" |
160 |
+ #we still depend on lm.h |
161 |
+ #rm -r "external" |
162 |
+ rm -r "distrib/plugins/U3D_W32" || die |
163 |
+ rm -r "distrib/plugins/U3D_OSX" || die |
164 |
+ |
165 |
+ # Fix bug 638796 |
166 |
+ cd "${WORKDIR}" || die |
167 |
+ eapply "${FILESDIR}/${PV}/${P}-remove-header.patch" |
168 |
+} |
169 |
+ |
170 |
+src_configure() { |
171 |
+ use minimal || eqmake5 -r meshlab_full.pro |
172 |
+ use minimal && eqmake5 -r meshlab_mini.pro |
173 |
+} |
174 |
+ |
175 |
+src_install() { |
176 |
+ dobin distrib/{meshlab,meshlabserver} |
177 |
+ dolib distrib/libcommon.so.1.0.0 |
178 |
+ dosym libcommon.so.1.0.0 /usr/$(get_libdir)/libcommon.so.1 |
179 |
+ dosym libcommon.so.1 /usr/$(get_libdir)/libcommon.so |
180 |
+ exeinto /usr/$(get_libdir)/meshlab/plugins |
181 |
+ doexe distrib/plugins/*.so |
182 |
+ insinto /usr/share/meshlab/shaders |
183 |
+ doins -r distrib/shaders/* |
184 |
+ insinto /usr/share/meshlab/plugins |
185 |
+ doins -r distrib/plugins/* |
186 |
+ insinto /usr/share/meshlab/textures |
187 |
+ doins -r distrib/textures/* |
188 |
+ insinto /usr/share/meshlab/sample |
189 |
+ doins -r distrib/sample/* |
190 |
+ newicon "${S}"/meshlab/images/eye512.png "${PN}".png |
191 |
+ make_desktop_entry meshlab "Meshlab" "${PN}" Graphics |
192 |
+} |