From b154ab7ee5049c38c2bbce909ae07855c07ba3fa Mon Sep 17 00:00:00 2001
From: Miro Hrončok <miro@hroncok.cz>
Date: Mar 22 2018 11:03:51 +0000
Subject: Fix Screened Poisson Surface Reconstruction filter (RHBZ#1559137)


---

diff --git a/meshlab-2016.12-xml-filter.patch b/meshlab-2016.12-xml-filter.patch
new file mode 100644
index 0000000..00be44c
--- /dev/null
+++ b/meshlab-2016.12-xml-filter.patch
@@ -0,0 +1,37 @@
+diff --git meshlab-2016.12/src/meshlabplugins/filter_measure/filter_measure.pro meshlab-2016.12/src/meshlabplugins/filter_measure/filter_measure.pro
+index 3f78135..2f40dfa 100644
+--- meshlab-2016.12/src/meshlabplugins/filter_measure/filter_measure.pro
++++ meshlab-2016.12/src/meshlabplugins/filter_measure/filter_measure.pro
+@@ -6,4 +6,4 @@ TARGET         = filter_measure
+ #PRE_TARGETDEPS += filter_measure.xml
+ 
+ macx:QMAKE_POST_LINK = "cp "$$_PRO_FILE_PWD_/$$TARGET".xml ../../distrib/plugins/"$$TARGET".xml"
+-
++linux:QMAKE_POST_LINK = "cp "$$_PRO_FILE_PWD_/$$TARGET".xml ../../distrib/plugins/"$$TARGET".xml; cd ../../distrib/plugins/ ; ln -s "$$TARGET".xml lib"$$TARGET".xml"
+diff --git meshlab-2016.12/src/meshlabplugins/filter_mutualinfoxml/filter_mutualinfoxml.pro meshlab-2016.12/src/meshlabplugins/filter_mutualinfoxml/filter_mutualinfoxml.pro
+index f3eabaa..81516d1 100644
+--- meshlab-2016.12/src/meshlabplugins/filter_mutualinfoxml/filter_mutualinfoxml.pro
++++ meshlab-2016.12/src/meshlabplugins/filter_mutualinfoxml/filter_mutualinfoxml.pro
+@@ -21,3 +21,4 @@ SOURCES       += filter_mutualinfo.cpp \
+ TARGET        = filter_mutualinfo
+ 
+ macx:QMAKE_POST_LINK = "cp "$$_PRO_FILE_PWD_/$$TARGET".xml ../../distrib/plugins/"$$TARGET".xml"
++linux:QMAKE_POST_LINK = "cp "$$_PRO_FILE_PWD_/$$TARGET".xml ../../distrib/plugins/"$$TARGET".xml; cd ../../distrib/plugins/ ; ln -s "$$TARGET".xml lib"$$TARGET".xml"
+diff --git meshlab-2016.12/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.pro meshlab-2016.12/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.pro
+index 814bd31..a93f67a 100644
+--- meshlab-2016.12/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.pro
++++ meshlab-2016.12/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.pro
+@@ -2,6 +2,7 @@ include (../../shared.pri)
+ 
+ macx:QMAKE_CXX = clang++-mp-3.9
+ macx:QMAKE_LFLAGS += -L/opt/local/lib/libomp -lomp
++linux:QMAKE_LFLAGS += -lgomp
+ macx:QMAKE_CXXFLAGS_RELEASE+= -O3 -DRELEASE -funroll-loops -ffast-math  -Wno-sign-compare -Wno-unused-parameter
+ 
+ QMAKE_CXXFLAGS+=-fopenmp
+@@ -22,4 +23,4 @@ DEFINES += FOR_RELEASE
+ 
+ #PRE_TARGETDEPS += ./filter_screened_poisson.xml
+ macx:QMAKE_POST_LINK = "cp "$$_PRO_FILE_PWD_/$$TARGET".xml ../../distrib/plugins/"$$TARGET".xml"
+-
++linux:QMAKE_POST_LINK = "cp "$$_PRO_FILE_PWD_/$$TARGET".xml ../../distrib/plugins/"$$TARGET".xml; cd ../../distrib/plugins/ ; ln -s "$$TARGET".xml lib"$$TARGET".xml"
diff --git a/meshlab.spec b/meshlab.spec
index d2bf13b..ea4a0e5 100644
--- a/meshlab.spec
+++ b/meshlab.spec
@@ -3,7 +3,7 @@
 Summary:	A system for processing and editing unstructured 3D triangular meshes
 Name:		meshlab
 Version:	2016.12
-Release:	4%{?dist}
+Release:	5%{?dist}
 URL:		http://meshlab.sourceforge.net/
 License:	GPLv2+ and BSD and Public Domain
 Group:		Applications/Multimedia
@@ -55,6 +55,13 @@ Patch15:	meshlab-2016.12-fix-broken-pro-file.patch
 # Otherwise, stuff breaks on arm architectures.
 Patch16:	meshlab-2016.12-arm-signed-char-fix.patch
 
+# Fix Screened Poisson Surface Reconstruction filter by copying around XML files
+# https://github.com/cnr-isti-vclab/meshlab/issues/97
+# https://github.com/cnr-isti-vclab/meshlab/commit/19148325122ac70a2cc3f6e2feb4b786c2e073cf
+# https://github.com/cnr-isti-vclab/meshlab/commit/612388c42d00ab8eba1d9626a7da33a18c724d76
+# https://bugzilla.redhat.com/show_bug.cgi?id=1559137
+Patch17:	meshlab-2016.12-xml-filter.patch
+
 BuildRequires:	bzip2-devel
 BuildRequires:	glew-devel
 BuildRequires:	levmar-devel
@@ -91,6 +98,7 @@ these kinds of meshes.
 %patch14 -p0 -b .format-security
 %patch15 -p0 -b .fix-broken-pro-file
 %patch16 -p0 -b .armfix
+%patch17 -p0 -b .xml-filter
 
 # Turn of execute permissions on source files to avoid rpmlint
 # errors and warnings for the debuginfo package
@@ -227,6 +235,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/meshlab.desktop
 %{_datadir}/pixmaps/meshlab.png
 
 %changelog
+* Thu Mar 22 2018 Miro Hrončok <mhroncok@redhat.com> - 2016.12-5
+- Fix Screened Poisson Surface Reconstruction filter (RHBZ#1559137)
+
 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2016.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild