From 7099cfbf5cb0196c76796debb55eae2d0caa9aa7 Mon Sep 17 00:00:00 2001
From: regro-cf-autotick-bot
 <36490558+regro-cf-autotick-bot@users.noreply.github.com>
Date: Sun, 3 Mar 2024 21:07:33 +0000
Subject: [PATCH 01/11] Rebuild for libabseil 20240116, libgrp 1.61,
 libprotobuf 4.25.2

---
 ...il20240116_libgrpc161_libprotobuf4252.yaml | 22 +++++++++++++++++++
 recipe/meta.yaml                              |  2 +-
 2 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 .ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml

diff --git a/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml b/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml
new file mode 100644
index 0000000..08cd5a0
--- /dev/null
+++ b/.ci_support/migrations/libabseil20240116_libgrpc161_libprotobuf4252.yaml
@@ -0,0 +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.61"
+libprotobuf:
+- 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: 1705991934.9119136
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index e0b34dd..efc1766 100644
--- 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') }}
 

From 6d6e8aacf96e5d3b1fb13a9f006b569a9c4ea202 Mon Sep 17 00:00:00 2001
From: regro-cf-autotick-bot
 <36490558+regro-cf-autotick-bot@users.noreply.github.com>
Date: Sun, 3 Mar 2024 21:07:49 +0000
Subject: [PATCH 02/11] MNT: Re-rendered with conda-build 24.1.2, conda-smithy
 3.31.1, and conda-forge-pinning 2024.03.02.16.55.54

---
 .ci_support/linux_64_.yaml                       |  4 ++--
 .ci_support/linux_aarch64_.yaml                  |  4 ++--
 .ci_support/migrations/hdf51142.yaml             |  7 -------
 .../migrations/libgrpc159_libprotobuf4244.yaml   | 16 ----------------
 .ci_support/migrations/tinyxml210.yaml           |  8 --------
 .ci_support/osx_64_.yaml                         |  4 ++--
 .ci_support/osx_arm64_.yaml                      |  4 ++--
 .ci_support/win_64_.yaml                         |  4 ++--
 .scripts/build_steps.sh                          |  4 ++--
 .scripts/run_osx_build.sh                        |  4 ++--
 .scripts/run_win_build.bat                       |  2 +-
 build-locally.py                                 |  5 +++--
 12 files changed, 18 insertions(+), 48 deletions(-)
 delete mode 100644 .ci_support/migrations/hdf51142.yaml
 delete mode 100644 .ci_support/migrations/libgrpc159_libprotobuf4244.yaml
 delete mode 100644 .ci_support/migrations/tinyxml210.yaml

diff --git a/.ci_support/linux_64_.yaml b/.ci_support/linux_64_.yaml
index 618f942..0005368 100644
--- 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
index 5ce8d6d..78abb06 100644
--- 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
deleted file mode 100644
index 1517ced..0000000
--- a/.ci_support/migrations/hdf51142.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-__migrator:
-  build_number: 1
-  kind: version
-  migration_number: 1
-hdf5:
-- 1.14.2
-migrator_ts: 1692590899.44706
diff --git a/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml b/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml
deleted file mode 100644
index 8a51b6e..0000000
--- a/.ci_support/migrations/libgrpc159_libprotobuf4244.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-__migrator:
-  build_number: 1
-  kind: version
-  migration_number: 1
-  exclude:
-    # this shouldn't attempt to modify the python feedstocks
-    - protobuf
-libgrpc:
-- "1.59"
-libprotobuf:
-- 4.24.4
-# 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
diff --git a/.ci_support/migrations/tinyxml210.yaml b/.ci_support/migrations/tinyxml210.yaml
deleted file mode 100644
index da7b243..0000000
--- a/.ci_support/migrations/tinyxml210.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-__migrator:
-  build_number: 1
-  commit_message: Rebuild for tinyxml2 10
-  kind: version
-  migration_number: 1
-migrator_ts: 1704497957.887235
-tinyxml2:
-- '10'
diff --git a/.ci_support/osx_64_.yaml b/.ci_support/osx_64_.yaml
index b122367..b8673e1 100644
--- 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
index ddb1b99..39e158a 100644
--- 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
index 8208886..80255e0 100644
--- 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
index 32b651e..adeec96 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -34,9 +34,9 @@ CONDARC
 export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
 
 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build boa conda-forge-ci-setup=4
+    pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1"
 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build boa conda-forge-ci-setup=4
+    pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1"
 
 # set up the condarc
 setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
index 9259eb9..d29a138 100755
--- a/.scripts/run_osx_build.sh
+++ b/.scripts/run_osx_build.sh
@@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba"
 export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
 
 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build boa conda-forge-ci-setup=4
+    pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1"
 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build boa conda-forge-ci-setup=4
+    pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1"
 
 
 
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
index 48734de..a1fd842 100755
--- a/.scripts/run_win_build.bat
+++ b/.scripts/run_win_build.bat
@@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1"
 
 :: Provision the necessary dependencies to build the recipe later
 echo Installing dependencies
-mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 -c conda-forge --strict-channel-priority --yes
+mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes
 if !errorlevel! neq 0 exit /b !errorlevel!
 
 :: Set basic configuration
diff --git a/build-locally.py b/build-locally.py
index 3f4b7a7..e0d408d 100755
--- a/build-locally.py
+++ b/build-locally.py
@@ -64,8 +64,9 @@ def verify_config(ns):
     elif ns.config.startswith("osx"):
         if "OSX_SDK_DIR" not in os.environ:
             raise RuntimeError(
-                "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=SDKs' "
-                "to download the SDK automatically to 'SDKs/MacOSX<ver>.sdk'. "
+                "Need OSX_SDK_DIR env variable set. Run 'export OSX_SDK_DIR=$PWD/SDKs' "
+                "to download the SDK automatically to '$PWD/SDKs/MacOSX<ver>.sdk'. "
+                "Note: OSX_SDK_DIR must be set to an absolute path. "
                 "Setting this variable implies agreement to the licensing terms of the SDK by Apple."
             )
 

From 655659a6bd085d9d141abe27cad90b32e841edf5 Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <silvio@traversaro.it>
Date: Mon, 4 Mar 2024 21:42:00 +0100
Subject: [PATCH 03/11] Update conda-forge.yml

---
 conda-forge.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conda-forge.yml b/conda-forge.yml
index 6b58982..edd37b7 100644
--- a/conda-forge.yml
+++ b/conda-forge.yml
@@ -5,7 +5,7 @@ build_platform:
   osx_arm64: osx_64
 conda_build:
   pkg_format: '2'
-conda_build_tool: mambabuild
+conda_build_tool: conda-build
 conda_forge_output_validation: true
 github:
   branch_name: main

From e5f9548393c94ef11304b2aa4dd30341b7538648 Mon Sep 17 00:00:00 2001
From: "conda-forge-webservices[bot]"
 <91080706+conda-forge-webservices[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 20:44:35 +0000
Subject: [PATCH 04/11] MNT: Re-rendered with conda-build 24.1.2, conda-smithy
 3.31.1, and conda-forge-pinning 2024.03.04.16.05.00

---
 .scripts/build_steps.sh    | 6 +++---
 .scripts/run_osx_build.sh  | 6 +++---
 .scripts/run_win_build.bat | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
index adeec96..47271f4 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -34,9 +34,9 @@ CONDARC
 export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
 
 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1"
+    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1"
+    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
 
 # set up the condarc
 setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
@@ -76,7 +76,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
     # Drop into an interactive shell
     /bin/bash
 else
-    conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
+    conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
         --suppress-variables ${EXTRA_CB_OPTIONS:-} \
         --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \
         --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}"
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
index d29a138..16daa69 100755
--- a/.scripts/run_osx_build.sh
+++ b/.scripts/run_osx_build.sh
@@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba"
 export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
 
 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1"
+    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1"
+    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
 
 
 
@@ -81,7 +81,7 @@ else
         EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test"
     fi
 
-    conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \
+    conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \
         --suppress-variables ${EXTRA_CB_OPTIONS:-} \
         --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \
         --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha"
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
index a1fd842..f801cf4 100755
--- a/.scripts/run_win_build.bat
+++ b/.scripts/run_win_build.bat
@@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1"
 
 :: Provision the necessary dependencies to build the recipe later
 echo Installing dependencies
-mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes
+mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes
 if !errorlevel! neq 0 exit /b !errorlevel!
 
 :: Set basic configuration
@@ -55,7 +55,7 @@ call :end_group
 
 :: Build the recipe
 echo Building recipe
-conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS%
+conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS%
 if !errorlevel! neq 0 exit /b !errorlevel!
 
 :: Prepare some environment variables for the upload step

From bfe24946c2a08b1668d0840ac7979869a6af0b62 Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <silvio@traversaro.it>
Date: Mon, 4 Mar 2024 23:49:46 +0100
Subject: [PATCH 05/11] Update conda-forge.yml

---
 conda-forge.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/conda-forge.yml b/conda-forge.yml
index edd37b7..e43c3e0 100644
--- a/conda-forge.yml
+++ b/conda-forge.yml
@@ -5,7 +5,8 @@ build_platform:
   osx_arm64: osx_64
 conda_build:
   pkg_format: '2'
-conda_build_tool: conda-build
+# Workaround for https://github.com/conda/conda-libmamba-solver/issues/446
+conda_build_tool: conda-build+classic
 conda_forge_output_validation: true
 github:
   branch_name: main

From ec7c3e8dd966f77e60c2f7bec89895f6fc96c08f Mon Sep 17 00:00:00 2001
From: "conda-forge-webservices[bot]"
 <91080706+conda-forge-webservices[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 22:52:18 +0000
Subject: [PATCH 06/11] MNT: Re-rendered with conda-build 24.1.2, conda-smithy
 3.31.1, and conda-forge-pinning 2024.03.04.20.49.20

---
 .scripts/build_steps.sh    | 2 +-
 .scripts/run_osx_build.sh  | 2 +-
 .scripts/run_win_build.bat | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
index 47271f4..f81d821 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -76,7 +76,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
     # Drop into an interactive shell
     /bin/bash
 else
-    conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
+    CONDA_SOLVER=classic conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
         --suppress-variables ${EXTRA_CB_OPTIONS:-} \
         --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \
         --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}"
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
index 16daa69..60e4565 100755
--- a/.scripts/run_osx_build.sh
+++ b/.scripts/run_osx_build.sh
@@ -81,7 +81,7 @@ else
         EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test"
     fi
 
-    conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \
+    CONDA_SOLVER=classic conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \
         --suppress-variables ${EXTRA_CB_OPTIONS:-} \
         --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \
         --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha"
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
index f801cf4..8e33cb7 100755
--- a/.scripts/run_win_build.bat
+++ b/.scripts/run_win_build.bat
@@ -55,6 +55,7 @@ call :end_group
 
 :: Build the recipe
 echo Building recipe
+set "CONDA_SOLVER=classic"
 conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS%
 if !errorlevel! neq 0 exit /b !errorlevel!
 

From 63e42e2305f16fba28d2689b7b8fe0276c89b6b1 Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <silvio@traversaro.it>
Date: Tue, 5 Mar 2024 19:15:17 +0100
Subject: [PATCH 07/11] Update conda-forge.yml

---
 conda-forge.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/conda-forge.yml b/conda-forge.yml
index e43c3e0..6b58982 100644
--- a/conda-forge.yml
+++ b/conda-forge.yml
@@ -5,8 +5,7 @@ build_platform:
   osx_arm64: osx_64
 conda_build:
   pkg_format: '2'
-# Workaround for https://github.com/conda/conda-libmamba-solver/issues/446
-conda_build_tool: conda-build+classic
+conda_build_tool: mambabuild
 conda_forge_output_validation: true
 github:
   branch_name: main

From 2155ab288234ffd958ff43f1dcdd3cfaa97584bb Mon Sep 17 00:00:00 2001
From: "conda-forge-webservices[bot]"
 <91080706+conda-forge-webservices[bot]@users.noreply.github.com>
Date: Tue, 5 Mar 2024 18:17:29 +0000
Subject: [PATCH 08/11] MNT: Re-rendered with conda-build 24.1.2, conda-smithy
 3.31.1, and conda-forge-pinning 2024.03.05.14.24.26

---
 .scripts/build_steps.sh    | 6 +++---
 .scripts/run_osx_build.sh  | 6 +++---
 .scripts/run_win_build.bat | 5 ++---
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
index f81d821..adeec96 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -34,9 +34,9 @@ CONDARC
 export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
 
 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
+    pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1"
 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
+    pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1"
 
 # set up the condarc
 setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
@@ -76,7 +76,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
     # Drop into an interactive shell
     /bin/bash
 else
-    CONDA_SOLVER=classic conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
+    conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
         --suppress-variables ${EXTRA_CB_OPTIONS:-} \
         --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \
         --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}"
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
index 60e4565..d29a138 100755
--- a/.scripts/run_osx_build.sh
+++ b/.scripts/run_osx_build.sh
@@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba"
 export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
 
 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
+    pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1"
 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
+    pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1"
 
 
 
@@ -81,7 +81,7 @@ else
         EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test"
     fi
 
-    CONDA_SOLVER=classic conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \
+    conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \
         --suppress-variables ${EXTRA_CB_OPTIONS:-} \
         --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \
         --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha"
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
index 8e33cb7..a1fd842 100755
--- a/.scripts/run_win_build.bat
+++ b/.scripts/run_win_build.bat
@@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1"
 
 :: Provision the necessary dependencies to build the recipe later
 echo Installing dependencies
-mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes
+mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes
 if !errorlevel! neq 0 exit /b !errorlevel!
 
 :: Set basic configuration
@@ -55,8 +55,7 @@ call :end_group
 
 :: Build the recipe
 echo Building recipe
-set "CONDA_SOLVER=classic"
-conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS%
+conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS%
 if !errorlevel! neq 0 exit /b !errorlevel!
 
 :: Prepare some environment variables for the upload step

From 1c47e070e7b0174e485921c474dda149f8c141d4 Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <silvio@traversaro.it>
Date: Thu, 7 Mar 2024 23:24:18 +0100
Subject: [PATCH 09/11] Update meta.yaml

---
 recipe/meta.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/recipe/meta.yaml b/recipe/meta.yaml
index efc1766..b4e721c 100644
--- a/recipe/meta.yaml
+++ b/recipe/meta.yaml
@@ -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:

From 08d7ef60527963d6949bbb46083e0fc36f204621 Mon Sep 17 00:00:00 2001
From: Silvio Traversaro <silvio@traversaro.it>
Date: Thu, 7 Mar 2024 23:24:41 +0100
Subject: [PATCH 10/11] Update conda-forge.yml

---
 conda-forge.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/conda-forge.yml b/conda-forge.yml
index 6b58982..7cfc9e5 100644
--- 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

From fc88ddfc6b45e06afbc922c5ce851880d3baaf98 Mon Sep 17 00:00:00 2001
From: "conda-forge-webservices[bot]"
 <91080706+conda-forge-webservices[bot]@users.noreply.github.com>
Date: Thu, 7 Mar 2024 22:27:07 +0000
Subject: [PATCH 11/11] MNT: Re-rendered with conda-build 24.1.2, conda-smithy
 3.31.1, and conda-forge-pinning 2024.03.07.20.43.08

---
 .ci_support/migrations/libprotobuf4251.yaml | 10 ----------
 .scripts/build_steps.sh                     |  6 +++---
 .scripts/run_osx_build.sh                   |  6 +++---
 .scripts/run_win_build.bat                  |  4 ++--
 4 files changed, 8 insertions(+), 18 deletions(-)
 delete mode 100644 .ci_support/migrations/libprotobuf4251.yaml

diff --git a/.ci_support/migrations/libprotobuf4251.yaml b/.ci_support/migrations/libprotobuf4251.yaml
deleted file mode 100644
index 39478f0..0000000
--- a/.ci_support/migrations/libprotobuf4251.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-__migrator:
-  build_number: 1
-  commit_message: Rebuild for libprotobuf 4.25.1
-  kind: version
-  migration_number: 1
-libgrpc:
-- "1.60"
-libprotobuf:
-- 4.25.1
-migrator_ts: 1705841975.2201185
diff --git a/.scripts/build_steps.sh b/.scripts/build_steps.sh
index adeec96..47271f4 100755
--- a/.scripts/build_steps.sh
+++ b/.scripts/build_steps.sh
@@ -34,9 +34,9 @@ CONDARC
 export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
 
 mamba install --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1"
+    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1"
+    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
 
 # set up the condarc
 setup_conda_rc "${FEEDSTOCK_ROOT}" "${RECIPE_ROOT}" "${CONFIG_FILE}"
@@ -76,7 +76,7 @@ if [[ "${BUILD_WITH_CONDA_DEBUG:-0}" == 1 ]]; then
     # Drop into an interactive shell
     /bin/bash
 else
-    conda mambabuild "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
+    conda build "${RECIPE_ROOT}" -m "${CI_SUPPORT}/${CONFIG}.yaml" \
         --suppress-variables ${EXTRA_CB_OPTIONS:-} \
         --clobber-file "${CI_SUPPORT}/clobber_${CONFIG}.yaml" \
         --extra-meta flow_run_id="${flow_run_id:-}" remote_url="${remote_url:-}" sha="${sha:-}"
diff --git a/.scripts/run_osx_build.sh b/.scripts/run_osx_build.sh
index d29a138..16daa69 100755
--- a/.scripts/run_osx_build.sh
+++ b/.scripts/run_osx_build.sh
@@ -26,9 +26,9 @@ export CONDA_SOLVER="libmamba"
 export CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1
 
 mamba install --update-specs --quiet --yes --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1"
+    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
 mamba update --update-specs --yes --quiet --channel conda-forge --strict-channel-priority \
-    pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1"
+    pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1"
 
 
 
@@ -81,7 +81,7 @@ else
         EXTRA_CB_OPTIONS="${EXTRA_CB_OPTIONS:-} --no-test"
     fi
 
-    conda mambabuild ./recipe -m ./.ci_support/${CONFIG}.yaml \
+    conda build ./recipe -m ./.ci_support/${CONFIG}.yaml \
         --suppress-variables ${EXTRA_CB_OPTIONS:-} \
         --clobber-file ./.ci_support/clobber_${CONFIG}.yaml \
         --extra-meta flow_run_id="$flow_run_id" remote_url="$remote_url" sha="$sha"
diff --git a/.scripts/run_win_build.bat b/.scripts/run_win_build.bat
index a1fd842..f801cf4 100755
--- a/.scripts/run_win_build.bat
+++ b/.scripts/run_win_build.bat
@@ -24,7 +24,7 @@ set "CONDA_LIBMAMBA_SOLVER_NO_CHANNELS_FROM_INSTALLED=1"
 
 :: Provision the necessary dependencies to build the recipe later
 echo Installing dependencies
-mamba.exe install "python=3.10" pip mamba conda-build boa conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes
+mamba.exe install "python=3.10" pip mamba conda-build conda-forge-ci-setup=4 "conda-build>=24.1" -c conda-forge --strict-channel-priority --yes
 if !errorlevel! neq 0 exit /b !errorlevel!
 
 :: Set basic configuration
@@ -55,7 +55,7 @@ call :end_group
 
 :: Build the recipe
 echo Building recipe
-conda.exe mambabuild "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS%
+conda.exe build "recipe" -m .ci_support\%CONFIG%.yaml --suppress-variables %EXTRA_CB_OPTIONS%
 if !errorlevel! neq 0 exit /b !errorlevel!
 
 :: Prepare some environment variables for the upload step