diff --git a/0-mcap-vendor-change-cmake-download.patch b/0-mcap-vendor-change-cmake-download.patch new file mode 100644 index 0000000000000000000000000000000000000000..34b8ef5c949a5b9bb8f59841f1bdfdd0d3a72611 --- /dev/null +++ b/0-mcap-vendor-change-cmake-download.patch @@ -0,0 +1,35 @@ +From 5577f7da5515fa347ee4ee894ea3c9f610d1e3f4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=E5=BC=A0=E5=A4=A9=E5=AE=87?= <1420098499@qq.com> +Date: Sat, 17 Jun 2023 17:41:36 +0800 +Subject: [PATCH] update + +--- + CMakeLists.txt | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6de89d2..44eaeb0 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -32,16 +32,12 @@ endif() + macro(build_mcap_vendor) + include(FetchContent) + fetchcontent_declare(mcap +- URL https://github.com/foxglove/mcap/archive/refs/tags/releases/cpp/v0.8.0.tar.gz ++ URL ${CMAKE_CURRENT_SOURCE_DIR}/v0.8.0.tar.gz + URL_HASH SHA1=b44637791da2c9c1cec61a3ba6994f1ef63a228c # v0.8.0 + ) + fetchcontent_makeavailable(mcap) + +- fetchcontent_declare(lz4 +- GIT_REPOSITORY https://github.com/lz4/lz4.git +- GIT_TAG d44371841a2f1728a3f36839fd4b7e872d0927d3 # v1.9.3 +- ) +- fetchcontent_makeavailable(lz4) ++ set(lz4_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lz4) + + file(GLOB _lz4_srcs + ${lz4_SOURCE_DIR}/lib/*.c) +-- +2.41.0 + diff --git a/lz4.tar.gz b/lz4.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..965f2f213b4f065d9e810b01b9f0cdbdbcc09c97 Binary files /dev/null and b/lz4.tar.gz differ diff --git a/mcap-vendor.spec b/mcap-vendor.spec index 396e76a509e8d2b2819cd844b23912d6b77c9730..f757b8018a4ee5d09c44f2f8e943cec4919fe57c 100644 --- a/mcap-vendor.spec +++ b/mcap-vendor.spec @@ -14,6 +14,10 @@ Summary: mcap vendor package License: Apache License 2.0 Source0: %{name}_%{version}.orig.tar.gz +Source1: v0.8.0.tar.gz +Source2: lz4.tar.gz + +Patch0: 0-mcap-vendor-change-cmake-download.patch Requires: ros-%{ros_distro}-zstd-vendor Requires: ros-%{ros_distro}-ros-workspace @@ -35,6 +39,9 @@ mcap vendor package %prep %autosetup -p1 +cp %{SOURCE1} . +cp %{SOURCE2} . +tar -xf %{SOURCE2} %build # Needed to bootstrap since the ros_workspace package does not yet exist. diff --git a/v0.8.0.tar.gz b/v0.8.0.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..b00a4b44591ddd38319aa22087f05150e5698a79 Binary files /dev/null and b/v0.8.0.tar.gz differ