noetic-3.17: automatic update on 20240509-090109 (#915)

* noetic-3.17: automatic update on 20240509-090109 * ros/noetic.v3.17/ros-noetic-pluginlib: update workaround-gcc-segv.patch --------- Co-authored-by: Alpine ROS aports update bot <[email protected]> Co-authored-by: Atsushi Watanabe <[email protected]>
seqsense · May 9, 2024 · fae8e9e · fae8e9e
1 parent 06d0ec9
commit fae8e9e
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 43 deletions.
diff --git a/ros/noetic.v3.17/ros-noetic-pluginlib/APKBUILD b/ros/noetic.v3.17/ros-noetic-pluginlib/APKBUILD
@@ -1,7 +1,7 @@
 pkgname=ros-noetic-pluginlib
 _pkgname=pluginlib
 pkgver=1.13.0
-pkgrel=8
+pkgrel=9
 pkgdesc="$_pkgname package for ROS noetic"
 url="http://www.ros.org/wiki/pluginlib"
 arch="all"

diff --git a/ros/noetic.v3.17/ros-noetic-pluginlib/workaround-gcc-segv.patch b/ros/noetic.v3.17/ros-noetic-pluginlib/workaround-gcc-segv.patch
@@ -1,5 +1,5 @@
 diff --git a/include/pluginlib/class_loader_imp.hpp b/include/pluginlib/class_loader_imp.hpp
-index d45b591..8770318 100644
+index 8951b9f..c94ca8c 100644
 --- a/include/pluginlib/class_loader_imp.hpp
 +++ b/include/pluginlib/class_loader_imp.hpp
 @@ -63,10 +63,15 @@ const std::string os_pathsep(";");  // NOLINT
@@ -19,7 +19,26 @@ index d45b591..8770318 100644
    std::string package, std::string base_class, std::string attrib_name,
    std::vector<std::string> plugin_xml_paths)
  : plugin_xml_paths_(plugin_xml_paths),
-@@ -96,7 +101,7 @@ ClassLoader<T>::ClassLoader(
+@@ -80,8 +85,8 @@ ClassLoader<T>::ClassLoader(
+   lowlevel_class_loader_(false)
+   /***************************************************************************/
+ {
+-  ROS_DEBUG_NAMED("pluginlib.ClassLoader", "Creating ClassLoader, base = %s, address = %p",
+-    base_class.c_str(), this);
++  ROS_DEBUG_STREAM_NAMED("pluginlib.ClassLoader",
++    "Creating ClassLoader, base = " << base_class.c_str() << ", address = " << this);
+   if (ros::package::getPath(package_).empty()) {
+     throw pluginlib::ClassLoaderException("Unable to find package: " + package_);
+   }
+@@ -90,13 +95,12 @@ ClassLoader<T>::ClassLoader(
+     plugin_xml_paths_ = getPluginXmlPaths(package_, attrib_name_);
+   }
+   classes_available_ = determineAvailableClasses(plugin_xml_paths_);
+-  ROS_DEBUG_NAMED("pluginlib.ClassLoader",
+-    "Finished constructring ClassLoader, base = %s, address = %p",
+-    base_class.c_str(), this);
++  ROS_DEBUG_STREAM_NAMED("pluginlib.ClassLoader",
++    "Finished constructring ClassLoader, base = " << base_class.c_str() << ", address = " << this);
  }
 
  template<class T>
@@ -28,7 +47,7 @@ index d45b591..8770318 100644
  /***************************************************************************/
  {
    ROS_DEBUG_NAMED("pluginlib.ClassLoader", "Destroying ClassLoader, base = %s, address = %p",
-@@ -105,7 +110,7 @@ ClassLoader<T>::~ClassLoader()
+@@ -105,7 +109,7 @@ ClassLoader<T>::~ClassLoader()
 
 
  template<class T>
@@ -37,7 +56,7 @@ index d45b591..8770318 100644
  /***************************************************************************/
  {
    // Note: This method is deprecated
-@@ -122,87 +127,87 @@ T * ClassLoader<T>::createClassInstance(const std::string & lookup_name, bool au
+@@ -122,87 +126,87 @@ T * ClassLoader<T>::createClassInstance(const std::string & lookup_name, bool au
    try {
      ROS_DEBUG_NAMED("pluginlib.ClassLoader",
        "Attempting to create instance through low-level MultiLibraryClassLoader...");
@@ -155,7 +174,7 @@ index d45b591..8770318 100644
 
    if (!isClassLoaded(lookup_name)) {
      loadLibraryForClass(lookup_name);
-@@ -212,23 +217,22 @@ T * ClassLoader<T>::createUnmanagedInstance(const std::string & lookup_name)
+@@ -212,23 +216,22 @@ T * ClassLoader<T>::createUnmanagedInstance(const std::string & lookup_name)
    try {
      ROS_DEBUG_NAMED("pluginlib.ClassLoader",
        "Attempting to create instance through low level multi-library class loader.");
@@ -186,7 +205,7 @@ index d45b591..8770318 100644
    const std::string & package,
    const std::string & attrib_name,
    bool force_recrawl)
-@@ -241,7 +245,7 @@ std::vector<std::string> ClassLoader<T>::getPluginXmlPaths(
+@@ -241,7 +244,7 @@ std::vector<std::string> ClassLoader<T>::getPluginXmlPaths(
  }
 
  template<class T>
@@ -195,7 +214,7 @@ index d45b591..8770318 100644
    const std::vector<std::string> & plugin_xml_paths)
  /***************************************************************************/
  {
-@@ -260,9 +264,9 @@ std::map<std::string, ClassDesc> ClassLoader<T>::determineAvailableClasses(
+@@ -260,9 +263,9 @@ std::map<std::string, ClassDesc> ClassLoader<T>::determineAvailableClasses(
      try {
        processSingleXMLPluginFile(*it, classes_available);
      } catch (const pluginlib::InvalidXMLException & e) {
@@ -208,7 +227,7 @@ index d45b591..8770318 100644
      }
    }
 
-@@ -271,36 +275,34 @@ std::map<std::string, ClassDesc> ClassLoader<T>::determineAvailableClasses(
+@@ -271,36 +274,34 @@ std::map<std::string, ClassDesc> ClassLoader<T>::determineAvailableClasses(
  }
 
  template<class T>
@@ -257,7 +276,7 @@ index d45b591..8770318 100644
      return "";
    }
 
-@@ -308,7 +310,7 @@ std::string ClassLoader<T>::extractPackageNameFromPackageXML(const std::string &
+@@ -308,7 +309,7 @@ std::string ClassLoader<T>::extractPackageNameFromPackageXML(const std::string &
  }
 
  template<class T>
@@ -266,7 +285,7 @@ index d45b591..8770318 100644
  /***************************************************************************/
  {
    std::vector<std::string> lib_paths;
-@@ -331,7 +333,7 @@ std::vector<std::string> ClassLoader<T>::getCatkinLibraryPaths()
+@@ -331,7 +332,7 @@ std::vector<std::string> ClassLoader<T>::getCatkinLibraryPaths()
  }
 
  template<class T>
@@ -275,7 +294,7 @@ index d45b591..8770318 100644
    const std::string & library_name,
    const std::string & exporting_package_name)
  /***************************************************************************/
-@@ -346,16 +348,16 @@ std::vector<std::string> ClassLoader<T>::getAllLibraryPathsToTry(
+@@ -346,16 +347,16 @@ std::vector<std::string> ClassLoader<T>::getAllLibraryPathsToTry(
    std::vector<std::string> all_paths;
    std::vector<std::string> all_paths_without_extension = getCatkinLibraryPaths();
    all_paths_without_extension.push_back(getROSBuildLibraryPath(exporting_package_name));
@@ -296,7 +315,7 @@ index d45b591..8770318 100644
 
    const std::string path_separator = getPathSeparator();
 
-@@ -377,21 +379,21 @@ std::vector<std::string> ClassLoader<T>::getAllLibraryPathsToTry(
+@@ -377,21 +378,21 @@ std::vector<std::string> ClassLoader<T>::getAllLibraryPathsToTry(
  }
 
  template<class T>
@@ -321,7 +340,7 @@ index d45b591..8770318 100644
  /***************************************************************************/
  {
    ClassMapIterator it = classes_available_.find(lookup_name);
-@@ -402,7 +404,7 @@ std::string ClassLoader<T>::getClassDescription(const std::string & lookup_name)
+@@ -402,7 +403,7 @@ std::string ClassLoader<T>::getClassDescription(const std::string & lookup_name)
  }
 
  template<class T>
@@ -330,7 +349,7 @@ index d45b591..8770318 100644
  /***************************************************************************/
  {
    ClassMapIterator it = classes_available_.find(lookup_name);
-@@ -413,32 +415,28 @@ std::string ClassLoader<T>::getClassType(const std::string & lookup_name)
+@@ -413,32 +414,28 @@ std::string ClassLoader<T>::getClassType(const std::string & lookup_name)
  }
 
  template<class T>
@@ -372,7 +391,7 @@ index d45b591..8770318 100644
        return *it;
      }
    }
-@@ -446,7 +444,7 @@ std::string ClassLoader<T>::getClassLibraryPath(const std::string & lookup_name)
+@@ -446,7 +443,7 @@ std::string ClassLoader<T>::getClassLibraryPath(const std::string & lookup_name)
  }
 
  template<class T>
@@ -381,7 +400,7 @@ index d45b591..8770318 100644
  /***************************************************************************/
  {
    ClassMapIterator it = classes_available_.find(lookup_name);
-@@ -457,14 +455,14 @@ std::string ClassLoader<T>::getClassPackage(const std::string & lookup_name)
+@@ -457,14 +454,14 @@ std::string ClassLoader<T>::getClassPackage(const std::string & lookup_name)
  }
 
  template<class T>
@@ -398,7 +417,7 @@ index d45b591..8770318 100644
  /***************************************************************************/
  {
    std::vector<std::string> lookup_names;
-@@ -476,11 +474,11 @@ std::vector<std::string> ClassLoader<T>::getDeclaredClasses()
+@@ -476,11 +473,11 @@ std::vector<std::string> ClassLoader<T>::getDeclaredClasses()
  }
 
  template<class T>
@@ -412,7 +431,7 @@ index d45b591..8770318 100644
    for (unsigned int i = 0; i < types.size(); i++) {
      declared_types = declared_types + std::string(" ") + types[i];
    }
-@@ -490,7 +488,7 @@ std::string ClassLoader<T>::getErrorStringForUnknownClass(const std::string & lo
+@@ -490,7 +487,7 @@ std::string ClassLoader<T>::getErrorStringForUnknownClass(const std::string & lo
  }
 
  template<class T>
@@ -421,7 +440,7 @@ index d45b591..8770318 100644
  /***************************************************************************/
  {
    // remove the package name to get the raw plugin name
-@@ -501,7 +499,7 @@ std::string ClassLoader<T>::getName(const std::string & lookup_name)
+@@ -501,7 +498,7 @@ std::string ClassLoader<T>::getName(const std::string & lookup_name)
 
  template<class T>
  std::string
@@ -430,7 +449,7 @@ index d45b591..8770318 100644
  /***************************************************************************/
  {
    // Note: This method takes an input a path to a plugin xml file and must determine which
-@@ -520,21 +518,21 @@ ClassLoader<T>::getPackageFromPluginXMLFilePath(const std::string & plugin_xml_f
+@@ -520,21 +517,21 @@ ClassLoader<T>::getPackageFromPluginXMLFilePath(const std::string & plugin_xml_f
    // 2. Extract name of package from package.xml
 
    std::string package_name;
@@ -457,7 +476,7 @@ index d45b591..8770318 100644
 
        // package_path is a substr of passed plugin xml path
        if (0 == plugin_xml_file_path.find(package_path)) {
-@@ -556,7 +554,7 @@ ClassLoader<T>::getPackageFromPluginXMLFilePath(const std::string & plugin_xml_f
+@@ -556,7 +553,7 @@ ClassLoader<T>::getPackageFromPluginXMLFilePath(const std::string & plugin_xml_f
  }
 
  template<class T>
@@ -466,7 +485,7 @@ index d45b591..8770318 100644
  /***************************************************************************/
  {
  #if BOOST_FILESYSTEM_VERSION >= 3
-@@ -572,7 +570,7 @@ std::string ClassLoader<T>::getPathSeparator()
+@@ -572,7 +569,7 @@ std::string ClassLoader<T>::getPathSeparator()
 
 
  template<class T>
@@ -475,7 +494,7 @@ index d45b591..8770318 100644
  /***************************************************************************/
  {
    ClassMapIterator it = classes_available_.find(lookup_name);
-@@ -584,49 +582,47 @@ std::string ClassLoader<T>::getPluginManifestPath(const std::string & lookup_nam
+@@ -584,49 +581,47 @@ std::string ClassLoader<T>::getPluginManifestPath(const std::string & lookup_nam
 
 
  template<class T>
@@ -534,7 +553,7 @@ index d45b591..8770318 100644
      std::ostringstream error_msg;
      error_msg << "Could not find library corresponding to plugin " << lookup_name <<
        ". Make sure the plugin description XML file has the correct name of the "
-@@ -638,7 +634,7 @@ void ClassLoader<T>::loadLibraryForClass(const std::string & lookup_name)
+@@ -638,7 +633,7 @@ void ClassLoader<T>::loadLibraryForClass(const std::string & lookup_name)
      lowlevel_class_loader_.loadLibrary(library_path);
      it->second.resolved_library_path_ = library_path;
    } catch (const class_loader::LibraryLoadException & ex) {
@@ -543,7 +562,7 @@ index d45b591..8770318 100644
        "Failed to load library " + library_path + ". "
        "Make sure that you are calling the PLUGINLIB_EXPORT_CLASS macro in the "
        "library code, and that names are consistent between this macro and your XML. "
-@@ -648,15 +644,15 @@ void ClassLoader<T>::loadLibraryForClass(const std::string & lookup_name)
+@@ -648,15 +643,15 @@ void ClassLoader<T>::loadLibraryForClass(const std::string & lookup_name)
  }
 
  template<class T>
@@ -562,7 +581,7 @@ index d45b591..8770318 100644
    if (NULL == config) {
      throw pluginlib::InvalidXMLException(
              "XML Document '" + xml_file +
-@@ -683,31 +679,30 @@ void ClassLoader<T>::processSingleXMLPluginFile(
+@@ -683,31 +678,30 @@ void ClassLoader<T>::processSingleXMLPluginFile(
      config = config->FirstChildElement("library");
    }
 
@@ -605,7 +624,7 @@ index d45b591..8770318 100644
      while (class_element) {
        std::string derived_class;
        if (class_element->Attribute("type") != NULL) {
-@@ -728,21 +723,20 @@ void ClassLoader<T>::processSingleXMLPluginFile(
+@@ -728,21 +722,20 @@ void ClassLoader<T>::processSingleXMLPluginFile(
        std::string lookup_name;
        if (class_element->Attribute("name") != NULL) {
          lookup_name = class_element->Attribute("name");
@@ -634,7 +653,7 @@ index d45b591..8770318 100644
          std::string description_str;
          if (description) {
            description_str = description->GetText() ? description->GetText() : "";
-@@ -763,7 +757,7 @@ void ClassLoader<T>::processSingleXMLPluginFile(
+@@ -763,7 +756,7 @@ void ClassLoader<T>::processSingleXMLPluginFile(
  }
 
  template<class T>
@@ -643,7 +662,7 @@ index d45b591..8770318 100644
  /***************************************************************************/
  {
    ROS_DEBUG_NAMED("pluginlib.ClassLoader", "Refreshing declared classes.");
-@@ -786,7 +780,7 @@ void ClassLoader<T>::refreshDeclaredClasses()
+@@ -786,7 +779,7 @@ void ClassLoader<T>::refreshDeclaredClasses()
 
    // add new classes
    plugin_xml_paths_ = getPluginXmlPaths(package_, attrib_name_, true);
@@ -652,7 +671,7 @@ index d45b591..8770318 100644
    for (std::map<std::string, ClassDesc>::const_iterator it = updated_classes.begin();
      it != updated_classes.end(); it++)
    {
-@@ -797,11 +791,10 @@ void ClassLoader<T>::refreshDeclaredClasses()
+@@ -797,11 +790,10 @@ void ClassLoader<T>::refreshDeclaredClasses()
  }
 
  template<class T>
@@ -666,7 +685,7 @@ index d45b591..8770318 100644
    if (std::string::npos == c) {
      return path;
    } else {
-@@ -810,14 +803,14 @@ std::string ClassLoader<T>::stripAllButFileFromPath(const std::string & path)
+@@ -810,14 +802,14 @@ std::string ClassLoader<T>::stripAllButFileFromPath(const std::string & path)
  }
 
  template<class T>
@@ -685,7 +704,7 @@ index d45b591..8770318 100644
      return unloadClassLibraryInternal(library_path);
    } else {
      throw pluginlib::LibraryUnloadException(getErrorStringForUnknownClass(lookup_name));
-@@ -825,7 +818,7 @@ int ClassLoader<T>::unloadLibraryForClass(const std::string & lookup_name)
+@@ -825,7 +817,7 @@ int ClassLoader<T>::unloadLibraryForClass(const std::string & lookup_name)
  }
 
  template<class T>

diff --git a/ros/noetic.v3.17/ros-noetic-rviz/APKBUILD b/ros/noetic.v3.17/ros-noetic-rviz/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=ros-noetic-rviz
 _pkgname=rviz
-pkgver=1.14.20
+pkgver=1.14.22
 pkgrel=0
 pkgdesc="$_pkgname package for ROS noetic"
 url="http://wiki.ros.org/rviz"
@@ -29,7 +29,7 @@ export ROS_PYTHON_VERSION=3
 rosinstall="- git:
     local-name: rviz
     uri: https://github.com/ros-gbp/rviz-release.git
-    version: release/noetic/rviz/1.14.20-1
+    version: release/noetic/rviz/1.14.22-1
 "
 
 prepare() {

diff --git a/ros/noetic.v3.17/ros-noetic-urg-stamped/APKBUILD b/ros/noetic.v3.17/ros-noetic-urg-stamped/APKBUILD
@@ -1,14 +1,14 @@
 pkgname=ros-noetic-urg-stamped
 _pkgname=urg_stamped
-pkgver=0.1.0
+pkgver=0.1.1
 pkgrel=0
 pkgdesc="$_pkgname package for ROS noetic"
 url="http://wiki.ros.org/$_pkgname"
 arch="all"
 license="Apache 2.0"
 
-depends="ros-noetic-roscpp ros-noetic-sensor-msgs ros-noetic-roscpp ros-noetic-sensor-msgs"
-makedepends="py3-setuptools py3-rosdep py3-rosinstall py3-rosinstall-generator py3-vcstool chrpath ros-noetic-catkin ros-noetic-roscpp ros-noetic-roslint ros-noetic-rostest ros-noetic-rosunit ros-noetic-sensor-msgs"
+depends="ros-noetic-message-runtime ros-noetic-roscpp ros-noetic-sensor-msgs ros-noetic-std-msgs ros-noetic-message-runtime ros-noetic-roscpp ros-noetic-sensor-msgs ros-noetic-std-msgs"
+makedepends="py3-setuptools py3-rosdep py3-rosinstall py3-rosinstall-generator py3-vcstool chrpath ros-noetic-catkin ros-noetic-message-generation ros-noetic-roscpp ros-noetic-roslint ros-noetic-rostest ros-noetic-rosunit ros-noetic-sensor-msgs ros-noetic-std-msgs"
 
 subpackages="$pkgname-dbg $pkgname-doc"
 
@@ -29,7 +29,7 @@ export ROS_PYTHON_VERSION=3
 rosinstall="- git:
     local-name: urg_stamped
     uri: https://github.com/seqsense/urg_stamped-release.git
-    version: release/noetic/urg_stamped/0.1.0-1
+    version: release/noetic/urg_stamped/0.1.1-1
 "
 
 prepare() {

diff --git a/ros/noetic.v3.17/ros-noetic-ypspur-ros/APKBUILD b/ros/noetic.v3.17/ros-noetic-ypspur-ros/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=ros-noetic-ypspur-ros
 _pkgname=ypspur_ros
-pkgver=0.5.0
+pkgver=0.6.0
 pkgrel=0
 pkgdesc="$_pkgname package for ROS noetic"
 url="http://wiki.ros.org/$_pkgname"
@@ -29,7 +29,7 @@ export ROS_PYTHON_VERSION=3
 rosinstall="- git:
     local-name: ypspur_ros
     uri: https://github.com/openspur/ypspur_ros-release.git
-    version: release/noetic/ypspur_ros/0.5.0-1
+    version: release/noetic/ypspur_ros/0.6.0-1
 "
 
 prepare() {

diff --git a/ros/noetic.v3.17/ros-noetic-ypspur/APKBUILD b/ros/noetic.v3.17/ros-noetic-ypspur/APKBUILD
@@ -1,6 +1,6 @@
 pkgname=ros-noetic-ypspur
 _pkgname=ypspur
-pkgver=1.22.0
+pkgver=1.22.5
 pkgrel=0
 pkgdesc="$_pkgname package for ROS noetic"
 url="http://wiki.ros.org/$_pkgname"
@@ -29,7 +29,7 @@ export ROS_PYTHON_VERSION=3
 rosinstall="- git:
     local-name: ypspur
     uri: https://github.com/openspur/yp-spur-release.git
-    version: release/noetic/ypspur/1.22.0-1
+    version: release/noetic/ypspur/1.22.5-1
 "
 
 prepare() {