Skip to content

Commit d8c4fcf

Browse files
authored
Merge pull request #38 from wep21/rebuild-202503
Full Rebuild March 2025: bump ros2-distro-mutex to 0.8.0, build_number to 5 and switch Python to 3.12
2 parents cdaf06a + c93bae9 commit d8c4fcf

31 files changed

+2597
-3017
lines changed

additional_recipes/ros-jazzy-urdfdom-headers/recipe.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ build:
88
requirements:
99
run:
1010
- urdfdom_headers ==1.1.2
11-
- python 3.11.* *_cpython
11+
- python 3.12.* *_cpython
1212

1313
about:
1414
homepage: https://github.com/conda-forge/urdfdom_headers-feedstock

additional_recipes/ros-jazzy-urdfdom-py/recipe.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ build:
88
requirements:
99
run:
1010
- urdfdom-py 1.2.1.*
11-
- python 3.11.* *_cpython
11+
- python 3.12.* *_cpython
1212

1313
about:
1414
homepage: https://github.com/ros/urdf_parser_py
@@ -17,4 +17,4 @@ about:
1717
Standalone URDF parser for Python.
1818
extra:
1919
recipe-maintainers:
20-
- ros-forge
20+
- ros-forge

additional_recipes/ros-jazzy-urdfdom/recipe.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ build:
88
requirements:
99
run:
1010
- urdfdom ==4.0.1
11-
- python 3.11.* *_cpython
11+
- python 3.12.* *_cpython
1212

1313
about:
1414
homepage: https://github.com/conda-forge/urdfdom-feedstock

additional_recipes/ros2-distro-mutex/recipe.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package:
22
name: ros2-distro-mutex
3-
version: 0.7.0
3+
version: 0.8.0
44

55
build:
66
number: 0
@@ -32,7 +32,8 @@ requirements:
3232
- libboost-devel 1.86.*
3333
- pcl 1.14.1.*
3434
- gazebo 11.*
35-
- libprotobuf 5.28.3.*
35+
- libprotobuf 5.29.3.*
36+
- libxml2 2.13.*
3637

3738
run_exports:
3839
weak:

conda_build_config.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
numpy:
22
- 1.26
33
libprotobuf:
4-
- 5.28.3
4+
- 5.29.3
55
protobuf:
6-
- 5.28.3
6+
- 5.29.3
77
spdlog:
88
- 1.15
99
pugixml:
1010
- '1.15'
1111
libopencv:
1212
- 4.11.0
13+
libxml2:
14+
- 2.13.*
1315

1416
# Workaround for https://github.com/RoboStack/ros-jazzy/pull/40#issuecomment-2782226697
1517
cmake:
@@ -19,7 +21,7 @@ cdt_name: # [linux]
1921
- conda # [linux]
2022

2123
python:
22-
- 3.11.* *_cpython
24+
- 3.12.* *_cpython
2325
python_impl:
2426
- cpython
2527

patch/ros-jazzy-apriltag.patch

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2+
index 9b2935a..8a8f9ea 100644
3+
--- a/CMakeLists.txt
4+
+++ b/CMakeLists.txt
5+
@@ -47,7 +47,6 @@ endif()
6+
7+
if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
8+
add_compile_options(-Wall -Wextra -Werror)
9+
- add_compile_options(-Wpedantic)
10+
if(CMAKE_C_COMPILER_ID MATCHES "Clang")
11+
add_compile_options(
12+
-Wno-gnu-zero-variadic-macro-arguments

patch/ros-jazzy-ffmpeg-encoder-decoder.unix.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ index 0a12d25..9737ffe 100644
3737
callback_(image, decodedFrame_->key_frame); // deliver callback
3838
#endif
3939
diff --git a/src/encoder.cpp b/src/encoder.cpp
40-
index a4b6de6..8a3f40a 100644
40+
index d5c15ca..1086f35 100644
4141
--- a/src/encoder.cpp
4242
+++ b/src/encoder.cpp
4343
@@ -54,7 +54,11 @@ static void free_frame(AVFrame ** frame)
@@ -52,10 +52,10 @@ index a4b6de6..8a3f40a 100644
5252
codecContext_ = nullptr;
5353
}
5454
free_frame(&frame_);
55-
@@ -207,11 +211,19 @@ void Encoder::doOpenCodec(int width, int height)
56-
setAVOption("preset", preset_);
55+
@@ -208,11 +212,19 @@ void Encoder::doOpenCodec(int width, int height)
5756
setAVOption("tune", tune_);
5857
setAVOption("delay", delay_);
58+
setAVOption("crf", crf_);
5959
+#ifdef __APPLE__
6060
+ RCLCPP_DEBUG(
6161
+ logger_,
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index b084b2c..b2fc80d 100644
2+
index a4df838..24be0df 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
55
@@ -4,8 +4,8 @@ project(gz_fuel_tools_vendor)
66

77
# Project-specific settings
88
set(LIB_VER_MAJOR 9)
99
-set(LIB_VER_MINOR 1)
10-
-set(LIB_VER_PATCH 0)
10+
-set(LIB_VER_PATCH 1)
1111
+set(LIB_VER_MINOR 0)
1212
+set(LIB_VER_PATCH 3)
13+
set(LIB_VER_SUFFIX "")
1314

1415
# Derived variables
15-
set(LIB_NAME gz-fuel_tools)

patch/ros-jazzy-gz-gui-vendor.patch

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
diff --git a/CMakeLists.txt b/CMakeLists.txt
2-
index a58d9a4..e6ea27e 100644
2+
index 94fd645..2a52f2c 100644
33
--- a/CMakeLists.txt
44
+++ b/CMakeLists.txt
55
@@ -4,8 +4,8 @@ project(gz_gui_vendor)
66

77
# Project-specific settings
88
set(LIB_VER_MAJOR 8)
9-
-set(LIB_VER_MINOR 3)
9+
-set(LIB_VER_MINOR 4)
1010
-set(LIB_VER_PATCH 0)
1111
+set(LIB_VER_MINOR 1)
1212
+set(LIB_VER_PATCH 1)
13+
set(LIB_VER_SUFFIX "")
1314

1415
# Derived variables
15-
set(LIB_NAME gz-gui)

patch/ros-jazzy-image-proc.patch

Lines changed: 0 additions & 37 deletions
This file was deleted.

patch/ros-jazzy-kinematics-interface-kdl.win.patch

Lines changed: 0 additions & 15 deletions
This file was deleted.

patch/ros-jazzy-kinematics-interface.win.patch

Lines changed: 0 additions & 15 deletions
This file was deleted.

patch/ros-jazzy-moveit-setup-assistant.patch

Lines changed: 0 additions & 35 deletions
This file was deleted.

patch/ros-jazzy-moveit-setup-core-plugins.patch

Lines changed: 0 additions & 88 deletions
This file was deleted.

0 commit comments

Comments
 (0)