From 3c31c9cf0d1d8496d22b3e991b879bc70db38a3ca32ca5d0d1074a409b437c0f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 12 Jul 2016 21:50:12 +0000 Subject: [PATCH] Accepting request 406245 from devel:libraries:c_c++ 1 OBS-URL: https://build.opensuse.org/request/show/406245 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/eigen3?expand=0&rev=9 --- 01_install_FindEigen3.patch | 15 ++++++++++++ 3.2.7.tar.bz2 | 3 --- 3.2.8.tar.bz2 | 3 +++ eigen3.changes | 46 +++++++++++++++++++++++++++++++++++++ eigen3.spec | 20 ++++++++++------ eigen_pkgconfig.patch | 9 ++++++++ 6 files changed, 86 insertions(+), 10 deletions(-) create mode 100644 01_install_FindEigen3.patch delete mode 100644 3.2.7.tar.bz2 create mode 100644 3.2.8.tar.bz2 create mode 100644 eigen_pkgconfig.patch diff --git a/01_install_FindEigen3.patch b/01_install_FindEigen3.patch new file mode 100644 index 0000000..e6a66b3 --- /dev/null +++ b/01_install_FindEigen3.patch @@ -0,0 +1,15 @@ +diff -rupN eigen-eigen-07105f7124f9/CMakeLists.txt eigen-eigen-07105f7124f9-new/CMakeLists.txt +--- eigen-eigen-07105f7124f9/CMakeLists.txt 2016-02-16 14:26:15.000000000 +0100 ++++ eigen-eigen-07105f7124f9-new/CMakeLists.txt 2016-02-17 09:44:43.556543936 +0100 +@@ -324,6 +324,11 @@ install(FILES + DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel + ) + ++install(FILES ++ cmake/FindEigen3.cmake ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/cmake/Modules ++ ) ++ + if(EIGEN_BUILD_PKGCONFIG) + configure_file(eigen3.pc.in eigen3.pc @ONLY) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/eigen3.pc diff --git a/3.2.7.tar.bz2 b/3.2.7.tar.bz2 deleted file mode 100644 index ce7608a..0000000 --- a/3.2.7.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e58e1a11b23cf2754e32b3c5990f318a8461a3613c7acbf6035870daa45c2f3e -size 1155162 diff --git a/3.2.8.tar.bz2 b/3.2.8.tar.bz2 new file mode 100644 index 0000000..3eb7238 --- /dev/null +++ b/3.2.8.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:722a63d672b70f39c271c5e2a4a43ba14d12015674331790414fcb167c357e55 +size 1161201 diff --git a/eigen3.changes b/eigen3.changes index 63ed620..b534587 100644 --- a/eigen3.changes +++ b/eigen3.changes @@ -1,3 +1,49 @@ +------------------------------------------------------------------- +Thu Jun 30 20:46:12 UTC 2016 - asterios.dramis@gmail.com + +- Update to version 3.2.8: + Main fixes and improvements: + * Make FullPivLU::solve use rank() instead of nonzeroPivots(). + * Add EIGEN_MAPBASE_PLUGIN + * Bug 1166: fix issue in matrix-vector products when the + destination is not a vector at compile-time. + * Bug 1100: Improve cmake/pkg-config support. + * Bug 1113: fix name conflict with C99's "I". + * Add missing delete operator overloads in + EIGEN_MAKE_ALIGNED_OPERATOR_NEW + * Fix (A*B).maxCoeff(i) and similar. + * Workaround an ICE with VC2015 Update1 x64. + * Bug 1156: fix several function declarations whose arguments + were passed by value instead of being passed by reference + * Bug 1164: fix std::list and std::deque specializations such + that our aligned allocator is automatically activatived only + when the user did not specified an allocator (or specified the + default std::allocator). + Others: + * Fix BLAS backend (aka MKL) for empty matrix products. + * Bug 1134: fix JacobiSVD pre-allocation. + * Bug 1111: fix infinite recursion in + sparse-column-major.row(i).nonZeros() (it now produces a + compilation error) + * Bug 1106: workaround a compilation issue in Sparse module for + msvc-icc combo + * Bug 1153: remove the usage of __GXX_EXPERIMENTAL_CXX0X__ to + detect C++11 support + * Bug 1143: work-around gcc bug in COLAMD + * Improve support for matrix products with empty factors. + * Fix and clarify documentation of Transform wrt + operator*(MatrixBase) + * Add a matrix-free conjugate gradient example. + * Fix cost computation in CwiseUnaryView (internal) + * Remove custom unaligned loads for SSE. + * Some warning fixes. + * Several other documentation clarifications. +- Updated build requirement superlu to superlu-devel. +- Added a patch "eigen_pkgconfig.patch" to fix pkg-config file + includedir (taken from Fedora). +- Added a patch "01_install_FindEigen3.patch" to install + FindEigen3.cmake (taken from Fedora). + ------------------------------------------------------------------- Fri Nov 27 13:31:47 UTC 2015 - Rene.vanPaassen@gmail.com diff --git a/eigen3.spec b/eigen3.spec index 1e57f38..8ac746c 100644 --- a/eigen3.spec +++ b/eigen3.spec @@ -1,7 +1,7 @@ # # spec file for package eigen3 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: eigen3 -Version: 3.2.7 +Version: 3.2.8 Release: 0 Summary: C++ Template Library for Linear Algebra License: MPL-2.0 and LGPL-2.1+ and BSD-3-Clause @@ -26,6 +26,10 @@ Url: http://eigen.tuxfamily.org/ Source0: http://bitbucket.org/eigen/eigen/get/%{version}.tar.bz2 Patch0: 0001-Disable-Altivec-for-ppc64le.patch Patch1: 0001-Do-stack-allignment-on-ppc.patch +# PATCH-FIX-OPENSUSE eigen_pkgconfig.patch asterios.dramis@gmail.com -- Fix pkg-config file includedir +Patch2: eigen_pkgconfig.patch +# PATCH-FIX-OPENSUSE 01_install_FindEigen3.patch asterios.dramis@gmail.com -- Install FindEigen3.cmake +Patch3: 01_install_FindEigen3.patch BuildRequires: adolc-devel BuildRequires: cmake BuildRequires: doxygen @@ -45,7 +49,7 @@ BuildRequires: mpfr-devel BuildRequires: pkg-config BuildRequires: sparsehash-devel BuildRequires: suitesparse-devel -BuildRequires: superlu +BuildRequires: superlu-devel BuildRequires: texlive-amsfonts BuildRequires: texlive-latex BuildRequires: pkgconfig(gl) @@ -70,9 +74,11 @@ Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms. %prep -%setup -q -n eigen-eigen-b30b87236a1b +%setup -q -n eigen-eigen-07105f7124f9 %patch0 -p1 %patch1 -p1 +%patch2 -p1 +%patch3 -p1 # Fix rpmlint warning "wrong-file-end-of-line-encoding" sed -i 's/\r$//' COPYING.MINPACK @@ -82,9 +88,8 @@ echo "HTML_TIMESTAMP = NO" >> doc/Doxyfile.in %build %cmake \ - -DCMAKE_BUILD_TYPE=Release \ - -DEIGEN_INCLUDE_INSTALL_DIR=%{_includedir}/eigen3 - + -DCMAKE_BUILD_TYPE=Release \ + -DINCLUDE_INSTALL_DIR=%{_includedir}/eigen3 make %{?_smp_mflags} all doc %install @@ -96,5 +101,6 @@ make %{?_smp_mflags} all doc %doc build/doc/html/ COPYING.* %{_includedir}/eigen3/ %{_datadir}/pkgconfig/eigen3.pc +%{_datadir}/cmake/Modules/FindEigen3.cmake %changelog diff --git a/eigen_pkgconfig.patch b/eigen_pkgconfig.patch new file mode 100644 index 0000000..e9e8729 --- /dev/null +++ b/eigen_pkgconfig.patch @@ -0,0 +1,9 @@ +diff -rupN eigen-eigen-07105f7124f9/eigen3.pc.in eigen-eigen-07105f7124f9-new/eigen3.pc.in +--- eigen-eigen-07105f7124f9/eigen3.pc.in 2016-02-16 14:26:15.000000000 +0100 ++++ eigen-eigen-07105f7124f9-new/eigen3.pc.in 2016-02-20 19:13:19.816842461 +0100 +@@ -6,4 +6,4 @@ Description: A C++ template library for + Requires: + Version: @EIGEN_VERSION_NUMBER@ + Libs: +-Cflags: -I${prefix}/@INCLUDE_INSTALL_DIR@ ++Cflags: -I@INCLUDE_INSTALL_DIR@