[repsnapper] Added lmfit patch
Miro Hrončok
churchyard at fedoraproject.org
Tue Aug 27 18:25:13 UTC 2013
commit 80a214bd6558d625409301cdd303746d71b2121f
Author: Miro Hrončok <miro at hroncok.cz>
Date: Tue Aug 27 20:24:48 2013 +0200
Added lmfit patch
repsnapper-lmfit50.patch | 19 +++++++++++++++++++
repsnapper.spec | 4 +++-
2 files changed, 22 insertions(+), 1 deletions(-)
---
diff --git a/repsnapper-lmfit50.patch b/repsnapper-lmfit50.patch
new file mode 100644
index 0000000..9521d07
--- /dev/null
+++ b/repsnapper-lmfit50.patch
@@ -0,0 +1,19 @@
+diff --git a/src/slicer/geometry.cpp b/src/slicer/geometry.cpp
+index 451aded..7b41bbf 100644
+--- a/src/slicer/geometry.cpp
++++ b/src/slicer/geometry.cpp
+@@ -89,13 +89,11 @@ bool fit_arc(const int m_dat, const arc_data_struct data,
+ {
+ lm_status_struct status;
+ lm_control_struct control = lm_control_double;
+- control.printflags = 0; // 3 = monitor status (+1) and parameters (+2)
+- control.maxcall = 200;
+ control.ftol = sq_error; // max square error sum
+
+ // printf( "Fitting:\n" );
+ lmmin( n_par, par, m_dat, (const void*) &data,
+- evaluate_arcfit, &control, &status, lm_printout_std );
++ evaluate_arcfit, &control, &status);
+
+ result_center.x() = par[0];
+ result_center.y() = par[1];
diff --git a/repsnapper.spec b/repsnapper.spec
index a8abbe5..78b704c 100644
--- a/repsnapper.spec
+++ b/repsnapper.spec
@@ -22,6 +22,7 @@ URL: https://github.com/timschmidt/%{name}
Source0: https://github.com/timschmidt/%{name}/archive/%{commit}/%{name}-%{version}-%{shortcommit}.tar.gz
Source1: %{name}-softsurfer-copyright-email.txt
Patch0: %{name}-use-system-libs.patch
+Patch1: %{name}-lmfit50.patch
BuildRequires: amftools-devel
BuildRequires: cairomm-devel
BuildRequires: desktop-file-utils
@@ -51,6 +52,7 @@ RepSnapper is a host software for controlling the RepRap 3D printer.
cp %SOURCE1 .
%patch0 -p1
+%patch1 -p1
rm -rf libraries/{clipper,vmmlib,amf,lmfit,poly2tri}
# Remove license information of bundled libs
@@ -97,7 +99,7 @@ fi
%changelog
* Tue Aug 27 2013 Miro Hrončok <mhroncok at redhat.com> - 2.2.0-0.6.b3
- New upstream betaversion
-- Rebuild for new lmfit
+- Rebuild for new lmfit, added patch to support it
* Wed Aug 21 2013 Remi Collet <rcollet at redhat.com> - 2.2.0-0.5.a4
- rebuild for new libzip
More information about the scm-commits
mailing list