summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoprDistGit <infra@openeuler.org>2026-10-22 04:12:13 +0000
committerCoprDistGit <infra@openeuler.org>2026-10-22 04:12:13 +0000
commit097e2d83635bb831ea131aea7cce10f712db2e8b (patch)
treed2957104104c94ad13e4927c835f3fed3abe80d7
parent51dd7c52e0b5ce53ef3ed492f56bc902ce48a012 (diff)
automatic import of ros-humble-openeb-vendor
-rw-r--r--.gitignore1
-rw-r--r--0-openeb-vendor-avoid-vcstool.patch55
-rw-r--r--openeb-vendor.spec12
-rw-r--r--sources1
4 files changed, 66 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index e884339..4676982 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/openeb-vendor-2.0.3-1.tar.gz
+/openeb-5.2.0-gcc-15.2-ros2.tar.gz
diff --git a/0-openeb-vendor-avoid-vcstool.patch b/0-openeb-vendor-avoid-vcstool.patch
new file mode 100644
index 0000000..5ff53dc
--- /dev/null
+++ b/0-openeb-vendor-avoid-vcstool.patch
@@ -0,0 +1,55 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -18,11 +18,7 @@
+ project(openeb_vendor CXX)
+
+ find_package(ament_cmake REQUIRED)
+-find_package(ament_cmake_vendor_package REQUIRED)
+-
+-if (ament_cmake_vendor_package_VERSION VERSION_GREATER_EQUAL 2.0.0)
+- ament_add_default_options()
+-endif()
++include(ExternalProject)
+
+ option(
+ BUILD_SHARED_LIBS
+@@ -31,18 +27,29 @@
+ unless the library was explicitly added as a static library."
+ ON)
+
+-ament_vendor(openeb_vendor
+- VCS_URL https://github.com/ros-event-camera/openeb.git
+- VCS_VERSION 5.2.0-gcc-15.2-ros2
+- GLOBAL_HOOK
+-# PATCHES patches
++set(_vendor_install_dir "${CMAKE_CURRENT_BINARY_DIR}/openeb_vendor-prefix/install")
++
++ExternalProject_Add(openeb_vendor_ext
++ URL ${CMAKE_CURRENT_SOURCE_DIR}/openeb-5.2.0-gcc-15.2-ros2.tar.gz
++ INSTALL_DIR ${_vendor_install_dir}
++ UPDATE_DISCONNECTED TRUE
+ CMAKE_ARGS
+- -DCOMPILE_PLAYER:BOOL=OFF
+- -DCOMPILE_PYTHON3_BINDINGS:BOOL=OFF
+- -DUDEV_RULES_SYSTEM_INSTALL:BOOL=OFF
+- -DHDF5_DISABLED=ON
++ -DCMAKE_STAGING_PREFIX=${_vendor_install_dir}
++ -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}/opt/${PROJECT_NAME}
++ -Wno-dev
++ -DCOMPILE_PLAYER:BOOL=OFF
++ -DCOMPILE_PYTHON3_BINDINGS:BOOL=OFF
++ -DUDEV_RULES_SYSTEM_INSTALL:BOOL=OFF
++ -DHDF5_DISABLED=ON
++ -DBUILD_TESTING=OFF
++ -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
++)
++
++install(
++ DIRECTORY "${_vendor_install_dir}/"
++ DESTINATION "opt/${PROJECT_NAME}"
++ USE_SOURCE_PERMISSIONS
+ )
+-# PATCHES patches
+
+ ament_package(
+ CONFIG_EXTRAS "openeb_vendor-extras.cmake.in"
diff --git a/openeb-vendor.spec b/openeb-vendor.spec
index 400fc94..0b0d163 100644
--- a/openeb-vendor.spec
+++ b/openeb-vendor.spec
@@ -4,11 +4,13 @@
Name: ros-%{ros_distro}-%{RosPkgName}
Version: 2.0.3
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Wrapper around openeb
License: Apache License 2.0
URL: https://github.com/ros-event-camera/openeb_vendor/tree/release
Source0: %{RosPkgName}-%{src_version}.tar.gz
+Source1: openeb-5.2.0-gcc-15.2-ros2.tar.gz
+Patch0: 0-openeb-vendor-avoid-vcstool.patch
%global debug_package %{nil}
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
@@ -16,7 +18,6 @@ Source0: %{RosPkgName}-%{src_version}.tar.gz
%global __requires_exclude_from ^/opt/ros/%{ros_distro}/.*$
BuildRequires: ros-%{ros_distro}-ament-cmake
-BuildRequires: ros-%{ros_distro}-ament-cmake-vendor-package
BuildRequires: boost-devel
BuildRequires: ffmpeg-devel
BuildRequires: glew-devel
@@ -51,7 +52,8 @@ Provides: %{name}-runtime = %{version}-%{release}
Wrapper around openeb
%prep
-%autosetup -n %{RosPkgName}-%{src_version}
+%autosetup -n %{RosPkgName}-%{src_version} -p1
+cp %{SOURCE1} .
%build
[ -f /opt/ros/%{ros_distro}/setup.sh ] && source /opt/ros/%{ros_distro}/setup.sh || true
@@ -79,5 +81,9 @@ make install DESTDIR=%{buildroot}
/opt/ros/%{ros_distro}
%changelog
+* Thu Oct 22 2026 ai-importer <ai-importer@openeuler.org> - 2.0.3-2
+- Remove ament_cmake_vendor_package dependency (python3-vcstool unavailable)
+- Replace ament_vendor() with ExternalProject_Add using local openeb tarball
+
* Thu Oct 22 2026 ai-importer <ai-importer@openeuler.org> - 2.0.3-1
- Initial import (ROS batch)
diff --git a/sources b/sources
index b0db08f..d21c142 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+74760cc1ce84e17c925c7f8bba802d15 openeb-5.2.0-gcc-15.2-ros2.tar.gz
527b1fb7959dbf8001d8d1059b5ead24 openeb-vendor-2.0.3-1.tar.gz