From 989d336c13d213008ed50752cd97f0d547b40380 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 20 Nov 2023 14:56:38 +0100 Subject: [PATCH 1/2] Migrate from jpeg to libjpeg-turbo --- .github/workflows/ci.yml | 2 +- doc/conda-forge.md | 4 ++-- doc/unsupported-homebrew-installation.md | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ce0833518..dfda932cb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -75,7 +75,7 @@ jobs: shell: bash -l {0} run: | # Dependencies - mamba install ace asio assimp boost eigen freetype gazebo glew glfw glm graphviz gsl ipopt irrlicht jpeg libmatio libode libxml2 nlohmann_json pcl vtk opencv portaudio qt-main sdl sdl2 sqlite tinyxml spdlog lua soxr cmake compilers make ninja pkg-config tomlplusplus libzlib ffmpeg + mamba install ace asio assimp boost eigen freetype gazebo glew glfw glm graphviz gsl ipopt irrlicht libjpeg-turbo libmatio libode libxml2 nlohmann_json pcl vtk opencv portaudio qt-main sdl sdl2 sqlite tinyxml spdlog lua soxr cmake compilers make ninja pkg-config tomlplusplus libzlib ffmpeg # Python mamba install python numpy swig pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython gst-plugins-good gst-plugins-bad diff --git a/doc/conda-forge.md b/doc/conda-forge.md index 1064dbc3b..beaf16604 100644 --- a/doc/conda-forge.md +++ b/doc/conda-forge.md @@ -113,12 +113,12 @@ Once you activated it, you can install packages in it. In particular the depende If you are on **Linux**, **Windows**, or **macOS** with an Intel-based processor (and not a *recent* (as per 2022/2023) ARM-based processor) ~~~ -mamba install -c conda-forge ace asio assimp boost eigen freetype gazebo glew glfw glm graphviz gsl ipopt irrlicht jpeg libmatio libode libxml2 nlohmann_json pcl opencv portaudio qt-main sdl sdl2 sqlite tinyxml tinyxml2 spdlog lua soxr qhull cmake compilers make ninja pkg-config tomlplusplus libzlib ffmpeg +mamba install -c conda-forge ace asio assimp boost eigen freetype gazebo glew glfw glm graphviz gsl ipopt irrlicht libjpeg-turbo libmatio libode libxml2 nlohmann_json pcl opencv portaudio qt-main sdl sdl2 sqlite tinyxml tinyxml2 spdlog lua soxr qhull cmake compilers make ninja pkg-config tomlplusplus libzlib ffmpeg ~~~ If you are on **macOS** with a *recent* (as per 2022/2023) ARM-based processor ~~~ -mamba install -c conda-forge asio assimp boost eigen freetype gazebo glew glfw glm graphviz gsl ipopt irrlicht jpeg libmatio libode libxml2 nlohmann_json pcl opencv portaudio qt-main sdl sdl2 sqlite tinyxml tinyxml2 spdlog lua soxr qhull cmake compilers make ninja pkg-config tomlplusplus libzlib ffmpeg +mamba install -c conda-forge asio assimp boost eigen freetype gazebo glew glfw glm graphviz gsl ipopt irrlicht libjpeg-turbo libmatio libode libxml2 nlohmann_json pcl opencv portaudio qt-main sdl sdl2 sqlite tinyxml tinyxml2 spdlog lua soxr qhull cmake compilers make ninja pkg-config tomlplusplus libzlib ffmpeg ~~~ If you are on **Linux**, you also need to install also the following packages: diff --git a/doc/unsupported-homebrew-installation.md b/doc/unsupported-homebrew-installation.md index efa1c80eb..0d3f29aeb 100644 --- a/doc/unsupported-homebrew-installation.md +++ b/doc/unsupported-homebrew-installation.md @@ -8,7 +8,7 @@ Unsupported Homebrew Installation ### System Dependencies To install the system dependencies, it is possible to use [Homebrew](http://brew.sh/): ``` -brew install ace assimp bash-completion boost cmake eigen graphviz gsl ipopt jpeg libedit nlohmann-json opencv pkg-config portaudio qt@5 sqlite swig tinyxml tinyxml2 libmatio irrlicht spdlog qhull zlib ffmpeg +brew install ace assimp bash-completion boost cmake eigen graphviz gsl ipopt jpeg-turbo libedit nlohmann-json opencv pkg-config portaudio qt@5 sqlite swig tinyxml tinyxml2 libmatio irrlicht spdlog qhull zlib ffmpeg ``` Since Qt5 is not symlinked in `/usr/local` by default in the homebrew formula, `Qt5_DIR` needs to be properly set to make sure that CMake-based projects are able to find Qt5. From d598e6a299c0b99bf4d2d7f17e5caf00f2f9e66a Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Mon, 20 Nov 2023 16:20:24 +0100 Subject: [PATCH 2/2] Disable ROBOTOLOGY_USES_IGNITION option in CI --- .github/workflows/ci.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dfda932cb..f70948afb 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -87,8 +87,6 @@ jobs: # Additional dependencies only useful on Linux # See https://github.com/robotology/robotology-superbuild/issues/477 mamba install bash-completion expat-cos7-x86_64 freeglut libdc1394 libi2c libselinux-cos7-x86_64 libxau-cos7-x86_64 libxcb-cos7-x86_64 libxdamage-cos7-x86_64 libxext-cos7-x86_64 libxfixes-cos7-x86_64 libxxf86vm-cos7-x86_64 mesa-libgl-cos7-x86_64 mesa-libgl-devel-cos7-x86_64 libxshmfence-cos7-x86_64 libxshmfence-devel-cos7-x86_64 - # Ignition Gazebo - mamba install libignition-gazebo6 # Additional dependencies useful only on Windows - name: Dependencies [Conda/Windows] @@ -139,11 +137,6 @@ jobs: cd build cmake -DROBOTOLOGY_USES_MUJOCO:BOOL=OFF . - - name: Configure Extra [Conda/Linux] - if: contains(matrix.os, 'ubuntu') - shell: bash -l {0} - run: cmake -S . -B build/ -DROBOTOLOGY_USES_IGNITION:BOOL=ON - # For some reason, the Strawberry perl's pkg-config is found # instead of the conda's one, so let's delete the /c/Strawberry directory - name: Debug pkg-config problem