Skip to content

Commit 95ef4ff

Browse files
authored
conda-forge: Migrate from jpeg to libjpeg-turbo (#1533)
1 parent d434627 commit 95ef4ff

File tree

3 files changed

+4
-11
lines changed

3 files changed

+4
-11
lines changed

.github/workflows/ci.yml

+1-8
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ jobs:
7575
shell: bash -l {0}
7676
run: |
7777
# Dependencies
78-
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
78+
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
7979
# Python
8080
mamba install python numpy swig pybind11 pyqt matplotlib h5py tornado u-msgpack-python pyzmq ipython gst-plugins-good gst-plugins-bad
8181
@@ -87,8 +87,6 @@ jobs:
8787
# Additional dependencies only useful on Linux
8888
# See https://github.com/robotology/robotology-superbuild/issues/477
8989
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
90-
# Ignition Gazebo
91-
mamba install libignition-gazebo6
9290
9391
# Additional dependencies useful only on Windows
9492
- name: Dependencies [Conda/Windows]
@@ -139,11 +137,6 @@ jobs:
139137
cd build
140138
cmake -DROBOTOLOGY_USES_MUJOCO:BOOL=OFF .
141139
142-
- name: Configure Extra [Conda/Linux]
143-
if: contains(matrix.os, 'ubuntu')
144-
shell: bash -l {0}
145-
run: cmake -S . -B build/ -DROBOTOLOGY_USES_IGNITION:BOOL=ON
146-
147140
# For some reason, the Strawberry perl's pkg-config is found
148141
# instead of the conda's one, so let's delete the /c/Strawberry directory
149142
- name: Debug pkg-config problem

doc/conda-forge.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -134,12 +134,12 @@ Once you activated it, you can install packages in it. In particular the depende
134134

135135
If you are on **Linux**, **Windows**, or **macOS** with an Intel-based processor:
136136
~~~
137-
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
137+
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
138138
~~~
139139

140140
If you are on **macOS** with ARM-based processor:
141141
~~~
142-
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
142+
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
143143
~~~
144144

145145
If you are on **Linux x86-64**, you also need to install also the following packages:

doc/unsupported-homebrew-installation.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Unsupported Homebrew Installation
88
### System Dependencies
99
To install the system dependencies, it is possible to use [Homebrew](http://brew.sh/):
1010
```
11-
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
11+
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
1212
```
1313

1414
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.

0 commit comments

Comments
 (0)