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

Package-Manager: portage-2.2.20.1

5 files changed, 63 insertions, 1 deletions

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 000000000000..382e21ca2f0d
--- /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.000000000 +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 000000000000..00f3ba8c1822
--- /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.000000000 +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 000000000000..9cac55959910
--- /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.000000000 +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 000000000000..59f3333a7311
--- /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.000000000 +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 10241aa0e5ba..e8d6cb2c9969 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() {