Rebuild for libabseil 20240116, libgrp 1.61, libprotobuf 4.25.2 (#203)

automerged PR by conda-forge/automerge-action
conda-forge · Mar 8, 2024 · 3762a2c · 3762a2c
2 parents 1600a75 + fc88ddf
commit 3762a2c
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 52 deletions.
diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
@@ -27,7 +27,7 @@ graphviz:
 hdf5:
 - 1.14.3
 libabseil:
-- '20230802'
+- '20240116'
 libblas:
 - 3.9 *netlib
 libboost_devel:
@@ -39,7 +39,7 @@ libcurl:
 libgdal:
 - '3.8'
 libprotobuf:
-- 4.25.1
+- 4.25.2
 libuuid:
 - '2'
 libxcb:

diff --git a/.ci_support/linux_aarch64_.yaml b/.ci_support/linux_aarch64_.yaml
@@ -31,7 +31,7 @@ graphviz:
 hdf5:
 - 1.14.3
 libabseil:
-- '20230802'
+- '20240116'
 libblas:
 - 3.9 *netlib
 libboost_devel:
@@ -43,7 +43,7 @@ libcurl:
 libgdal:
 - '3.8'
 libprotobuf:
-- 4.25.1
+- 4.25.2
 libuuid:
 - '2'
 libxcb:

diff --git a/.ci_support/migrations/hdf51142.yaml b/.ci_support/migrations/hdf51142.yaml
diff --git a/...igrations/libgrpc159_libprotobuf4244.yaml → ...l20240116_libgrpc161_libprotobuf4252.yaml b/...igrations/libgrpc159_libprotobuf4244.yaml → ...l20240116_libgrpc161_libprotobuf4252.yaml
@@ -1,16 +1,22 @@
 __migrator:
   build_number: 1
+  commit_message: Rebuild for libabseil 20240116, libgrp 1.61, libprotobuf 4.25.2
   kind: version
   migration_number: 1
   exclude:
+    - abseil-cpp
+    - grpc-cpp
+    - libprotobuf
     # this shouldn't attempt to modify the python feedstocks
     - protobuf
+libabseil:
+- "20240116"
 libgrpc:
-- "1.59"
+- "1.61"
 libprotobuf:
-- 4.24.4
+- 4.25.2
 # already covered by libabseil20230802_libgrpc157_libprotobuf4234,
 # which we cannot delete yet, but keep for clarity
 MACOSX_DEPLOYMENT_TARGET:  # [osx and x86_64]
 - "10.13"                  # [osx and x86_64]
-migrator_ts: 1698833751.21557
+migrator_ts: 1705991934.9119136
diff --git a/.ci_support/migrations/libprotobuf4251.yaml b/.ci_support/migrations/libprotobuf4251.yaml
diff --git a/.ci_support/migrations/tinyxml210.yaml b/.ci_support/migrations/tinyxml210.yaml
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
@@ -27,7 +27,7 @@ graphviz:
 hdf5:
 - 1.14.3
 libabseil:
-- '20230802'
+- '20240116'
 libblas:
 - 3.9 *netlib
 libboost_devel:
@@ -39,7 +39,7 @@ libcurl:
 libgdal:
 - '3.8'
 libprotobuf:
-- 4.25.1
+- 4.25.2
 libxcb:
 - '1.15'
 macos_machine:

diff --git a/.ci_support/osx_arm64_.yaml b/.ci_support/osx_arm64_.yaml
@@ -27,7 +27,7 @@ graphviz:
 hdf5:
 - 1.14.3
 libabseil:
-- '20230802'
+- '20240116'
 libblas:
 - 3.9 *netlib
 libboost_devel:
@@ -39,7 +39,7 @@ libcurl:
 libgdal:
 - '3.8'
 libprotobuf:
-- 4.25.1
+- 4.25.2
 libxcb:
 - '1.15'
 macos_machine:

diff --git a/.ci_support/win_64_.yaml b/.ci_support/win_64_.yaml
@@ -17,7 +17,7 @@ graphviz:
 hdf5:
 - 1.14.3
 libabseil:
-- '20230802'
+- '20240116'
 libblas:
 - 3.9 *netlib
 libboost_devel:
@@ -29,7 +29,7 @@ libcurl:
 libgdal:
 - '3.8'
 libprotobuf:
-- 4.25.1
+- 4.25.2
 pin_run_as_build:
   graphviz:
     max_pin: x

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
diff --git a/build-locally.py b/build-locally.py
diff --git a/conda-forge.yml b/conda-forge.yml
@@ -5,7 +5,6 @@ build_platform:
   osx_arm64: osx_64
 conda_build:
   pkg_format: '2'
-conda_build_tool: mambabuild
 conda_forge_output_validation: true
 github:
   branch_name: main

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -13,7 +13,7 @@ source:
       - fix-invisible-meshes.patch
 
 build:
-  number: 7
+  number: 8
   run_exports:
     - {{ pin_subpackage('gazebo', max_pin='x') }}
 
@@ -129,8 +129,9 @@ requirements:
     - libboost-devel
     - tbb-devel
     # Add constraint to avoid that old ogre gets installed during migratons,
-    # see https://github.com/conda-forge/gazebo-feedstock/pull/188/files
-    - "ogre >=1.10.12[build_number=3]"
+    # see https://github.com/conda-forge/gazebo-feedstock/pull/188/files and
+    # https://github.com/conda-forge/gazebo-feedstock/pull/203#issuecomment-1981995139
+    - "ogre >=1.10.12.1"
     - __osx >={{ MACOSX_DEPLOYMENT_TARGET|default("10.9") }}  # [osx and x86_64]
 
 test: