From 051b5f479c20f6c71a543061b2994ec69554eb0f Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 10 Jan 2020 19:11:00 +0100
Subject: [PATCH] [wip/dynamic-graph-v3] Update to v3.8.1
Changes since v3.8.0:
- CMake: rollback to old version for eigen3 & boost
Changes since v3.7.3:
- package.xml
- Modern CMake
---
dynamic-graph-v3/Makefile | 2 +-
dynamic-graph-v3/PLIST | 5 +++++
dynamic-graph-v3/depend.mk | 12 +++++++-----
dynamic-graph-v3/distinfo | 6 +++---
4 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/dynamic-graph-v3/Makefile b/dynamic-graph-v3/Makefile
index 167d1276..24020c12 100644
--- a/dynamic-graph-v3/Makefile
+++ b/dynamic-graph-v3/Makefile
@@ -4,7 +4,7 @@
ORG= stack-of-tasks
NAME= dynamic-graph
-VERSION= 3.7.3
+VERSION= 3.8.1
DISTNAME= ${NAME}-v3-${VERSION}
PKGNAME= ${NAME}-v3-${VERSION}
diff --git a/dynamic-graph-v3/PLIST b/dynamic-graph-v3/PLIST
index 9b24eef7..a57aba01 100644
--- a/dynamic-graph-v3/PLIST
+++ b/dynamic-graph-v3/PLIST
@@ -45,8 +45,13 @@ include/dynamic-graph/tracer-real-time.h
include/dynamic-graph/tracer.h
include/dynamic-graph/value.h
include/dynamic-graph/warning.hh
+lib/cmake/dynamic-graph/dynamic-graphConfig.cmake
+lib/cmake/dynamic-graph/dynamic-graphConfigVersion.cmake
+lib/cmake/dynamic-graph/dynamic-graphTargets-release.cmake
+lib/cmake/dynamic-graph/dynamic-graphTargets.cmake
lib/libdynamic-graph.so
lib/libdynamic-graph.so.${PKGVERSION}
lib/pkgconfig/dynamic-graph.pc
lib/plugin/tracer-real-time.so
lib/plugin/tracer.so
+share/dynamic-graph/package.xml
diff --git a/dynamic-graph-v3/depend.mk b/dynamic-graph-v3/depend.mk
index 57488737..19631c8a 100644
--- a/dynamic-graph-v3/depend.mk
+++ b/dynamic-graph-v3/depend.mk
@@ -14,15 +14,17 @@ ifeq (+,$(HPP_GIK_DEPEND_MK)) # --------------------------------------
PREFER.dynamic-graph-v3?= robotpkg
SYSTEM_SEARCH.dynamic-graph-v3=\
- include/dynamic-graph/entity.h \
- lib/libdynamic-graph.so \
- lib/pkgconfig/dynamic-graph.pc
+ 'include/dynamic-graph/config.hh:/DYNAMIC_GRAPH_VERSION /s/[^0-9.]//gp' \
+ 'lib/cmake/dynamic-graph/dynamic-graphConfigVersion.cmake:/PACKAGE_VERSION/s/[^0-9.]//gp' \
+ 'lib/pkgconfig/dynamic-graph.pc:/Version/s/[^0-9.]//gp' \
+ 'lib/libdynamic-graph.so' \
+ 'share/dynamic-graph/package.xml:/<version>/s/[^0-9.]//gp'
DEPEND_USE+= dynamic-graph-v3
-DEPEND_ABI.dynamic-graph-v3?= dynamic-graph-v3>=3.0.0
+DEPEND_ABI.dynamic-graph-v3?= dynamic-graph-v3>=3.8.1
DEPEND_DIR.dynamic-graph-v3?= ../../wip/dynamic-graph-v3
endif # HPP_GIK_DEPEND_MK --------------------------------------------
-DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
\ No newline at end of file
+DEPEND_DEPTH:= ${DEPEND_DEPTH:+=}
diff --git a/dynamic-graph-v3/distinfo b/dynamic-graph-v3/distinfo
index 7ad8abda..325e23d8 100644
--- a/dynamic-graph-v3/distinfo
+++ b/dynamic-graph-v3/distinfo
@@ -1,3 +1,3 @@
-SHA1 (dynamic-graph-v3-3.7.3.tar.gz) = 3cc510baf18b4f92e38fc5caa805de282943973d
-RMD160 (dynamic-graph-v3-3.7.3.tar.gz) = d703aa0fb9d6c78485360647105342fc5886d42e
-Size (dynamic-graph-v3-3.7.3.tar.gz) = 1295556 bytes
+SHA1 (dynamic-graph-v3-3.8.1.tar.gz) = c1d8491259db0ad99b1f9f02c41ed29581c0dd8b
+RMD160 (dynamic-graph-v3-3.8.1.tar.gz) = 376c4e36f49fae01ecf2eee07f3504606d0f0170
+Size (dynamic-graph-v3-3.8.1.tar.gz) = 1314995 bytes
--
GitLab