From d624f8f4aa96e49d67f74d1d97245cb80998c22f Mon Sep 17 00:00:00 2001 From: Sjoerd van den Dries Date: Wed, 24 Nov 2021 16:11:46 +0100 Subject: [PATCH] Also builds realsense-viewer --- recipe/build.sh | 4 +++- recipe/meta.yaml | 16 ++++++++++++++++ recipe/patches/0001_no_rosbag_inspector.patch | 13 +++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 recipe/patches/0001_no_rosbag_inspector.patch diff --git a/recipe/build.sh b/recipe/build.sh index 85c4075..98da87a 100644 --- a/recipe/build.sh +++ b/recipe/build.sh @@ -11,8 +11,10 @@ cmake -GNinja \ -DENABLE_CCACHE=OFF \ -DBUILD_WITH_OPENMP=OFF \ -DFORCE_RSUSB_BACKEND=ON \ - -DBUILD_EXAMPLES=OFF \ + -DBUILD_EXAMPLES=ON \ + -DBUILD_GRAPHICAL_EXAMPLES=ON \ -DBUILD_UNIT_TESTS=OFF \ + -DCHECK_FOR_UPDATES=OFF \ $SRC_DIR cmake --build . --config Release diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2b67909..8300083 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -8,6 +8,8 @@ package: source: - url: https://github.com/IntelRealSense/librealsense/archive/v{{ version }}.tar.gz sha256: 2578ea0e75546aeebd908da732f52e0122bf37750d5a45f3adf92945a673aefd + patches: + - patches/0001_no_rosbag_inspector.patch build: number: 0 @@ -23,8 +25,22 @@ requirements: - cmake - ninja - {{ cdt('libudev') }} # [linux] + + - {{ cdt('mesa-libgl-devel') }} # [linux] + - {{ cdt('mesa-dri-drivers') }} # [linux] + - {{ cdt('libselinux') }} # [linux] + - {{ cdt('libxdamage') }} # [linux] + - {{ cdt('libxxf86vm') }} # [linux] + - {{ cdt('libxext') }} # [linux] + - {{ cdt('expat-devel') }} # [linux] host: - libusb + - glfw + - xorg-libxfixes # [linux] + - libglu + run: + - glfw + - libglu test: diff --git a/recipe/patches/0001_no_rosbag_inspector.patch b/recipe/patches/0001_no_rosbag_inspector.patch new file mode 100644 index 0000000..d86f0dd --- /dev/null +++ b/recipe/patches/0001_no_rosbag_inspector.patch @@ -0,0 +1,13 @@ +diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt +index b1b967af2..31a1ae0b8 100644 +--- a/tools/CMakeLists.txt ++++ b/tools/CMakeLists.txt +@@ -37,7 +37,7 @@ if(BUILD_EXAMPLES) + add_subdirectory(data-collect) + add_subdirectory(realsense-viewer) + add_subdirectory(depth-quality) +- add_subdirectory(rosbag-inspector) ++ #add_subdirectory(rosbag-inspector) + add_subdirectory(benchmark) + else() + if(ANDROID_NDK_TOOLCHAIN_INCLUDED)