Global rebuild (#170)

* Preparation for global rebuild * Fixup win and osx patches * Cleanup and bump build num of Jackal pkgs * Sync robostack.yaml with Galactic * Bump distro mutex
RoboStack · Oct 13, 2021 · c93937a · c93937a
1 parent b09c692
commit c93937a
Show file tree

Hide file tree

Showing 32 changed files with 2,386 additions and 2,914 deletions.
diff --git a/.ci_support/conda_forge_pinnings.yaml b/.ci_support/conda_forge_pinnings.yaml
diff --git a/additional_recipes/ros-distro-mutex/recipe.yaml b/additional_recipes/ros-distro-mutex/recipe.yaml
@@ -1,13 +1,13 @@
 package:
   name: ros-distro-mutex
-  version: 0.1.1
+  version: 0.2.0
 
 build:
   number: 0
   string: noetic
   run_exports:
     # NOTE MANUALLY EDIT THIS!!!!
-    - ros-distro-mutex 0.1 noetic
+    - ros-distro-mutex 0.2 noetic
 
 requirements:
   # NOTE:
@@ -34,9 +34,10 @@ requirements:
     - log4cxx 0.11
     - pcl 1.11
     - libopencv 4.5.2
-    - poco 1.10
+    - poco 1.11
     - gazebo 11
     - ogre 1.10.12
+    - libpqxx 6
 
 about:
   home: https://github.com/robostack/ros-noetic

diff --git a/additional_recipes/ros-noetic-jackal-base/recipe.yaml b/additional_recipes/ros-noetic-jackal-base/recipe.yaml
@@ -12,7 +12,7 @@ extra:
   recipe-maintainers:
     - robostack
 build:
-  number: 0
+  number: 1
   script:
     sel(win): bld_catkin.bat
     sel(unix): build_catkin.sh
@@ -30,8 +30,6 @@ requirements:
     - sel(build_platform != target_platform): python
     - sel(build_platform != target_platform): cross-python_{{ target_platform }}
     - sel(build_platform != target_platform): cython
-    - sel(build_platform != target_platform): numpy
-    - sel(build_platform != target_platform): pybind11
   host:
     - python
     - ros-noetic-catkin
@@ -49,21 +47,12 @@ requirements:
     - ros-noetic-std-msgs
     - ros-noetic-teleop-twist-joy
     - ros-noetic-topic-tools
-    - ros-noetic-controller-manager
     - ros-noetic-diagnostic-aggregator
-    - ros-noetic-diagnostic-updater
     - ros-noetic-diff-drive-controller
-    - ros-noetic-geometry-msgs
     - ros-noetic-imu-filter-madgwick
-    - ros-noetic-nmea-msgs
     - ros-noetic-nmea-navsat-driver
-    - ros-noetic-realtime-tools
     - ros-noetic-rosserial-python
-    - ros-noetic-rosserial-server
-    - ros-noetic-sensor-msgs
-    - ros-noetic-teleop-twist-joy
     - ros-noetic-tf
-    - ros-noetic-topic-tools
     - ros-noetic-jackal-msgs
   run:
     - python
@@ -82,20 +71,5 @@ requirements:
     - ros-noetic-teleop-twist-joy
     - ros-noetic-tf
     - ros-noetic-topic-tools
-    - ros-noetic-controller-manager
-    - ros-noetic-diagnostic-aggregator
-    - ros-noetic-diagnostic-updater
-    - ros-noetic-diff-drive-controller
-    - ros-noetic-geometry-msgs
-    - ros-noetic-imu-filter-madgwick
-    - ros-noetic-nmea-msgs
-    - ros-noetic-nmea-navsat-driver
-    - ros-noetic-realtime-tools
-    - ros-noetic-rosserial-python
-    - ros-noetic-rosserial-server
-    - ros-noetic-sensor-msgs
-    - ros-noetic-teleop-twist-joy
-    - ros-noetic-tf
-    - ros-noetic-topic-tools
     - ros-noetic-jackal-msgs
     - sel(osx and x86_64): __osx >={{ MACOSX_DEPLOYMENT_TARGET|default('10.14') }}
diff --git a/additional_recipes/ros-noetic-jackal-control/recipe.yaml b/additional_recipes/ros-noetic-jackal-control/recipe.yaml
@@ -12,7 +12,7 @@ extra:
   recipe-maintainers:
     - robostack
 build:
-  number: 0
+  number: 1
   script:
     sel(win): bld_catkin.bat
     sel(unix): build_catkin.sh
@@ -30,8 +30,6 @@ requirements:
     - sel(build_platform != target_platform): python
     - sel(build_platform != target_platform): cross-python_{{ target_platform }}
     - sel(build_platform != target_platform): cython
-    - sel(build_platform != target_platform): numpy
-    - sel(build_platform != target_platform): pybind11
   host:
     - python
     - ros-noetic-catkin
@@ -56,13 +54,4 @@ requirements:
     - ros-noetic-teleop-twist-joy
     - ros-noetic-topic-tools
     - ros-noetic-twist-mux
-    - ros-noetic-controller-manager
-    - ros-noetic-interactive-marker-twist-server
-    - ros-noetic-diff-drive-controller
-    - ros-noetic-joint-state-controller
-    - ros-noetic-joy
-    - ros-noetic-robot-localization
-    - ros-noetic-teleop-twist-joy
-    - ros-noetic-topic-tools
-    - ros-noetic-twist-mux
     - sel(osx and x86_64): __osx >={{ MACOSX_DEPLOYMENT_TARGET|default('10.14') }}
diff --git a/additional_recipes/ros-noetic-jackal-description/recipe.yaml b/additional_recipes/ros-noetic-jackal-description/recipe.yaml
@@ -12,7 +12,7 @@ extra:
   recipe-maintainers:
     - robostack
 build:
-  number: 0
+  number: 1
   script:
     sel(win): bld_catkin.bat
     sel(unix): build_catkin.sh
@@ -30,8 +30,6 @@ requirements:
     - sel(build_platform != target_platform): python
     - sel(build_platform != target_platform): cross-python_{{ target_platform }}
     - sel(build_platform != target_platform): cython
-    - sel(build_platform != target_platform): numpy
-    - sel(build_platform != target_platform): pybind11
   host:
     - python
     - ros-noetic-catkin

diff --git a/additional_recipes/ros-noetic-jackal-desktop/recipe.yaml b/additional_recipes/ros-noetic-jackal-desktop/recipe.yaml
@@ -12,7 +12,7 @@ extra:
   recipe-maintainers:
     - robostack
 build:
-  number: 0
+  number: 1
   script:
     sel(win): bld_catkin.bat
     sel(unix): build_catkin.sh
@@ -30,14 +30,11 @@ requirements:
     - sel(build_platform != target_platform): python
     - sel(build_platform != target_platform): cross-python_{{ target_platform }}
     - sel(build_platform != target_platform): cython
-    - sel(build_platform != target_platform): numpy
-    - sel(build_platform != target_platform): pybind11
   host:
     - python
     - ros-noetic-catkin
     - ros-noetic-jackal-viz
   run:
     - python
     - ros-noetic-jackal-viz
-    - ros-noetic-jackal-viz
     - sel(osx and x86_64): __osx >={{ MACOSX_DEPLOYMENT_TARGET|default('10.14') }}
diff --git a/additional_recipes/ros-noetic-jackal-gazebo/recipe.yaml b/additional_recipes/ros-noetic-jackal-gazebo/recipe.yaml
@@ -12,7 +12,7 @@ extra:
   recipe-maintainers:
     - robostack
 build:
-  number: 0
+  number: 1
   script:
     sel(win): bld_catkin.bat
     sel(unix): build_catkin.sh
@@ -30,8 +30,6 @@ requirements:
     - sel(build_platform != target_platform): python
     - sel(build_platform != target_platform): cross-python_{{ target_platform }}
     - sel(build_platform != target_platform): cython
-    - sel(build_platform != target_platform): numpy
-    - sel(build_platform != target_platform): pybind11
   host:
     - python
     - ros-noetic-catkin
@@ -46,8 +44,4 @@ requirements:
     - ros-noetic-gazebo-ros-control
     - ros-noetic-gazebo-plugins
     - ros-noetic-hector-gazebo-plugins
-    - ros-noetic-gazebo-ros
-    - ros-noetic-gazebo-ros-control
-    - ros-noetic-gazebo-plugins
-    - ros-noetic-hector-gazebo-plugins
     - sel(osx and x86_64): __osx >={{ MACOSX_DEPLOYMENT_TARGET|default('10.14') }}
diff --git a/additional_recipes/ros-noetic-jackal-msgs/recipe.yaml b/additional_recipes/ros-noetic-jackal-msgs/recipe.yaml
@@ -12,7 +12,7 @@ extra:
   recipe-maintainers:
     - robostack
 build:
-  number: 0
+  number: 1
   script:
     sel(win): bld_catkin.bat
     sel(unix): build_catkin.sh
@@ -30,19 +30,14 @@ requirements:
     - sel(build_platform != target_platform): python
     - sel(build_platform != target_platform): cross-python_{{ target_platform }}
     - sel(build_platform != target_platform): cython
-    - sel(build_platform != target_platform): numpy
-    - sel(build_platform != target_platform): pybind11
   host:
     - python
     - ros-noetic-catkin
     - ros-noetic-message-generation
     - ros-noetic-std-msgs
     - ros-noetic-message-runtime
-    - ros-noetic-std-msgs
   run:
     - python
     - ros-noetic-message-runtime
     - ros-noetic-std-msgs
-    - ros-noetic-message-runtime
-    - ros-noetic-std-msgs
     - sel(osx and x86_64): __osx >={{ MACOSX_DEPLOYMENT_TARGET|default('10.14') }}
diff --git a/additional_recipes/ros-noetic-jackal-navigation/recipe.yaml b/additional_recipes/ros-noetic-jackal-navigation/recipe.yaml
@@ -12,7 +12,7 @@ extra:
   recipe-maintainers:
     - robostack
 build:
-  number: 0
+  number: 1
   script:
     sel(win): bld_catkin.bat
     sel(unix): build_catkin.sh
@@ -30,8 +30,6 @@ requirements:
     - sel(build_platform != target_platform): python
     - sel(build_platform != target_platform): cross-python_{{ target_platform }}
     - sel(build_platform != target_platform): cython
-    - sel(build_platform != target_platform): numpy
-    - sel(build_platform != target_platform): pybind11
   host:
     - python
     - ros-noetic-catkin
@@ -50,10 +48,4 @@ requirements:
     - ros-noetic-move-base
     - ros-noetic-urdf
     - ros-noetic-xacro
-    - ros-noetic-amcl
-    - ros-noetic-gmapping
-    - ros-noetic-map-server
-    - ros-noetic-move-base
-    - ros-noetic-urdf
-    - ros-noetic-xacro
     - sel(osx and x86_64): __osx >={{ MACOSX_DEPLOYMENT_TARGET|default('10.14') }}
diff --git a/additional_recipes/ros-noetic-jackal-simulator/recipe.yaml b/additional_recipes/ros-noetic-jackal-simulator/recipe.yaml
@@ -12,7 +12,7 @@ extra:
   recipe-maintainers:
     - robostack
 build:
-  number: 0
+  number: 1
   script:
     sel(win): bld_catkin.bat
     sel(unix): build_catkin.sh
@@ -30,14 +30,11 @@ requirements:
     - sel(build_platform != target_platform): python
     - sel(build_platform != target_platform): cross-python_{{ target_platform }}
     - sel(build_platform != target_platform): cython
-    - sel(build_platform != target_platform): numpy
-    - sel(build_platform != target_platform): pybind11
   host:
     - python
     - ros-noetic-catkin
     - ros-noetic-jackal-gazebo
   run:
     - python
     - ros-noetic-jackal-gazebo
-    - ros-noetic-jackal-gazebo
     - sel(osx and x86_64): __osx >={{ MACOSX_DEPLOYMENT_TARGET|default('10.14') }}
diff --git a/additional_recipes/ros-noetic-jackal-viz/recipe.yaml b/additional_recipes/ros-noetic-jackal-viz/recipe.yaml
@@ -12,7 +12,7 @@ extra:
   recipe-maintainers:
     - robostack
 build:
-  number: 0
+  number: 1
   script:
     sel(win): bld_catkin.bat
     sel(unix): build_catkin.sh
@@ -30,8 +30,6 @@ requirements:
     - sel(build_platform != target_platform): python
     - sel(build_platform != target_platform): cross-python_{{ target_platform }}
     - sel(build_platform != target_platform): cython
-    - sel(build_platform != target_platform): numpy
-    - sel(build_platform != target_platform): pybind11
   host:
     - python
     - ros-noetic-catkin
@@ -44,7 +42,4 @@ requirements:
     - ros-noetic-joint-state-publisher
     - ros-noetic-joint-state-publisher-gui
     - ros-noetic-rviz
-    - ros-noetic-joint-state-publisher
-    - ros-noetic-joint-state-publisher-gui
-    - ros-noetic-rviz
     - sel(osx and x86_64): __osx >={{ MACOSX_DEPLOYMENT_TARGET|default('10.14') }}
diff --git a/conda_build_config.yaml b/conda_build_config.yaml
@@ -1,37 +1,36 @@
 # TODO: remove these when run_exports are added to the packages.
 pin_run_as_build:
-  pcl:
-    max_pin: x.x.x
   tbb-devel:
     max_pin: x.x
 
 console_bridge:
   - 1.0
 gazebo:
   - '11'
+libprotobuf:
+  - 3.18
 numpy:
   # part of a zip_keys: python, python_impl, numpy
-  - 1.17   # [not (osx and arm64)]
-  # - 1.17   # [not (osx and arm64)]
-  # - 1.17   # [not (osx and arm64)]
+  - 1.18   # [not (osx and arm64)]
+  # - 1.18   # [not (osx and arm64)]
+  # - 1.18   # [not (osx and arm64)]
   - 1.19   # [osx and arm64]
 ogre:
   - 1.10.12
-libopencv:
-  - 4.5.2
 pcl:
   - 1.11.1
+spdlog:
+  - 1.9.0
 # tbb pinned on Windows due to https://stackoverflow.com/questions/64510477/error-c2061-syntax-error-identifier-concurrent-vectortemplate-type-paramet
 # tbb pinned on Unix due to https://github.com/conda-forge/gazebo-feedstock/issues/57
 tbb:
   - 2019.9  # [win]
   - 2020.2  # [not win]
-tbb-devel:
-  - 2019.9  # [win]
-  - 2020.2  # [not win]
 tbb_devel:
   - 2019.9  # [win]
   - 2020.2  # [not win]
+libpqxx:
+  - 6
 
 python:
   # part of a zip_keys: python, python_impl, numpy

diff --git a/patch/dependencies.yaml b/patch/dependencies.yaml
@@ -133,4 +133,5 @@ nav_grid_server:
   add_host: ["pkg-config"]
 safety_limiter:
   add_host: ["REQUIRE_OPENGL"]
-
+ifopt:
+  add_host: ["ipopt"]
diff --git a/patch/ros-noetic-apriltag.patch b/patch/ros-noetic-apriltag.patch
@@ -0,0 +1,13 @@
+diff --git a/python_build_flags.py b/python_build_flags.py
+index f3f0e79..865c85b 100644
+--- a/python_build_flags.py
++++ b/python_build_flags.py
+@@ -21,7 +21,7 @@ print('LINKER', end=';')
+ print(conf.get('BLDSHARED', '').split()[0], end=';')
+
+ print('LDFLAGS', end=';')
+-print(' '.join(conf.get('BLDSHARED', '').split()[1:]) + ' ' + conf.get('BLDLIBRARY', '') + ' ' + conf.get('LDFLAGS', ''), end=';')
++print(' '.join(conf.get('BLDSHARED', '').split()[1:]) + ' ' + conf.get('LDFLAGS', ''), end=';')
+
+ print('EXT_SUFFIX', end=';')
+ ext_suffix = '.so'
diff --git a/patch/ros-noetic-eigenpy.patch b/patch/ros-noetic-eigenpy.patch
diff --git a/patch/ros-noetic-gazebo-plugins.win.patch b/patch/ros-noetic-gazebo-plugins.win.patch