diff --git a/recipes-extended/kdl/kdl.inc b/recipes-extended/kdl/kdl.inc index 61a1daa..2c2e727 100644 --- a/recipes-extended/kdl/kdl.inc +++ b/recipes-extended/kdl/kdl.inc @@ -1,9 +1,9 @@ -SRC_URI = "git://github.com/orocos/orocos_kinematics_dynamics.git" -SRCREV = "15fb082c10b58078841c14c067ac55f592733447" -PV = "1.1.102+git${SRCREV}" +SRC_URI = "https://github.com/orocos/${SPN}/archive/v${PV}.tar.gz;downloadfilename=${SPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "710b6ab202cc062d1ad08afde9c9b21a" +SRC_URI[sha256sum] = "b35c3264ccbbde5b5dbb562cbca6cab5b69f30ebfb8d347314d844e084d037ef" -S = "${WORKDIR}/git/${@d.getVar('BPN', True).replace('-', '_')}" +S = "${WORKDIR}/${SPN}-${PV}/${@d.getVar('BPN', True).replace('-', '_')}" inherit cmake -ROS_SPN = "kdl" +SPN = "orocos_kinematics_dynamics" diff --git a/recipes-extended/kdl/orocos-kdl_1.1.102-1.bb b/recipes-extended/kdl/orocos-kdl_1.2.1.bb similarity index 100% rename from recipes-extended/kdl/orocos-kdl_1.1.102-1.bb rename to recipes-extended/kdl/orocos-kdl_1.2.1.bb diff --git a/recipes-extended/kdl/python-orocos-kdl/0001-findSIP-fix.patch b/recipes-extended/kdl/python-orocos-kdl/0001-findSIP-fix.patch deleted file mode 100644 index a99f73b..0000000 --- a/recipes-extended/kdl/python-orocos-kdl/0001-findSIP-fix.patch +++ /dev/null @@ -1,34 +0,0 @@ -diff --git a/cmake/FindSIP.cmake b/cmake/FindSIP.cmake -index 53e2888..8f94cf5 100644 ---- a/cmake/FindSIP.cmake -+++ b/cmake/FindSIP.cmake -@@ -31,17 +31,26 @@ IF(SIP_VERSION) - SET(SIP_FOUND TRUE) - ELSE(SIP_VERSION) - -- FIND_FILE(_find_sip_py FindSIP.py PATHS ${CMAKE_MODULE_PATH}) -+ FIND_FILE(_find_sip_py FindSIP.py PATHS ${CMAKE_MODULE_PATH} NO_CMAKE_FIND_ROOT_PATH) - - EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} ${_find_sip_py} OUTPUT_VARIABLE sip_config) - IF(sip_config) - STRING(REGEX REPLACE "^sip_version:([^\n]+).*$" "\\1" SIP_VERSION ${sip_config}) - STRING(REGEX REPLACE ".*\nsip_version_str:([^\n]+).*$" "\\1" SIP_VERSION_STR ${sip_config}) -- STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_EXECUTABLE ${sip_config}) - IF(NOT SIP_DEFAULT_SIP_DIR) - STRING(REGEX REPLACE ".*\ndefault_sip_dir:([^\n]+).*$" "\\1" SIP_DEFAULT_SIP_DIR ${sip_config}) - ENDIF(NOT SIP_DEFAULT_SIP_DIR) -- STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config}) -+ -+ IF(CMAKE_CROSSCOMPILING) -+ FIND_PROGRAM(SIP_EXECUTABLE sip) -+ STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config}) -+ LIST(GET CMAKE_FIND_ROOT_PATH 0 SIP_SYSROOT) -+ SET(SIP_INCLUDE_DIR "${SIP_SYSROOT}${SIP_INCLUDE_DIR}") -+ ELSE(CMAKE_CROSSCOMPILING) -+ STRING(REGEX REPLACE ".*\nsip_bin:([^\n]+).*$" "\\1" SIP_EXECUTABLE ${sip_config}) -+ STRING(REGEX REPLACE ".*\nsip_inc_dir:([^\n]+).*$" "\\1" SIP_INCLUDE_DIR ${sip_config}) -+ ENDIF(CMAKE_CROSSCOMPILING) -+ - SET(SIP_FOUND TRUE) - ENDIF(sip_config) - diff --git a/recipes-extended/kdl/python-orocos-kdl_1.1.102-1.bb b/recipes-extended/kdl/python-orocos-kdl_1.2.1.bb similarity index 92% rename from recipes-extended/kdl/python-orocos-kdl_1.1.102-1.bb rename to recipes-extended/kdl/python-orocos-kdl_1.2.1.bb index 4083a44..ebb035f 100644 --- a/recipes-extended/kdl/python-orocos-kdl_1.1.102-1.bb +++ b/recipes-extended/kdl/python-orocos-kdl_1.2.1.bb @@ -7,8 +7,6 @@ DEPENDS = "sip-native python-sip orocos-kdl" require kdl.inc -SRC_URI += "file://0001-findSIP-fix.patch" - inherit pythonnative FILES_${PN} += "${libdir}/python*/dist-packages/PyKDL.so"