From ebb2076e5f7b94cd191bdcf58133fb0849a01042 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel <guilhem.saurel@laas.fr> Date: Thu, 25 Apr 2019 11:12:17 +0200 Subject: [PATCH] [wip/hpp-universal-robot] Update to v4.5.0 Changes since v4.2.1: - [CMake] find xacro executable - Make root joint type parameterizable. Packaging changes: - Removed patch-aa, applied upstream --- hpp-universal-robot/Makefile | 1 - hpp-universal-robot/distinfo | 7 +++---- hpp-universal-robot/patches/patch-aa | 20 -------------------- 3 files changed, 3 insertions(+), 25 deletions(-) delete mode 100644 hpp-universal-robot/patches/patch-aa diff --git a/hpp-universal-robot/Makefile b/hpp-universal-robot/Makefile index 848a5763..91a4813d 100644 --- a/hpp-universal-robot/Makefile +++ b/hpp-universal-robot/Makefile @@ -4,7 +4,6 @@ HPP_PACKAGE= hpp-universal-robot HPP_COMMENT= Data specific to robots ur5 and ur10 for hpp-corbaserver -HPP_VERSION= 4.2.1 CATEGORIES= wip diff --git a/hpp-universal-robot/distinfo b/hpp-universal-robot/distinfo index 5b5e54a6..99fec59d 100644 --- a/hpp-universal-robot/distinfo +++ b/hpp-universal-robot/distinfo @@ -1,4 +1,3 @@ -SHA1 (hpp-universal-robot-4.2.1.tar.gz) = 13d93365327fa5804812aaa59447245cece25715 -RMD160 (hpp-universal-robot-4.2.1.tar.gz) = 11bfe4a222ac6fdd8861dc003a40b571db14b9d8 -Size (hpp-universal-robot-4.2.1.tar.gz) = 769198 bytes -SHA1 (patch-aa) = 4de9ae5f2e7f3ad0c9afa724f3ae2a91f0f5862d +SHA1 (hpp-universal-robot-4.5.0.tar.gz) = 0812ade9f85fff6288830f60293979a25858d54e +RMD160 (hpp-universal-robot-4.5.0.tar.gz) = cbca529779fd9937f6d617af0dbfa69eb4b44374 +Size (hpp-universal-robot-4.5.0.tar.gz) = 769246 bytes diff --git a/hpp-universal-robot/patches/patch-aa b/hpp-universal-robot/patches/patch-aa deleted file mode 100644 index e3cdb6f2..00000000 --- a/hpp-universal-robot/patches/patch-aa +++ /dev/null @@ -1,20 +0,0 @@ ---- CMakeLists.txt.orig 2018-10-19 17:56:07.000000000 +0200 -+++ CMakeLists.txt 2019-03-14 18:02:41.028852308 +0100 -@@ -21,6 +21,8 @@ - INCLUDE(cmake/base.cmake) - INCLUDE(cmake/python.cmake) - -+FIND_PROGRAM(XACRO_EXECUTABLE xacro) -+ - # GENERATE_URDF_FILE FILENAME EXTENSION - # ------------------------------------ - # -@@ -43,7 +45,7 @@ - - ADD_CUSTOM_COMMAND( - OUTPUT ${FILENAME} -- COMMAND "xacro" -+ COMMAND ${XACRO_EXECUTABLE} - ARGS -o ${FILENAME} ${_XACRO_FILE_} - MAIN_DEPENDENCY ${_XACRO_FILE_} - COMMENT "Generating ${FILENAME} from ${_XACRO_FILE_}" -- GitLab