[mingw-eigen3] Update to 3.2.3
Sandro Mani
smani at fedoraproject.org
Wed Dec 17 23:50:23 UTC 2014
commit 5ef81d3b57205b7b18dd4a093756d210d47a3cea
Author: Sandro Mani <manisandro at gmail.com>
Date: Thu Dec 18 00:49:53 2014 +0100
Update to 3.2.3
.gitignore | 1 +
eigen-3.2.3_suitesparse.patch | 33 +++++++++++++++++++++++++++++++++
mingw-eigen3.spec | 10 ++++++++--
sources | 2 +-
4 files changed, 43 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4de034b..f0da365 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
/eigen-3.2.tar.bz2
/eigen-3.2.1.tar.bz2
/eigen-3.2.2.tar.bz2
+/eigen-3.2.3.tar.bz2
diff --git a/eigen-3.2.3_suitesparse.patch b/eigen-3.2.3_suitesparse.patch
new file mode 100644
index 0000000..d36c854
--- /dev/null
+++ b/eigen-3.2.3_suitesparse.patch
@@ -0,0 +1,33 @@
+diff -rupN eigen-eigen-36fd1ba04c12/Eigen/src/CholmodSupport/CholmodSupport.h eigen-eigen-36fd1ba04c12-new/Eigen/src/CholmodSupport/CholmodSupport.h
+--- eigen-eigen-36fd1ba04c12/Eigen/src/CholmodSupport/CholmodSupport.h 2014-12-16 18:30:52.000000000 +0100
++++ eigen-eigen-36fd1ba04c12-new/Eigen/src/CholmodSupport/CholmodSupport.h 2014-12-17 23:35:28.080925651 +0100
+@@ -78,7 +78,7 @@ cholmod_sparse viewAsCholmod(SparseMatri
+ {
+ res.itype = CHOLMOD_INT;
+ }
+- else if (internal::is_same<_Index,UF_long>::value)
++ else if (internal::is_same<_Index,SuiteSparse_long>::value)
+ {
+ res.itype = CHOLMOD_LONG;
+ }
+diff -rupN eigen-eigen-36fd1ba04c12/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h eigen-eigen-36fd1ba04c12-new/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h
+--- eigen-eigen-36fd1ba04c12/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h 2014-12-16 18:30:52.000000000 +0100
++++ eigen-eigen-36fd1ba04c12-new/Eigen/src/SPQRSupport/SuiteSparseQRSupport.h 2014-12-17 23:35:28.063925342 +0100
+@@ -47,7 +47,7 @@ namespace Eigen {
+ * You can then apply it to a vector.
+ *
+ * R is the sparse triangular factor. Use matrixQR() to get it as SparseMatrix.
+- * NOTE : The Index type of R is always UF_long. You can get it with SPQR::Index
++ * NOTE : The Index type of R is always SuiteSparse_long. You can get it with SPQR::Index
+ *
+ * \tparam _MatrixType The type of the sparse matrix A, must be a column-major SparseMatrix<>
+ * NOTE
+@@ -59,7 +59,7 @@ class SPQR
+ public:
+ typedef typename _MatrixType::Scalar Scalar;
+ typedef typename _MatrixType::RealScalar RealScalar;
+- typedef UF_long Index ;
++ typedef SuiteSparse_long Index ;
+ typedef SparseMatrix<Scalar, ColMajor, Index> MatrixType;
+ typedef PermutationMatrix<Dynamic, Dynamic> PermutationType;
+ public:
diff --git a/mingw-eigen3.spec b/mingw-eigen3.spec
index 1408401..8825612 100644
--- a/mingw-eigen3.spec
+++ b/mingw-eigen3.spec
@@ -1,10 +1,10 @@
%{?mingw_package_header}
%global mingw_pkg_name eigen3
-%global commit 1306d75b4a21
+%global commit 36fd1ba04c12
Name: mingw-%{mingw_pkg_name}
-Version: 3.2.2
+Version: 3.2.3
Release: 1%{?dist}
Summary: MinGW lightweight C++ template library for vector and matrix math
BuildArch: noarch
@@ -22,6 +22,8 @@ Source1: TryRunResults.cmake
Patch0: eigen-3.1.2_osversion.patch
# Workaround for gcc bug 58087
Patch1: eigen-3.2_gcc58087.patch
+# Don't use deprecated UF_long
+Patch2: eigen-3.2.3_suitesparse.patch
BuildRequires: mingw32-filesystem
BuildRequires: mingw64-filesystem
@@ -52,6 +54,7 @@ Summary: %{summary}
%setup -q -n eigen-eigen-%{commit}
%patch0 -p2
%patch1 -p1
+%patch2 -p1
%build
%mingw_cmake -C %{SOURCE1} -DEIGEN_BUILD_PKGCONFIG:BOOL=ON
@@ -71,6 +74,9 @@ rm -rf %{buildroot}
%{mingw64_datadir}/pkgconfig/*
%changelog
+* Thu Dec 18 2014 Sandro Mani <manisandro at gmail.com> - 3.2.3-1
+- Update to release 3.2.3
+
* Mon Aug 04 2014 Sandro Mani <manisandro at gmail.com> - 3.2.2-1
- Update to release 3.2.2
diff --git a/sources b/sources
index e190bf9..488e82e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fc2e814ae449d16b331f7e1f4e272bd3 eigen-3.2.2.tar.bz2
+a88bf9a8e674762619429e80f46005bf eigen-3.2.3.tar.bz2
More information about the scm-commits
mailing list