From f58ff688bcbdb833caa77aa37e12a632a2c71128 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 7 Mar 2019 13:27:34 +0100
Subject: [PATCH] [wip/{py-,}sot-dynamic-pinocchio-v3] add patch-ae to fix
eigen 3.2 build
---
py-sot-dynamic-pinocchio-v3/Makefile | 2 +-
py-sot-dynamic-pinocchio-v3/distinfo | 1 +
py-sot-dynamic-pinocchio-v3/patches/patch-ae | 34 ++++++++++++++++++++
sot-dynamic-pinocchio-v3/Makefile | 2 +-
sot-dynamic-pinocchio-v3/distinfo | 1 +
sot-dynamic-pinocchio-v3/patches/patch-ae | 34 ++++++++++++++++++++
6 files changed, 72 insertions(+), 2 deletions(-)
create mode 100644 py-sot-dynamic-pinocchio-v3/patches/patch-ae
create mode 100644 sot-dynamic-pinocchio-v3/patches/patch-ae
diff --git a/py-sot-dynamic-pinocchio-v3/Makefile b/py-sot-dynamic-pinocchio-v3/Makefile
index 6571957d..0ce61351 100644
--- a/py-sot-dynamic-pinocchio-v3/Makefile
+++ b/py-sot-dynamic-pinocchio-v3/Makefile
@@ -5,7 +5,7 @@
ORG= stack-of-tasks
NAME= sot-dynamic-pinocchio
VERSION= 3.3.0
-PKGREVISION= 1
+PKGREVISION= 2
DISTNAME= ${NAME}-v3-${VERSION}
PKGNAME= ${PKGTAG.python-}${NAME}-v3-${VERSION}
diff --git a/py-sot-dynamic-pinocchio-v3/distinfo b/py-sot-dynamic-pinocchio-v3/distinfo
index fa5312c7..0f9f2e1c 100644
--- a/py-sot-dynamic-pinocchio-v3/distinfo
+++ b/py-sot-dynamic-pinocchio-v3/distinfo
@@ -5,3 +5,4 @@ SHA1 (patch-aa) = 610e74d5c682045ec67675cc77536b4cdfa3f214
SHA1 (patch-ab) = 65531cbbc1ea697e9f4f63f864fd811a99e955ae
SHA1 (patch-ac) = 1ed2bed5622b342b3ddcf1530421caf7e7eb65ef
SHA1 (patch-ad) = 9731f90f2c33abec026a1d34cfaa653316b84427
+SHA1 (patch-ae) = 2a4097cc59248d38c98ebcd77fcf984b2e1f92f7
diff --git a/py-sot-dynamic-pinocchio-v3/patches/patch-ae b/py-sot-dynamic-pinocchio-v3/patches/patch-ae
new file mode 100644
index 00000000..b2332379
--- /dev/null
+++ b/py-sot-dynamic-pinocchio-v3/patches/patch-ae
@@ -0,0 +1,34 @@
+From d7d07c2567ae3e21be0b306e40def1138ae82ef3 Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Thu, 7 Mar 2019 13:05:33 +0100
+Subject: [PATCH] use Eigen::DenseIndex to fix build on eigen3.2, fix #50
+
+---
+ src/angle-estimator.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/angle-estimator.cpp b/src/angle-estimator.cpp
+index e0279c5..f9cb3ae 100644
+--- src/angle-estimator.cpp
++++ src/angle-estimator.cpp
+@@ -340,7 +340,7 @@ compute_xff_dotSOUT( dynamicgraph::Vector& res,
+ const dynamicgraph::Matrix & J = jacobianSIN( time );
+ const dynamicgraph::Vector & dq = qdotSIN( time );
+
+- const Eigen::Index nr=J.rows(), nc=J.cols()-6;
++ const Eigen::DenseIndex nr=J.rows(), nc=J.cols()-6;
+ assert( nr==6 );
+ dynamicgraph::Matrix Ja( nr,nc ); dynamicgraph::Vector dqa(nc);
+ for( int j=0;j<nc;++j )
+@@ -367,7 +367,7 @@ compute_qdotSOUT( dynamicgraph::Vector& res,
+
+ assert( dx.size()==6 );
+
+- const Eigen::Index nr=dq.size();
++ const Eigen::DenseIndex nr=dq.size();
+ res.resize( nr ); res=dq;
+ for( int i=0;i<6;++i ) res(i)=dx(i);
+
+--
+2.7.4
+
diff --git a/sot-dynamic-pinocchio-v3/Makefile b/sot-dynamic-pinocchio-v3/Makefile
index c6242c74..19b3d71a 100644
--- a/sot-dynamic-pinocchio-v3/Makefile
+++ b/sot-dynamic-pinocchio-v3/Makefile
@@ -5,7 +5,7 @@
ORG= stack-of-tasks
NAME= sot-dynamic-pinocchio
VERSION= 3.3.0
-PKGREVISION= 1
+PKGREVISION= 2
DISTNAME= ${NAME}-v3-${VERSION}
PKGNAME= ${NAME}-v3-${VERSION}
diff --git a/sot-dynamic-pinocchio-v3/distinfo b/sot-dynamic-pinocchio-v3/distinfo
index cb7da395..0055abc8 100644
--- a/sot-dynamic-pinocchio-v3/distinfo
+++ b/sot-dynamic-pinocchio-v3/distinfo
@@ -2,3 +2,4 @@ SHA1 (sot-dynamic-pinocchio-v3-3.3.0.tar.gz) = 387173261f4755de6821c29212dde1d36
RMD160 (sot-dynamic-pinocchio-v3-3.3.0.tar.gz) = 429e8eac320fee3e51d8e0e94d3f471d9c36ecee
Size (sot-dynamic-pinocchio-v3-3.3.0.tar.gz) = 862834 bytes
SHA1 (patch-ac) = 1ed2bed5622b342b3ddcf1530421caf7e7eb65ef
+SHA1 (patch-ae) = 2a4097cc59248d38c98ebcd77fcf984b2e1f92f7
diff --git a/sot-dynamic-pinocchio-v3/patches/patch-ae b/sot-dynamic-pinocchio-v3/patches/patch-ae
new file mode 100644
index 00000000..b2332379
--- /dev/null
+++ b/sot-dynamic-pinocchio-v3/patches/patch-ae
@@ -0,0 +1,34 @@
+From d7d07c2567ae3e21be0b306e40def1138ae82ef3 Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Thu, 7 Mar 2019 13:05:33 +0100
+Subject: [PATCH] use Eigen::DenseIndex to fix build on eigen3.2, fix #50
+
+---
+ src/angle-estimator.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/angle-estimator.cpp b/src/angle-estimator.cpp
+index e0279c5..f9cb3ae 100644
+--- src/angle-estimator.cpp
++++ src/angle-estimator.cpp
+@@ -340,7 +340,7 @@ compute_xff_dotSOUT( dynamicgraph::Vector& res,
+ const dynamicgraph::Matrix & J = jacobianSIN( time );
+ const dynamicgraph::Vector & dq = qdotSIN( time );
+
+- const Eigen::Index nr=J.rows(), nc=J.cols()-6;
++ const Eigen::DenseIndex nr=J.rows(), nc=J.cols()-6;
+ assert( nr==6 );
+ dynamicgraph::Matrix Ja( nr,nc ); dynamicgraph::Vector dqa(nc);
+ for( int j=0;j<nc;++j )
+@@ -367,7 +367,7 @@ compute_qdotSOUT( dynamicgraph::Vector& res,
+
+ assert( dx.size()==6 );
+
+- const Eigen::Index nr=dq.size();
++ const Eigen::DenseIndex nr=dq.size();
+ res.resize( nr ); res=dq;
+ for( int i=0;i<6;++i ) res(i)=dx(i);
+
+--
+2.7.4
+
--
GitLab