Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rebuild for libopencv 4.10.0 and pcl 1.14.1 #69

Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .ci_support/linux_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ c_compiler_version:
c_stdlib:
- sysroot
c_stdlib_version:
- '2.12'
- '2.17'
cdt_name:
- cos6
- cos7
channel_sources:
- conda-forge
channel_targets:
Expand All @@ -27,7 +27,7 @@ libboost_devel:
libmatio_cpp:
- 0.2.5
libopencv:
- 4.9.0
- 4.10.0
libosqp:
- 0.6.3
libyarp:
Expand All @@ -46,6 +46,8 @@ python:
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
qhull:
- '2020.2'
spdlog:
- '1.13'
target_platform:
Expand Down
4 changes: 3 additions & 1 deletion .ci_support/linux_aarch64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ libboost_devel:
libmatio_cpp:
- 0.2.5
libopencv:
- 4.9.0
- 4.10.0
libosqp:
- 0.6.3
libyarp:
Expand All @@ -50,6 +50,8 @@ python:
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
qhull:
- '2020.2'
spdlog:
- '1.13'
target_platform:
Expand Down
10 changes: 0 additions & 10 deletions .ci_support/migrations/boost1840.yaml

This file was deleted.

8 changes: 0 additions & 8 deletions .ci_support/migrations/libmatio_cpp025.yaml

This file was deleted.

8 changes: 8 additions & 0 deletions .ci_support/migrations/pcl1141.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
__migrator:
build_number: 1
commit_message: Rebuild for pcl 1.14.1
kind: version
migration_number: 1
migrator_ts: 1716101838.8134322
pcl:
- 1.14.1
4 changes: 3 additions & 1 deletion .ci_support/osx_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ libboost_devel:
libmatio_cpp:
- 0.2.5
libopencv:
- 4.9.0
- 4.10.0
libosqp:
- 0.6.3
libyarp:
Expand All @@ -48,6 +48,8 @@ python:
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
qhull:
- '2020.2'
spdlog:
- '1.13'
target_platform:
Expand Down
4 changes: 3 additions & 1 deletion .ci_support/osx_arm64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ libboost_devel:
libmatio_cpp:
- 0.2.5
libopencv:
- 4.9.0
- 4.10.0
libosqp:
- 0.6.3
libyarp:
Expand All @@ -48,6 +48,8 @@ python:
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
qhull:
- '2020.2'
spdlog:
- '1.13'
target_platform:
Expand Down
4 changes: 3 additions & 1 deletion .ci_support/win_64_.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ libboost_devel:
libmatio_cpp:
- 0.2.5
libopencv:
- 4.9.0
- 4.10.0
libosqp:
- 0.6.3
libyarp:
Expand All @@ -36,6 +36,8 @@ python:
- 3.12.* *_cpython
- 3.8.* *_cpython
- 3.9.* *_cpython
qhull:
- '2020.2'
spdlog:
- '1.13'
target_platform:
Expand Down
7 changes: 7 additions & 0 deletions .scripts/build_steps.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .scripts/run_osx_build.sh

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions .scripts/run_win_build.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 18 additions & 14 deletions recipe/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ source:
patches:

build:
number: 11
number: 12

outputs:
# {{ namecxx }}
Expand All @@ -30,15 +30,12 @@ outputs:
- {{ compiler('c') }}
- {{ stdlib("c") }}
- {{ compiler('cxx') }}
- cmake==3.29.0
- cmake
- pkg-config
- ninja
- {{ cdt('mesa-libgl-devel') }} # [linux]
- {{ cdt('mesa-dri-drivers') }} # [linux]
- {{ cdt('libselinux') }} # [linux]
- {{ cdt('libxdamage') }} # [linux]
- {{ cdt('libxxf86vm') }} # [linux]
- {{ cdt('libxext') }} # [linux]
# YARP idl tools are used in this recipe
- libyarp # [build_platform != target_platform]
host:
Expand All @@ -61,21 +58,28 @@ outputs:
- qhull
- libopencv
- pcl >1.12
- xorg-libxdamage # [linux]
- xorg-libxfixes # [linux]
- xorg-libxext # [linux]
- xorg-libxxf86vm # [linux]
- onnxruntime-cpp
# transitive public dependency of pcl
- vtk-base
- liblie-group-controllers
- libunicycle-footstep-planner
- librealsense # [not win]
- xorg-libxfixes # [linux]
# Workaround for https://github.com/conda-forge/pcl-feedstock/pull/68
- vtk * qt* # [not win]
run:
# manif and eigen are mentioned in the headers so needed when building
# against libbipedal-locomotion-framework
- manif
- eigen
- liblie-group-controllers
- tomlplusplus

# See https://github.com/conda-forge/bipedal-locomotion-framework-feedstock/pull/69#issuecomment-2199462702
- vtk * qt* # [not win]

test:
commands:
Expand All @@ -100,20 +104,15 @@ outputs:
- {{ compiler('c') }}
- {{ stdlib("c") }}
- {{ compiler('cxx') }}
- pybind11
- pybind11-abi
- ninja
- cmake==3.29.0
- cmake
- python # [build_platform != target_platform]
- cross-python_{{ target_platform }} # [build_platform != target_platform]
- pybind11 # [build_platform != target_platform]
- pybind11 <2.12.0 # [build_platform != target_platform]
- pybind11-abi # [build_platform != target_platform]
- {{ cdt('mesa-libgl-devel') }} # [linux]
- {{ cdt('mesa-dri-drivers') }} # [linux]
- {{ cdt('libselinux') }} # [linux]
- {{ cdt('libxdamage') }} # [linux]
- {{ cdt('libxxf86vm') }} # [linux]
- {{ cdt('libxext') }} # [linux]
host:
- {{ pin_subpackage(namecxx, exact=True) }}
- python
Expand All @@ -135,11 +134,16 @@ outputs:
- libboost-devel
- pugixml
- pcl >1.12
- xorg-libxdamage # [linux]
- xorg-libxfixes # [linux]
- xorg-libxext # [linux]
- xorg-libxxf86vm # [linux]
- icub-models # Requested just for tests
- scipy # Requested just for tests
- pytest # Requested just for tests
- manifpy # Requested just for tests
- manifpy # Requested just for tests
# Workaround for https://github.com/conda-forge/pcl-feedstock/pull/68
- vtk * qt* # [not win]
run:
- {{ pin_subpackage(namecxx, exact=True) }}
- python
Expand Down
Loading