[eigen3] 02/03: Refresh patches.
Anton Gladky
gladk at moszumanska.debian.org
Fri Jan 20 19:53:06 UTC 2017
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository eigen3.
commit 875e8b7f1d6aa0b73209f953b614070ea273973a
Author: Anton Gladky <gladk at debian.org>
Date: Fri Jan 20 20:50:31 2017 +0100
Refresh patches.
---
debian/patches/02_remove_buildtype_check.patch | 6 +--
debian/patches/04_remove_piwik.patch | 6 +--
debian/patches/05_remove_html_timestamp.patch | 8 +--
debian/patches/06_remove_doc_matrix.patch | 6 +--
debian/patches/07_remove_compressed_doc.patch | 6 +--
debian/patches/08_fix_path_FindEigen3.patch | 6 +--
debian/patches/12_grammer_tweak.patch | 12 ++---
debian/patches/14_fix_altivec_sign_issue.patch | 75 --------------------------
debian/patches/series | 1 -
9 files changed, 25 insertions(+), 101 deletions(-)
diff --git a/debian/patches/02_remove_buildtype_check.patch b/debian/patches/02_remove_buildtype_check.patch
index 14d459a..3d1aa96 100644
--- a/debian/patches/02_remove_buildtype_check.patch
+++ b/debian/patches/02_remove_buildtype_check.patch
@@ -1,10 +1,10 @@
Description: Remove build type check in cmake
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-16
-Index: eigen-eigen-f562a193118d/CMakeLists.txt
+Index: eigen-eigen-da9b4e14c255/CMakeLists.txt
===================================================================
---- eigen-eigen-f562a193118d.orig/CMakeLists.txt
-+++ eigen-eigen-f562a193118d/CMakeLists.txt
+--- eigen-eigen-da9b4e14c255.orig/CMakeLists.txt
++++ eigen-eigen-da9b4e14c255/CMakeLists.txt
@@ -20,12 +20,6 @@ if (NOT CMAKE_BUILD_TYPE)
endif()
diff --git a/debian/patches/04_remove_piwik.patch b/debian/patches/04_remove_piwik.patch
index e3a7c4e..cc56b2e 100644
--- a/debian/patches/04_remove_piwik.patch
+++ b/debian/patches/04_remove_piwik.patch
@@ -1,10 +1,10 @@
Description: remove piwik scripts.
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-16
-Index: eigen-eigen-f562a193118d/doc/eigendoxy_footer.html.in
+Index: eigen-eigen-da9b4e14c255/doc/eigendoxy_footer.html.in
===================================================================
---- eigen-eigen-f562a193118d.orig/doc/eigendoxy_footer.html.in
-+++ eigen-eigen-f562a193118d/doc/eigendoxy_footer.html.in
+--- eigen-eigen-da9b4e14c255.orig/doc/eigendoxy_footer.html.in
++++ eigen-eigen-da9b4e14c255/doc/eigendoxy_footer.html.in
@@ -17,19 +17,6 @@ $generatedby <a href="http://www.d
</small></address>
<!--END !GENERATE_TREEVIEW-->
diff --git a/debian/patches/05_remove_html_timestamp.patch b/debian/patches/05_remove_html_timestamp.patch
index 4ede2cb..f461d59 100644
--- a/debian/patches/05_remove_html_timestamp.patch
+++ b/debian/patches/05_remove_html_timestamp.patch
@@ -1,11 +1,11 @@
Description: Do not set HTML_TIMESTAMP in documentation
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-17
-Index: eigen-eigen-f562a193118d/doc/Doxyfile.in
+Index: eigen-eigen-da9b4e14c255/doc/Doxyfile.in
===================================================================
---- eigen-eigen-f562a193118d.orig/doc/Doxyfile.in
-+++ eigen-eigen-f562a193118d/doc/Doxyfile.in
-@@ -1013,7 +1013,7 @@ HTML_COLORSTYLE_GAMMA = 80
+--- eigen-eigen-da9b4e14c255.orig/doc/Doxyfile.in
++++ eigen-eigen-da9b4e14c255/doc/Doxyfile.in
+@@ -1014,7 +1014,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/06_remove_doc_matrix.patch b/debian/patches/06_remove_doc_matrix.patch
index e4e005f..c4a5c3c 100644
--- a/debian/patches/06_remove_doc_matrix.patch
+++ b/debian/patches/06_remove_doc_matrix.patch
@@ -1,10 +1,10 @@
Description: Remove the line, which causes unreproducible builds
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-18
-Index: eigen-eigen-f562a193118d/doc/snippets/Matrix_resize_int_int.cpp
+Index: eigen-eigen-da9b4e14c255/doc/snippets/Matrix_resize_int_int.cpp
===================================================================
---- eigen-eigen-f562a193118d.orig/doc/snippets/Matrix_resize_int_int.cpp
-+++ eigen-eigen-f562a193118d/doc/snippets/Matrix_resize_int_int.cpp
+--- eigen-eigen-da9b4e14c255.orig/doc/snippets/Matrix_resize_int_int.cpp
++++ eigen-eigen-da9b4e14c255/doc/snippets/Matrix_resize_int_int.cpp
@@ -6,4 +6,4 @@ m.resize(3,2);
cout << "here's the 3x2 matrix m:" << endl << m << endl;
cout << "now let's resize m to size 2x2. This is NOT a conservative resizing, so it becomes uninitialized:" << endl;
diff --git a/debian/patches/07_remove_compressed_doc.patch b/debian/patches/07_remove_compressed_doc.patch
index 89d07d9..efcd146 100644
--- a/debian/patches/07_remove_compressed_doc.patch
+++ b/debian/patches/07_remove_compressed_doc.patch
@@ -1,10 +1,10 @@
Description: Remove compressed doc
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-19
-Index: eigen-eigen-f562a193118d/doc/CMakeLists.txt
+Index: eigen-eigen-da9b4e14c255/doc/CMakeLists.txt
===================================================================
---- eigen-eigen-f562a193118d.orig/doc/CMakeLists.txt
-+++ eigen-eigen-f562a193118d/doc/CMakeLists.txt
+--- eigen-eigen-da9b4e14c255.orig/doc/CMakeLists.txt
++++ eigen-eigen-da9b4e14c255/doc/CMakeLists.txt
@@ -104,8 +104,6 @@ add_custom_target(doc ALL
COMMAND ${CMAKE_COMMAND} -E copy ${Eigen_BINARY_DIR}/doc/html/group__TopicUnalignedArrayAssert.html ${Eigen_BINARY_DIR}/doc/html/TopicUnalignedArrayAssert.html
COMMAND ${CMAKE_COMMAND} -E rename html eigen-doc
diff --git a/debian/patches/08_fix_path_FindEigen3.patch b/debian/patches/08_fix_path_FindEigen3.patch
index c8a58f6..dad7765 100644
--- a/debian/patches/08_fix_path_FindEigen3.patch
+++ b/debian/patches/08_fix_path_FindEigen3.patch
@@ -1,10 +1,10 @@
Description: fix installation path for cmake-files
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-12-18
-Index: eigen-eigen-f562a193118d/CMakeLists.txt
+Index: eigen-eigen-da9b4e14c255/CMakeLists.txt
===================================================================
---- eigen-eigen-f562a193118d.orig/CMakeLists.txt
-+++ eigen-eigen-f562a193118d/CMakeLists.txt
+--- eigen-eigen-da9b4e14c255.orig/CMakeLists.txt
++++ eigen-eigen-da9b4e14c255/CMakeLists.txt
@@ -374,7 +374,7 @@ else()
)
endif()
diff --git a/debian/patches/12_grammer_tweak.patch b/debian/patches/12_grammer_tweak.patch
index cd3fbd1..677f401 100644
--- a/debian/patches/12_grammer_tweak.patch
+++ b/debian/patches/12_grammer_tweak.patch
@@ -2,10 +2,10 @@ Description: Correct grammer error found by lintian which can leak into other
.
projects.
Author: Michael R. Crusoe <crusoe at ucdavis.edu>
-Index: eigen-eigen-f562a193118d/Eigen/src/Core/DenseBase.h
+Index: eigen-eigen-da9b4e14c255/Eigen/src/Core/DenseBase.h
===================================================================
---- eigen-eigen-f562a193118d.orig/Eigen/src/Core/DenseBase.h
-+++ eigen-eigen-f562a193118d/Eigen/src/Core/DenseBase.h
+--- eigen-eigen-da9b4e14c255.orig/Eigen/src/Core/DenseBase.h
++++ eigen-eigen-da9b4e14c255/Eigen/src/Core/DenseBase.h
@@ -242,7 +242,7 @@ template<typename Derived> class DenseBa
{
EIGEN_ONLY_USED_FOR_DEBUG(newSize);
@@ -24,10 +24,10 @@ Index: eigen-eigen-f562a193118d/Eigen/src/Core/DenseBase.h
}
#ifndef EIGEN_PARSED_BY_DOXYGEN
-Index: eigen-eigen-f562a193118d/Eigen/src/SparseCore/SparseSelfAdjointView.h
+Index: eigen-eigen-da9b4e14c255/Eigen/src/SparseCore/SparseSelfAdjointView.h
===================================================================
---- eigen-eigen-f562a193118d.orig/Eigen/src/SparseCore/SparseSelfAdjointView.h
-+++ eigen-eigen-f562a193118d/Eigen/src/SparseCore/SparseSelfAdjointView.h
+--- eigen-eigen-da9b4e14c255.orig/Eigen/src/SparseCore/SparseSelfAdjointView.h
++++ eigen-eigen-da9b4e14c255/Eigen/src/SparseCore/SparseSelfAdjointView.h
@@ -153,7 +153,7 @@ template<typename MatrixType, unsigned i
EIGEN_ONLY_USED_FOR_DEBUG(rows);
EIGEN_ONLY_USED_FOR_DEBUG(cols);
diff --git a/debian/patches/14_fix_altivec_sign_issue.patch b/debian/patches/14_fix_altivec_sign_issue.patch
deleted file mode 100644
index 5b45a66..0000000
--- a/debian/patches/14_fix_altivec_sign_issue.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-Description: Fix sign issue with pmul on altivec
-Bug-Debian: https://bugs.debian.org/836844
-Bug: http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1360
-Origin: upstream, https://bitbucket.org/eigen/eigen/commits/d7f257380d20/
-Author: Gael Guennebaud <g.gael at free.fr>
-Last-Update: 2016-12-19
---- a/Eigen/src/Core/arch/AltiVec/Complex.h
-+++ b/Eigen/src/Core/arch/AltiVec/Complex.h
-@@ -15,14 +15,14 @@
-
- namespace internal {
-
--static Packet4ui p4ui_CONJ_XOR = vec_mergeh((Packet4ui)p4i_ZERO, (Packet4ui)p4f_ZERO_);//{ 0x00000000, 0x80000000, 0x00000000, 0x80000000 };
-+static Packet4ui p4ui_CONJ_XOR = vec_mergeh((Packet4ui)p4i_ZERO, (Packet4ui)p4f_MZERO);//{ 0x00000000, 0x80000000, 0x00000000, 0x80000000 };
- #ifdef __VSX__
- #if defined(_BIG_ENDIAN)
--static Packet2ul p2ul_CONJ_XOR1 = (Packet2ul) vec_sld((Packet4ui) p2d_ZERO_, (Packet4ui) p2l_ZERO, 8);//{ 0x8000000000000000, 0x0000000000000000 };
--static Packet2ul p2ul_CONJ_XOR2 = (Packet2ul) vec_sld((Packet4ui) p2l_ZERO, (Packet4ui) p2d_ZERO_, 8);//{ 0x8000000000000000, 0x0000000000000000 };
-+static Packet2ul p2ul_CONJ_XOR1 = (Packet2ul) vec_sld((Packet4ui) p2d_MZERO, (Packet4ui) p2l_ZERO, 8);//{ 0x8000000000000000, 0x0000000000000000 };
-+static Packet2ul p2ul_CONJ_XOR2 = (Packet2ul) vec_sld((Packet4ui) p2l_ZERO, (Packet4ui) p2d_MZERO, 8);//{ 0x8000000000000000, 0x0000000000000000 };
- #else
--static Packet2ul p2ul_CONJ_XOR1 = (Packet2ul) vec_sld((Packet4ui) p2l_ZERO, (Packet4ui) p2d_ZERO_, 8);//{ 0x8000000000000000, 0x0000000000000000 };
--static Packet2ul p2ul_CONJ_XOR2 = (Packet2ul) vec_sld((Packet4ui) p2d_ZERO_, (Packet4ui) p2l_ZERO, 8);//{ 0x8000000000000000, 0x0000000000000000 };
-+static Packet2ul p2ul_CONJ_XOR1 = (Packet2ul) vec_sld((Packet4ui) p2l_ZERO, (Packet4ui) p2d_MZERO, 8);//{ 0x8000000000000000, 0x0000000000000000 };
-+static Packet2ul p2ul_CONJ_XOR2 = (Packet2ul) vec_sld((Packet4ui) p2d_MZERO, (Packet4ui) p2l_ZERO, 8);//{ 0x8000000000000000, 0x0000000000000000 };
- #endif
- #endif
-
---- a/Eigen/src/Core/arch/AltiVec/PacketMath.h
-+++ b/Eigen/src/Core/arch/AltiVec/PacketMath.h
-@@ -72,7 +72,7 @@
- static _EIGEN_DECLARE_CONST_FAST_Packet4i(ONE,1); //{ 1, 1, 1, 1}
- static _EIGEN_DECLARE_CONST_FAST_Packet4i(MINUS16,-16); //{ -16, -16, -16, -16}
- static _EIGEN_DECLARE_CONST_FAST_Packet4i(MINUS1,-1); //{ -1, -1, -1, -1}
--static Packet4f p4f_ZERO_ = (Packet4f) vec_sl((Packet4ui)p4i_MINUS1, (Packet4ui)p4i_MINUS1); //{ 0x80000000, 0x80000000, 0x80000000, 0x80000000}
-+static Packet4f p4f_MZERO = (Packet4f) vec_sl((Packet4ui)p4i_MINUS1, (Packet4ui)p4i_MINUS1); //{ 0x80000000, 0x80000000, 0x80000000, 0x80000000}
- #ifndef __VSX__
- static Packet4f p4f_ONE = vec_ctf(p4i_ONE, 0); //{ 1.0, 1.0, 1.0, 1.0}
- #endif
-@@ -358,7 +358,7 @@
- template<> EIGEN_STRONG_INLINE Packet4f pconj(const Packet4f& a) { return a; }
- template<> EIGEN_STRONG_INLINE Packet4i pconj(const Packet4i& a) { return a; }
-
--template<> EIGEN_STRONG_INLINE Packet4f pmul<Packet4f>(const Packet4f& a, const Packet4f& b) { return vec_madd(a,b, p4f_ZERO); }
-+template<> EIGEN_STRONG_INLINE Packet4f pmul<Packet4f>(const Packet4f& a, const Packet4f& b) { return vec_madd(a,b, p4f_MZERO); }
- template<> EIGEN_STRONG_INLINE Packet4i pmul<Packet4i>(const Packet4i& a, const Packet4i& b) { return a * b; }
-
- template<> EIGEN_STRONG_INLINE Packet4f pdiv<Packet4f>(const Packet4f& a, const Packet4f& b)
-@@ -373,7 +373,7 @@
- t = vec_nmsub(y_0, b, p4f_ONE);
- y_1 = vec_madd(y_0, t, y_0);
-
-- return vec_madd(a, y_1, p4f_ZERO);
-+ return vec_madd(a, y_1, p4f_MZERO);
- #else
- return vec_div(a, b);
- #endif
-@@ -766,7 +766,7 @@
- static Packet2l p2l_ZERO = reinterpret_cast<Packet2l>(p4i_ZERO);
- static Packet2d p2d_ONE = { 1.0, 1.0 };
- static Packet2d p2d_ZERO = reinterpret_cast<Packet2d>(p4f_ZERO);
--static Packet2d p2d_ZERO_ = { -0.0, -0.0 };
-+static Packet2d p2d_MZERO = { -0.0, -0.0 };
-
- #ifdef _BIG_ENDIAN
- static Packet2d p2d_COUNTDOWN = reinterpret_cast<Packet2d>(vec_sld(reinterpret_cast<Packet4f>(p2d_ZERO), reinterpret_cast<Packet4f>(p2d_ONE), 8));
-@@ -904,7 +904,7 @@
-
- template<> EIGEN_STRONG_INLINE Packet2d pconj(const Packet2d& a) { return a; }
-
--template<> EIGEN_STRONG_INLINE Packet2d pmul<Packet2d>(const Packet2d& a, const Packet2d& b) { return vec_madd(a,b,p2d_ZERO); }
-+template<> EIGEN_STRONG_INLINE Packet2d pmul<Packet2d>(const Packet2d& a, const Packet2d& b) { return vec_madd(a,b,p2d_MZERO); }
- template<> EIGEN_STRONG_INLINE Packet2d pdiv<Packet2d>(const Packet2d& a, const Packet2d& b) { return vec_div(a,b); }
-
- // for some weird raisons, it has to be overloaded for packet of integers
diff --git a/debian/patches/series b/debian/patches/series
index 6f15d05..8e95ef3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
07_remove_compressed_doc.patch
08_fix_path_FindEigen3.patch
12_grammer_tweak.patch
-14_fix_altivec_sign_issue.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/eigen3.git
More information about the debian-science-commits
mailing list