Add new conda env: legacy_ogre23 #1232
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com>
Signed-off-by: Jose Luis Rivero <jrivero@honurobotics.com>
traversaro
reviewed
Jan 10, 2025
Comment on lines
+45
to
+48
| libglvnd-devel-cos7-x86_64 = "*" | ||
| libwebsockets = "*" | ||
| mesa-libegl-devel-cos7-x86_64 = "*" | ||
| mesa-libgl-devel-cos7-x86_64 = "*" |
There was a problem hiding this comment.
For what regards the libglvnd library, it is now packaged as proper conda-forge packages at https://github.com/conda-forge/libglvnd-feedstock with names:
libglvnd-devellibegl-devellibgl-devel
There was a problem hiding this comment.
Thanks Silvio ! This means that we can patch the file with:
diff --git a/conda/envs/legacy/pixi.toml b/conda/envs/legacy/pixi.toml
index 51d1b5f2..2ec42e62 100644
--- a/conda/envs/legacy/pixi.toml
+++ b/conda/envs/legacy/pixi.toml
@@ -41,18 +41,18 @@ dlfcn-win32 = "*"
vs2019_win-64 = "*"
[target.linux-64.dependencies]
+libegl-devel = "*"
+libgl-devel = "*"
libglu = "*"
-libglvnd-devel-cos7-x86_64 = "*"
+libglvnd-devel = "*"
libwebsockets = "*"
-mesa-libegl-devel-cos7-x86_64 = "*"
-mesa-libgl-devel-cos7-x86_64 = "*"
vulkan-headers = "*"
[target.linux-aarch64.dependencies]
+libegl-devel = "*"
+libgl-devel = "*"
libglu = "*"
-libglvnd-devel-cos7-aarch64 = "*"
-mesa-libegl-devel-cos7-aarch64 = "*"
-mesa-libgl-devel-cos7-aarch64 = "*"
+libglvnd-devel = "*"
[build-dependencies]
cmake = "3.28.3.*"or in a different way?
There was a problem hiding this comment.
I am not 100% sure, but I guess you can simplify and have a single [target.linux.dependencies] that applies to all linux platforms.
There was a problem hiding this comment.
I'll merge this PR as it is and create a new one with these changes.
Signed-off-by: Jose Luis Rivero <jrivero@osrfoundation.org>
|
In 82f7cae I minimized the changes from legacy to legacy_ogre23 in the lock file but copying the same lock file and useing `pixi add "ogre-next = 2.3.0" instead of rebuilding the whole lock with latest versions. Diff now: ❯ diff -u legacy legacy_ogre23/
diff -u legacy/pixi.toml legacy_ogre23/pixi.toml
--- legacy/pixi.toml 2025-01-07 20:15:26.837970543 +0100
+++ legacy_ogre23/pixi.toml 2025-01-13 17:33:34.998471189 +0100
@@ -24,7 +24,7 @@
libsqlite = "*"
libzip = "*"
ogre = "1.10.12.1.*"
-ogre-next = "2.2.*"
+ogre-next = "2.3.*"
openssl = "*"
protobuf = "3.14.0.*" # closest with py3.9 ABI to jammy 3.12
pybind11 = "*"
diff -u legacy/pixi.lock legacy_ogre23/pixi.lock
--- legacy/pixi.lock 2025-01-07 20:15:26.837970543 +0100
+++ legacy_ogre23/pixi.lock 2025-01-13 17:33:35.150479033 +0100
@@ -229,7 +229,7 @@
- conda: https://conda.anaconda.org/conda-forge/linux-64/ocl-icd-system-1.0.0-1.tar.bz2
- conda: https://conda.anaconda.org/conda-forge/linux-64/octomap-1.9.8-h924138e_0.tar.bz2
- conda: https://conda.anaconda.org/conda-forge/linux-64/ogre-1.10.12.1-hfa30d70_2.conda
- - conda: https://conda.anaconda.org/conda-forge/linux-64/ogre-next-2.2.6-hd9d6a18_0.tar.bz2
+ - conda: https://conda.anaconda.org/conda-forge/linux-64/ogre-next-2.3.3-h1b25c05_0.conda
- conda: https://conda.anaconda.org/conda-forge/linux-64/openexr-3.2.2-haf962dd_1.conda
- conda: https://conda.anaconda.org/conda-forge/linux-64/openh264-2.4.0-h59595ed_0.conda
- conda: https://conda.anaconda.org/conda-forge/linux-64/openjpeg-2.5.2-h488ebb8_0.conda
@@ -538,7 +538,7 @@
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/numpy-1.26.4-py39h91c28bb_0.conda
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/octomap-1.9.8-hdd96247_0.tar.bz2
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/ogre-1.10.12.1-h70aca81_1.conda
- - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/ogre-next-2.2.6-hbad1a05_0.tar.bz2
+ - conda: https://conda.anaconda.org/conda-forge/linux-aarch64/ogre-next-2.3.3-h736244c_0.conda
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/openexr-3.2.2-hdf561d4_1.conda
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/openh264-2.4.0-h2f0025b_0.conda
- conda: https://conda.anaconda.org/conda-forge/linux-aarch64/openjpeg-2.5.2-h0d9d63b_0.conda
@@ -766,7 +766,7 @@
- conda: https://conda.anaconda.org/conda-forge/win-64/numpy-1.26.4-py39hddb5d58_0.conda
- conda: https://conda.anaconda.org/conda-forge/win-64/octomap-1.9.8-h91493d7_0.tar.bz2
- conda: https://conda.anaconda.org/conda-forge/win-64/ogre-1.10.12.1-hc646683_1.conda
- - conda: https://conda.anaconda.org/conda-forge/win-64/ogre-next-2.2.6-h606bb5d_0.conda
+ - conda: https://conda.anaconda.org/conda-forge/win-64/ogre-next-2.3.3-h606bb5d_0.conda
- conda: https://conda.anaconda.org/conda-forge/win-64/openexr-3.2.2-h72640d8_1.conda
- conda: https://conda.anaconda.org/conda-forge/win-64/openh264-2.4.1-h63175ca_0.conda
- conda: https://conda.anaconda.org/conda-forge/win-64/openjpeg-2.5.2-h3d672ee_0.conda
@@ -9958,72 +9958,72 @@
timestamp: 1724400675957
- kind: conda
name: ogre-next
- version: 2.2.6
- build: h606bb5d_0
- subdir: win-64
- url: https://conda.anaconda.org/conda-forge/win-64/ogre-next-2.2.6-h606bb5d_0.conda
- sha256: 9ec450333b1e8e3d11c403ef191d70927ae61ea5c6eb2df6222b55c5c7227071
- md5: 21b64231660f1b63ea2c994ffac2c145
+ version: 2.3.3
+ build: h1b25c05_0
+ subdir: linux-64
+ url: https://conda.anaconda.org/conda-forge/linux-64/ogre-next-2.3.3-h1b25c05_0.conda
+ sha256: be4b06e743c77c6ddf8b5e72d50bc4bff86760f2f166c7798dc64c4aee3f5f12
+ md5: ecbc12b505bc11b52668cf75640fd0af
depends:
- freeimage >=3.18.0,<3.19.0a0
- freetype >=2.12.1,<3.0a0
+ - libgcc-ng >=12
+ - libstdcxx-ng >=12
- libzlib >=1.2.13,<2.0.0a0
- - ucrt >=10.0.20348.0
- - vc >=14.2,<15
- - vs2015_runtime >=14.29.30139
+ - xorg-libx11 >=1.8.9,<2.0a0
+ - xorg-libxaw
+ - xorg-libxfixes
+ - xorg-libxrandr
+ - xorg-libxt >=1.3.0,<2.0a0
- zziplib >=0.13.69,<0.14.0a0
license: MIT
license_family: MIT
- size: 3709854
- timestamp: 1669426908159
+ size: 4193167
+ timestamp: 1712610834597
- kind: conda
name: ogre-next
- version: 2.2.6
- build: hbad1a05_0
- subdir: linux-aarch64
- url: https://conda.anaconda.org/conda-forge/linux-aarch64/ogre-next-2.2.6-hbad1a05_0.tar.bz2
- sha256: 83ed84573ec5f456e32a4ed8b39e542e3b9afdbb9493cb7fab2a22a9393bd005
- md5: 4df76b1b25baf53809737a6bbe416fd4
+ version: 2.3.3
+ build: h606bb5d_0
+ subdir: win-64
+ url: https://conda.anaconda.org/conda-forge/win-64/ogre-next-2.3.3-h606bb5d_0.conda
+ sha256: 6e389230722183cada2541d37769530c9072dc996725abce39186ef7c424e80a
+ md5: 05d64d4762a6743952ed2d1f54a83212
depends:
- freeimage >=3.18.0,<3.19.0a0
- - freetype >=2.10.4,<3.0a0
- - libgcc-ng >=12
- - libstdcxx-ng >=12
- - libzlib >=1.2.12,<2.0.0a0
- - xorg-libx11
- - xorg-libxaw
- - xorg-libxfixes
- - xorg-libxrandr
- - xorg-libxt
+ - freetype >=2.12.1,<3.0a0
+ - libzlib >=1.2.13,<2.0.0a0
+ - ucrt >=10.0.20348.0
+ - vc >=14.2,<15
+ - vc14_runtime >=14.29.30139
- zziplib >=0.13.69,<0.14.0a0
license: MIT
license_family: MIT
- size: 4724971
- timestamp: 1656366355692
+ size: 4002319
+ timestamp: 1712612438810
- kind: conda
name: ogre-next
- version: 2.2.6
- build: hd9d6a18_0
- subdir: linux-64
- url: https://conda.anaconda.org/conda-forge/linux-64/ogre-next-2.2.6-hd9d6a18_0.tar.bz2
- sha256: ef56a822aeaa48e02e4e70646fe60ec2ff011f484036f40572863cbb644382b3
- md5: f02860b7038da013f98fdba176a8c7ba
+ version: 2.3.3
+ build: h736244c_0
+ subdir: linux-aarch64
+ url: https://conda.anaconda.org/conda-forge/linux-aarch64/ogre-next-2.3.3-h736244c_0.conda
+ sha256: e9cb6be74edb5551e5b91bdd3ef178185e1835feb5df4e48b63200acceecb557
+ md5: df239e5adb6eb8f682373cdf1020bbad
depends:
- freeimage >=3.18.0,<3.19.0a0
- - freetype >=2.10.4,<3.0a0
+ - freetype >=2.12.1,<3.0a0
- libgcc-ng >=12
- libstdcxx-ng >=12
- - libzlib >=1.2.12,<2.0.0a0
- - xorg-libx11
+ - libzlib >=1.2.13,<2.0.0a0
+ - xorg-libx11 >=1.8.9,<2.0a0
- xorg-libxaw
- xorg-libxfixes
- xorg-libxrandr
- - xorg-libxt
+ - xorg-libxt >=1.3.0,<2.0a0
- zziplib >=0.13.69,<0.14.0a0
license: MIT
license_family: MIT
- size: 4848656
- timestamp: 1656366205111
+ size: 4077677
+ timestamp: 1712611040895
- kind: conda
name: openexr
version: 3.2.2 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The PR adds a new conda environment that is a twin of the legacy environment but bumps the ogre-next package from 2.2.x to 2.3.x:
The Goal is to use it with Harmonic and Ionic. We can start using it for Jetty although at this point of the development cycle it should be open to have its own environment with up-to-date dependencies.