Skip to content

Full Rebuild March 2025: bump ros2-distro-mutex to 0.8.0, build_number to 5 and switch Python to 3.12 #38

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

Merged
merged 34 commits into from
Apr 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
cfc5f81
update snapshot
wep21 Mar 23, 2025
f6248f2
update ros2 distro mutex
wep21 Mar 23, 2025
17e9198
update vinca yaml
wep21 Mar 23, 2025
b850e3c
pin tinyxml2
wep21 Mar 23, 2025
a62163a
update gz fuel tools vendor patch
wep21 Mar 24, 2025
bf53da5
update gz gui vendor patch
wep21 Mar 24, 2025
c5455e4
update patch for apriltag
wep21 Mar 24, 2025
1f86b39
update patch for zenoh cpp vendor
wep21 Mar 24, 2025
c15e38c
remove patch for image proc
wep21 Mar 24, 2025
a221179
update patch for ur robot driver
wep21 Mar 24, 2025
2716543
update patch for moveit setup framework
wep21 Mar 24, 2025
89f4005
update ffmpeg encoder decoder patch
wep21 Mar 25, 2025
020e2b1
remove patch for moveit setup core plugins
wep21 Mar 25, 2025
a31d092
remove patch for ur client library
wep21 Mar 25, 2025
538b2c6
update patch for ur client library osx
wep21 Mar 25, 2025
d5f7c3f
remove patch for moveit setup assistant
wep21 Mar 26, 2025
4f0d750
add win patch for pal statistics
wep21 Mar 26, 2025
c9657d3
remove win patch for kinematics interface
wep21 Mar 26, 2025
e43bdec
remove win patch for kinematics-interface-kdl
wep21 Mar 27, 2025
8aba6c7
bump python version
wep21 Mar 29, 2025
b51b245
cmake version < 4.0
wep21 Mar 29, 2025
f2cd921
update conda build config for cmake
wep21 Mar 29, 2025
f56a391
update win patch for zstd image transport
wep21 Apr 2, 2025
7d477c6
remove win patch for zstd image transport
wep21 Apr 2, 2025
4ccd9b2
update snapshot
wep21 Apr 2, 2025
c010230
update win patch for zenoh cpp vensor
wep21 Apr 2, 2025
c9d4716
update protobuf
wep21 Apr 2, 2025
f835918
pin fmt version
wep21 Apr 2, 2025
7e99990
update conda build config
wep21 Apr 2, 2025
e1e5423
update snapshot
wep21 Apr 7, 2025
41fddb8
update pin
wep21 Apr 7, 2025
8c5cf12
remove rclpy osx patch
wep21 Apr 7, 2025
0f1235c
update comment
wep21 Apr 9, 2025
c93bae9
update conda build config
wep21 Apr 9, 2025
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
2 changes: 1 addition & 1 deletion additional_recipes/ros-jazzy-urdfdom-headers/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build:
requirements:
run:
- urdfdom_headers ==1.1.2
- python 3.11.* *_cpython
- python 3.12.* *_cpython

about:
homepage: https://github.com/conda-forge/urdfdom_headers-feedstock
Expand Down
4 changes: 2 additions & 2 deletions additional_recipes/ros-jazzy-urdfdom-py/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build:
requirements:
run:
- urdfdom-py 1.2.1.*
- python 3.11.* *_cpython
- python 3.12.* *_cpython

about:
homepage: https://github.com/ros/urdf_parser_py
Expand All @@ -17,4 +17,4 @@ about:
Standalone URDF parser for Python.
extra:
recipe-maintainers:
- ros-forge
- ros-forge
2 changes: 1 addition & 1 deletion additional_recipes/ros-jazzy-urdfdom/recipe.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ build:
requirements:
run:
- urdfdom ==4.0.1
- python 3.11.* *_cpython
- python 3.12.* *_cpython

about:
homepage: https://github.com/conda-forge/urdfdom-feedstock
Expand Down
5 changes: 3 additions & 2 deletions additional_recipes/ros2-distro-mutex/recipe.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package:
name: ros2-distro-mutex
version: 0.7.0
version: 0.8.0

build:
number: 0
Expand Down Expand Up @@ -32,7 +32,8 @@ requirements:
- libboost-devel 1.86.*
- pcl 1.14.1.*
- gazebo 11.*
- libprotobuf 5.28.3.*
- libprotobuf 5.29.3.*
- libxml2 2.13.*

run_exports:
weak:
Expand Down
8 changes: 5 additions & 3 deletions conda_build_config.yaml
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
numpy:
- 1.26
libprotobuf:
- 5.28.3
- 5.29.3
protobuf:
- 5.28.3
- 5.29.3
spdlog:
- 1.15
pugixml:
- '1.15'
libopencv:
- 4.11.0
libxml2:
- 2.13.*

cdt_name: # [linux]
- conda # [linux]

python:
- 3.11.* *_cpython
- 3.12.* *_cpython
python_impl:
- cpython

Expand Down
12 changes: 12 additions & 0 deletions patch/ros-jazzy-apriltag.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9b2935a..8a8f9ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,7 +47,6 @@ endif()

if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
add_compile_options(-Wall -Wextra -Werror)
- add_compile_options(-Wpedantic)
if(CMAKE_C_COMPILER_ID MATCHES "Clang")
add_compile_options(
-Wno-gnu-zero-variadic-macro-arguments
6 changes: 3 additions & 3 deletions patch/ros-jazzy-ffmpeg-encoder-decoder.unix.patch
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ index 0a12d25..9737ffe 100644
callback_(image, decodedFrame_->key_frame); // deliver callback
#endif
diff --git a/src/encoder.cpp b/src/encoder.cpp
index a4b6de6..8a3f40a 100644
index d5c15ca..1086f35 100644
--- a/src/encoder.cpp
+++ b/src/encoder.cpp
@@ -54,7 +54,11 @@ static void free_frame(AVFrame ** frame)
Expand All @@ -52,10 +52,10 @@ index a4b6de6..8a3f40a 100644
codecContext_ = nullptr;
}
free_frame(&frame_);
@@ -207,11 +211,19 @@ void Encoder::doOpenCodec(int width, int height)
setAVOption("preset", preset_);
@@ -208,11 +212,19 @@ void Encoder::doOpenCodec(int width, int height)
setAVOption("tune", tune_);
setAVOption("delay", delay_);
setAVOption("crf", crf_);
+#ifdef __APPLE__
+ RCLCPP_DEBUG(
+ logger_,
Expand Down
6 changes: 3 additions & 3 deletions patch/ros-jazzy-gz-fuel-tools-vendor.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b084b2c..b2fc80d 100644
index a4df838..24be0df 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,8 +4,8 @@ project(gz_fuel_tools_vendor)

# Project-specific settings
set(LIB_VER_MAJOR 9)
-set(LIB_VER_MINOR 1)
-set(LIB_VER_PATCH 0)
-set(LIB_VER_PATCH 1)
+set(LIB_VER_MINOR 0)
+set(LIB_VER_PATCH 3)
set(LIB_VER_SUFFIX "")

# Derived variables
set(LIB_NAME gz-fuel_tools)
6 changes: 3 additions & 3 deletions patch/ros-jazzy-gz-gui-vendor.patch
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a58d9a4..e6ea27e 100644
index 94fd645..2a52f2c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,8 +4,8 @@ project(gz_gui_vendor)

# Project-specific settings
set(LIB_VER_MAJOR 8)
-set(LIB_VER_MINOR 3)
-set(LIB_VER_MINOR 4)
-set(LIB_VER_PATCH 0)
+set(LIB_VER_MINOR 1)
+set(LIB_VER_PATCH 1)
set(LIB_VER_SUFFIX "")

# Derived variables
set(LIB_NAME gz-gui)
37 changes: 0 additions & 37 deletions patch/ros-jazzy-image-proc.patch

This file was deleted.

15 changes: 0 additions & 15 deletions patch/ros-jazzy-kinematics-interface-kdl.win.patch

This file was deleted.

15 changes: 0 additions & 15 deletions patch/ros-jazzy-kinematics-interface.win.patch

This file was deleted.

35 changes: 0 additions & 35 deletions patch/ros-jazzy-moveit-setup-assistant.patch

This file was deleted.

88 changes: 0 additions & 88 deletions patch/ros-jazzy-moveit-setup-core-plugins.patch

This file was deleted.

Loading
Loading