From bc4be249e2ed420080abcdb02d8681a35bd9ea84 Mon Sep 17 00:00:00 2001 From: flipflip Date: Tue, 25 Aug 2026 11:40:48 +0200 Subject: [PATCH 1/2] fix some typos in docu --- fpsdk_doc/fpsdk_build.hpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fpsdk_doc/fpsdk_build.hpp b/fpsdk_doc/fpsdk_build.hpp index 40cc9df..1dd647f 100644 --- a/fpsdk_doc/fpsdk_build.hpp +++ b/fpsdk_doc/fpsdk_build.hpp @@ -36,7 +36,7 @@ namespace fpsdk { The Fixposition SDK is made for **Linux**. To build it a **GCC** (C++-17) toolchain is required. You may have some luck using clang, but you're on your own there. Besides a glibc and standard Linux tools, such as CMake, make, bash, - xxd, sed, awk, etc. are required to build. This is tested and known to work with Ubuntu 20.04, 22.04, 24.04/ and + xxd, sed, awk, etc. are required to build. This is tested and known to work with Ubuntu 20.04, 22.04, 24.04 and 26.04, as well as Debian Trixie. For building the libraries and apps the following dependencies are used. Some are required and some are optional. @@ -65,12 +65,13 @@ namespace fpsdk { `-DFPSDK_USE_PROJ=ON` to required the use of the PROJ library. See also @ref FPSDK_BUILD_BUILD_MANUAL below. (2) The FFmpeg libraries must be configured with --disable-gpl and --disable-nonfree in order to comply - with the Fixposition SDK license. + with the Fixposition SDK license. The CMake tests for that and refuses to use non-free/gpl builds of the FFmpeg + libraries. (3) ROS support is optional, and it's either ROS1 *or* ROS2. To enable, build in a ROS environment using catkin resp. colcon and the availability of ROS is detected automatically. - (4) These are only needed for development. That is, they are not required for building the \@ref FPSDK_COMMON_DOC + (4) These are only needed for development. That is, they are not required for building the @ref FPSDK_COMMON_DOC and @ref FPSDK_APPS_DOC. See @ref FPSDK_BUILD_CIVERSIONS for the versions used in the CI builds. From ecb0b9cefa80722a98da3634a635fc5a55e6f423 Mon Sep 17 00:00:00 2001 From: flipflip Date: Tue, 25 Aug 2026 11:56:22 +0200 Subject: [PATCH 2/2] move yq to base images --- docker/Dockerfile.humble-base | 4 ++++ docker/Dockerfile.humble-dev | 4 ---- docker/Dockerfile.jazzy-base | 4 ++++ docker/Dockerfile.jazzy-dev | 4 ---- docker/Dockerfile.lyrical-base | 4 ++++ docker/Dockerfile.lyrical-dev | 4 ---- docker/Dockerfile.noetic-base | 4 ++++ docker/Dockerfile.noetic-dev | 4 ---- docker/Dockerfile.trixie-base | 4 ++++ docker/Dockerfile.trixie-dev | 4 ---- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docker/Dockerfile.humble-base b/docker/Dockerfile.humble-base index 6c03373..934833f 100644 --- a/docker/Dockerfile.humble-base +++ b/docker/Dockerfile.humble-base @@ -45,6 +45,10 @@ RUN /tmp/install_doxygen.sh && rm -f /tmp/install_doxygen.sh COPY docker/scripts/install_ffmpeg.sh /tmp RUN /tmp/install_ffmpeg.sh && rm -f /tmp/install_ffmpeg.sh +# Install yq +COPY docker/scripts/install_yq.sh /tmp +RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh + # Update ld cache for the installed libraries RUN /usr/sbin/ldconfig diff --git a/docker/Dockerfile.humble-dev b/docker/Dockerfile.humble-dev index 9ff8449..bbd1576 100644 --- a/docker/Dockerfile.humble-dev +++ b/docker/Dockerfile.humble-dev @@ -42,10 +42,6 @@ ENV LC_ALL=C.UTF-8 COPY docker/scripts/install_locales.sh /tmp RUN /tmp/install_locales.sh && rm -f /tmp/install_locales.sh -# Install yq -COPY docker/scripts/install_yq.sh /tmp -RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh - # Install mcap COPY docker/scripts/install_mcap.sh /tmp RUN /tmp/install_mcap.sh && rm -f /tmp/install_mcap.sh diff --git a/docker/Dockerfile.jazzy-base b/docker/Dockerfile.jazzy-base index bb7d6b2..f767e82 100644 --- a/docker/Dockerfile.jazzy-base +++ b/docker/Dockerfile.jazzy-base @@ -37,6 +37,10 @@ RUN /tmp/install_doxygen.sh && rm -f /tmp/install_doxygen.sh COPY docker/scripts/install_ffmpeg.sh /tmp RUN /tmp/install_ffmpeg.sh && rm -f /tmp/install_ffmpeg.sh +# Install yq +COPY docker/scripts/install_yq.sh /tmp +RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh + # Update ld cache for the installed libraries RUN /usr/sbin/ldconfig diff --git a/docker/Dockerfile.jazzy-dev b/docker/Dockerfile.jazzy-dev index 896e5b5..f207e2e 100644 --- a/docker/Dockerfile.jazzy-dev +++ b/docker/Dockerfile.jazzy-dev @@ -42,10 +42,6 @@ ENV LC_ALL=C.UTF-8 COPY docker/scripts/install_locales.sh /tmp RUN /tmp/install_locales.sh && rm -f /tmp/install_locales.sh -# Install yq -COPY docker/scripts/install_yq.sh /tmp -RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh - # Install mcap COPY docker/scripts/install_mcap.sh /tmp RUN /tmp/install_mcap.sh && rm -f /tmp/install_mcap.sh diff --git a/docker/Dockerfile.lyrical-base b/docker/Dockerfile.lyrical-base index 3587be6..c886c40 100644 --- a/docker/Dockerfile.lyrical-base +++ b/docker/Dockerfile.lyrical-base @@ -29,6 +29,10 @@ RUN /tmp/install_apt_base.sh && rm -f /tmp/install_apt_base.sh COPY docker/scripts/install_ffmpeg.sh /tmp RUN /tmp/install_ffmpeg.sh && rm -f /tmp/install_ffmpeg.sh +# Install yq +COPY docker/scripts/install_yq.sh /tmp +RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh + # Update ld cache for the installed libraries RUN /usr/sbin/ldconfig diff --git a/docker/Dockerfile.lyrical-dev b/docker/Dockerfile.lyrical-dev index 33edda3..877da6a 100644 --- a/docker/Dockerfile.lyrical-dev +++ b/docker/Dockerfile.lyrical-dev @@ -42,10 +42,6 @@ ENV LC_ALL=C.UTF-8 COPY docker/scripts/install_locales.sh /tmp RUN /tmp/install_locales.sh && rm -f /tmp/install_locales.sh -# Install yq -COPY docker/scripts/install_yq.sh /tmp -RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh - # Install mcap COPY docker/scripts/install_mcap.sh /tmp RUN /tmp/install_mcap.sh && rm -f /tmp/install_mcap.sh diff --git a/docker/Dockerfile.noetic-base b/docker/Dockerfile.noetic-base index ab4decb..4780379 100644 --- a/docker/Dockerfile.noetic-base +++ b/docker/Dockerfile.noetic-base @@ -50,6 +50,10 @@ RUN /tmp/install_nasm.sh && rm -f /tmp/install_nasm.sh COPY docker/scripts/install_ffmpeg.sh /tmp RUN /tmp/install_ffmpeg.sh && rm -f /tmp/install_ffmpeg.sh +# Install yq +COPY docker/scripts/install_yq.sh /tmp +RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh + # Download, build and install pre-commit COPY docker/scripts/install_precommit.sh /tmp RUN /tmp/install_precommit.sh && rm -f /tmp/install_precommit.sh diff --git a/docker/Dockerfile.noetic-dev b/docker/Dockerfile.noetic-dev index bcbb39d..d909bd5 100644 --- a/docker/Dockerfile.noetic-dev +++ b/docker/Dockerfile.noetic-dev @@ -40,10 +40,6 @@ ENV LC_ALL=C.UTF-8 COPY docker/scripts/install_locales.sh /tmp RUN /tmp/install_locales.sh && rm -f /tmp/install_locales.sh -# Install yq -COPY docker/scripts/install_yq.sh /tmp -RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh - # Install mcap COPY docker/scripts/install_mcap.sh /tmp RUN /tmp/install_mcap.sh && rm -f /tmp/install_mcap.sh diff --git a/docker/Dockerfile.trixie-base b/docker/Dockerfile.trixie-base index 94d7518..ac72fa5 100644 --- a/docker/Dockerfile.trixie-base +++ b/docker/Dockerfile.trixie-base @@ -30,6 +30,10 @@ RUN /tmp/install_doxygen.sh && rm -f /tmp/install_doxygen.sh COPY docker/scripts/install_ffmpeg.sh /tmp RUN /tmp/install_ffmpeg.sh && rm -f /tmp/install_ffmpeg.sh +# Install yq +COPY docker/scripts/install_yq.sh /tmp +RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh + # Update ld cache for the installed libraries RUN /usr/sbin/ldconfig diff --git a/docker/Dockerfile.trixie-dev b/docker/Dockerfile.trixie-dev index c813b6d..8412729 100644 --- a/docker/Dockerfile.trixie-dev +++ b/docker/Dockerfile.trixie-dev @@ -38,10 +38,6 @@ ENV LC_ALL=C.UTF-8 COPY docker/scripts/install_locales.sh /tmp RUN /tmp/install_locales.sh && rm -f /tmp/install_locales.sh -# Install yq -COPY docker/scripts/install_yq.sh /tmp -RUN /tmp/install_yq.sh && rm -f /tmp/install_yq.sh - # Install mcap COPY docker/scripts/install_mcap.sh /tmp RUN /tmp/install_mcap.sh && rm -f /tmp/install_mcap.sh