[eigen3] 02/06: Refresh patches, remove applied by upstream.

Fri Dec 18 21:13:22 UTC 2015

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository eigen3.

commit 4ec5edaade3b260bebe6e4616f82e2a17a7f476c
Author: Anton Gladky <gladk at debian.org>
Date:   Fri Dec 18 21:54:18 2015 +0100

    Refresh patches, remove applied by upstream.
---
 debian/patches/05_remove_html_timestamp.patch  |  8 +++----
 debian/patches/08_suitesparse-4.4.patch        | 20 -----------------
 debian/patches/09_fix_opencv_compilation.patch | 13 -----------
 debian/patches/10_fix_neon_vectorization.patch | 31 --------------------------
 debian/patches/series                          |  3 ---
 5 files changed, 4 insertions(+), 71 deletions(-)

diff --git a/debian/patches/05_remove_html_timestamp.patch b/debian/patches/05_remove_html_timestamp.patch
index 4aa9f04..37d8cc7 100644
--- a/debian/patches/05_remove_html_timestamp.patch
+++ b/debian/patches/05_remove_html_timestamp.patch
@@ -2,11 +2,11 @@ Description: Do not set HTML_TIMESTAMP in documentation
 Author: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-06-17
 
-Index: eigen3-3.2.5/doc/Doxyfile.in
+Index: eigen3/doc/Doxyfile.in
 ===================================================================
---- eigen3-3.2.5.orig/doc/Doxyfile.in
-+++ eigen3-3.2.5/doc/Doxyfile.in
-@@ -1005,7 +1005,7 @@ HTML_COLORSTYLE_GAMMA  = 80
+--- eigen3.orig/doc/Doxyfile.in
++++ eigen3/doc/Doxyfile.in
+@@ -1008,7 +1008,7 @@ HTML_COLORSTYLE_GAMMA  = 80
  # page will contain the date and time when the page was generated. Setting
  # this to NO can help when comparing the output of multiple runs.
  
diff --git a/debian/patches/08_suitesparse-4.4.patch b/debian/patches/08_suitesparse-4.4.patch
deleted file mode 100644
index 12c9e3e..0000000
--- a/debian/patches/08_suitesparse-4.4.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Compatibility fix with suitesparse >= 4.4
- The UF_long type has been replaced by SuiteSparse_long in recent versions of
- SuiteSparse.
-Author: Sébastien Villemot <sebastien at debian.org>
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=800101
-Forwarded: no
-Last-Update: 2015-09-30
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/Eigen/src/CholmodSupport/CholmodSupport.h
-+++ b/Eigen/src/CholmodSupport/CholmodSupport.h
-@@ -78,7 +78,7 @@ cholmod_sparse viewAsCholmod(SparseMatri
-   {
-     res.itype = CHOLMOD_INT;
-   }
--  else if (internal::is_same<_StorageIndex,UF_long>::value)
-+  else if (internal::is_same<_StorageIndex,SuiteSparse_long>::value)
-   {
-     res.itype = CHOLMOD_LONG;
-   }
diff --git a/debian/patches/09_fix_opencv_compilation.patch b/debian/patches/09_fix_opencv_compilation.patch
deleted file mode 100644
index 6813e6d..0000000
--- a/debian/patches/09_fix_opencv_compilation.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: eigen3/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h
-===================================================================
---- eigen3.orig/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h
-+++ eigen3/unsupported/Eigen/src/MatrixFunctions/MatrixExponential.h
-@@ -348,7 +348,7 @@ void matrix_exp_compute(const MatrixType
-   typedef typename NumTraits<Scalar>::Real RealScalar;
-   typedef typename std::complex<RealScalar> ComplexScalar;
-   if (sizeof(RealScalar) > 14) {
--    result = arg.matrixFunction(StdStemFunctions<ComplexScalar>::exp);
-+    result = arg.matrixFunction(internal::stem_function_exp<ComplexScalar>);
-     return;
-   }
- #endif
diff --git a/debian/patches/10_fix_neon_vectorization.patch b/debian/patches/10_fix_neon_vectorization.patch
deleted file mode 100644
index 7af0069..0000000
--- a/debian/patches/10_fix_neon_vectorization.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-# HG changeset patch
-# User Gael Guennebaud <g.gael at free.fr>
-# Date 1449759993 -3600
-# Node ID dfa123a3ca2f2478e66776731a8cd760a253b71b
-# Parent  b6e3e2a76f886841b3f2283e743e17897b163b38
-Bug 1103: fix neon vectorization of pmul(Packet1cd,Packet1cd)
-
-Index: eigen3/Eigen/src/Core/arch/NEON/Complex.h
-===================================================================
---- eigen3.orig/Eigen/src/Core/arch/NEON/Complex.h
-+++ eigen3/Eigen/src/Core/arch/NEON/Complex.h
-@@ -73,7 +73,7 @@ template<> EIGEN_STRONG_INLINE Packet2cf
- 
-   // Get the real values of a | a1_re | a1_re | a2_re | a2_re |
-   v1 = vcombine_f32(vdup_lane_f32(vget_low_f32(a.v), 0), vdup_lane_f32(vget_high_f32(a.v), 0));
--  // Get the real values of a | a1_im | a1_im | a2_im | a2_im |
-+  // Get the imag values of a | a1_im | a1_im | a2_im | a2_im |
-   v2 = vcombine_f32(vdup_lane_f32(vget_low_f32(a.v), 1), vdup_lane_f32(vget_high_f32(a.v), 1));
-   // Multiply the real a with b
-   v1 = vmulq_f32(v1, b.v);
-@@ -325,8 +325,8 @@ template<> EIGEN_STRONG_INLINE Packet1cd
- 
-   // Get the real values of a 
-   v1 = vdupq_lane_f64(vget_low_f64(a.v), 0);
--  // Get the real values of a 
--  v2 = vdupq_lane_f64(vget_high_f64(a.v), 1);
-+  // Get the imag values of a
-+  v2 = vdupq_lane_f64(vget_high_f64(a.v), 0);
-   // Multiply the real a with b
-   v1 = vmulq_f64(v1, b.v);
-   // Multiply the imag a with b
diff --git a/debian/patches/series b/debian/patches/series
index ad58d57..5ba1970 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,3 @@
 05_remove_html_timestamp.patch
 06_remove_doc_matrix.patch
 07_remove_compressed_doc.patch
-08_suitesparse-4.4.patch
-09_fix_opencv_compilation.patch
-10_fix_neon_vectorization.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/eigen3.git

