{scarthgap} Append ${ros_prefix} to recipes

meta-ros-common/recipes-support/ceres-solver/ceres-solver_%.bbappend

@@ -1,3 +1,5 @@
 # Copyright (c) 2019-2021 LG Electronics, Inc.
 
 PACKAGECONFIG ??= "suitesparse cxsparse lapack"
+
+EXTRA_OECMAKE += " -DEIGENSPARSE:BOOL=OFF"

meta-ros-common/recipes-support/libtinyxml2/files/run-ptest

@@ -0,0 +1,10 @@
+#!/bin/sh
+
+for i in `ls xmltest`; do
+    ./$i
+    if [ $? -eq 0 ]; then
+        echo "PASS: $i"
+    else
+        echo "FAIL: $i"
+    fi
+done

meta-ros-common/recipes-support/libtinyxml2/libtinyxml2_10.0.0.bb

@@ -0,0 +1,36 @@
+SUMMARY = "TinyXML-2 is a simple, small, efficient, C++ XML parser that can be easily integrating into other programs"
+HOMEPAGE = "https://leethomason.github.io/tinyxml2"
+SECTION = "libs"
+LICENSE = "Zlib"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd"
+
+SRCREV = "321ea883b7190d4e85cae5512a12e5eaa8f8731f"
+SRC_URI = "git://github.com/leethomason/tinyxml2.git;branch=master;protocol=https \
+            file://run-ptest \
+"
+
+PR = "r1"
+
+S = "${WORKDIR}/git"
+
+inherit cmake  ptest
+
+EXTRA_OEMESON += " \
+    ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtests=true', '', d)} \
+    -Ddefault_library=both \
+"
+
+CXXFLAGS:append:libc-musl = " -D_LARGEFILE64_SOURCE"
+EXTRA_OECMAKE += " -Dtinyxml2_SHARED_LIBS:BOOL=ON"
+
+
+do_install_ptest() {
+    install -Dm 0755 ${B}/xmltest ${D}${PTEST_PATH}/xmltest
+    install -d ${D}${PTEST_PATH}/resources/out
+    for f in ${S}/resources/*.xml; do
+        install -m 0644 $f ${D}${PTEST_PATH}/resources/
+    done
+}
+
+BBCLASSEXTEND = "native nativesdk"
+

meta-ros2-humble/conf/ros-distro/include/humble/ros-distro.inc

@@ -340,7 +340,7 @@ ROS_UNRESOLVED_DEP-black = "python3-black"
 ROS_UNRESOLVED_DEP-black-native = "python3-black-native"
 
 ROS_UNRESOLVED_DEP-libdraco-dev = "draco"
-ROS_UNRESOLVED_DEP-sdformat12 = "sdformat"
+ROS_UNRESOLVED_DEP-sdformat12 = "sdformat12"
 
 ROS_UNRESOLVED_DEP-hdf5-tools-native = "hdf5-native"
 ROS_UNRESOLVED_DEP-libopenscenegraph = "openscenegraph"

meta-ros2-humble/generated-recipes/aerostack2/as2-state-estimator_1.0.9-1.bb

@@ -9,7 +9,7 @@ DESCRIPTION = "Basic state estimator for AeroStack2"
 AUTHOR = "CVAR-UPM <[email protected]>"
 HOMEPAGE = "https://wiki.ros.org"
 SECTION = "devel"
-LICENSE = "BDS-3-Clause"
+LICENSE = "BSD-3-Clause"
 LIC_FILES_CHKSUM = "file://package.xml;beginline=10;endline=10;md5=bf4ae491377eb66f24ed1346d5c8de3b"
 
 ROS_CN = "aerostack2"

meta-ros2-humble/recipes-bbappends/aerostack2/as2-platform-crazyflie_1.0.9-1.bbappend

@@ -13,5 +13,5 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 SRC_URI += "file://add-geographiclib-find-package.patch"
 
 do_install:append() {
-    sed -i '1c#!/usr/bin/env python3' ${D}${libdir}/as2_platform_crazyflie/aideck_node.py
+    sed -i '1c#!/usr/bin/env python3' ${D}${ros_prefix}/lib/as2_platform_crazyflie/aideck_node.py
 }

meta-ros2-humble/recipes-bbappends/ament-download/ament-download_0.0.5-1.bbappend

@@ -5,5 +5,5 @@
 # RDEPENDS:${PN}-dev += "coreutils"
 
 do_install:append() {
-    sed -i 's@^#!/bin/env@#!/usr/bin/env@g' ${D}${datadir}/ament_download/cmake/download_checkmd5.py
+    sed -i 's@^#!/bin/env@#!/usr/bin/env@g' ${D}${ros_prefix}/share/ament_download/cmake/download_checkmd5.py
 }

meta-ros2-humble/recipes-bbappends/librealsense2/librealsense2_2.55.1-1.bbappend

@@ -1,7 +1,4 @@
 # Copyright (c) 2023 Wind River Systems, Inc.
 
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
-SRC_URI += "file://fixed-compile-error-uint64t.patch"
-
 # ERROR: QA Issue: non -dev/-dbg/nativesdk- package librealsense2 contains symlink .so '/usr/lib/librealsense2.so' [dev-so]
 FILES:${PN}-dev += "${libdir}/librealsense2.so"

meta-ros2-humble/recipes-bbappends/octomap/octomap_1.9.8-1.bbappend

@@ -34,6 +34,3 @@ inherit ros_insane_dev_so
 # octomap: /usr/bin/edit_octree contains probably-redundant RPATH /usr/lib
 # octomap: /usr/bin/eval_octree_accuracy contains probably-redundant RPATH /usr/lib [useless-rpaths]
 DEPENDS:append:class-target = " chrpath-replacement-native"
-do_install:append() {
-    chrpath --delete ${D}${bindir}/* ${D}${libdir}/*${SOLIBS}
-}

meta-ros2-humble/recipes-extended/fcl/fcl_0.6.1.bbappend

@@ -6,3 +6,7 @@
 # meta-ros-common/recipes-extended/fcl/fcl_0.6.1.bb
 # but moveit-core from foxy, needs octomap support to be enabled
 DEPENDS += "octomap"
+
+inherit ros_opt_prefix
+inherit ros_cmake
+inherit ros_insane_dev_so

meta-ros2/recipes-devtools/python/python3-pymap3d_3.0.1.bb

@@ -19,7 +19,6 @@ from setuptools import setup
 setup(
        name="${PYPI_PACKAGE}",
        version="${PV}",
-       license="${LICENSE}",
 )
 EOF
 }