From 98d5780a5cbd6413206979e6ee2d4004cbba09e2 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 24 Aug 2024 18:21:29 +0000 Subject: [PATCH 1/6] Rebuild for libboost 1.86 --- .ci_support/migrations/libboost186.yaml | 12 ++++++++++++ recipe/meta.yaml | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 .ci_support/migrations/libboost186.yaml diff --git a/.ci_support/migrations/libboost186.yaml b/.ci_support/migrations/libboost186.yaml new file mode 100644 index 0000000..d5eb77a --- /dev/null +++ b/.ci_support/migrations/libboost186.yaml @@ -0,0 +1,12 @@ +__migrator: + build_number: 1 + kind: version + commit_message: "Rebuild for libboost 1.86" + migration_number: 1 +assimp: +- 5.4.2 +libboost_devel: +- "1.86" +libboost_python_devel: +- "1.86" +migrator_ts: 1723764795.6693385 diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 2468611..c3a24ef 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -1,6 +1,6 @@ {% set name = "gazebo" %} {% set version = "11.14.0" %} -{% set build_number = 16 %} +{% set build_number = 17 %} {% if GZ_CLI_NAME_VARIANT == "origname" %} {% set build_number = build_number + 200 %} From 5f608405da3bc712a6717078c991ff558a66fbd0 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Sat, 24 Aug 2024 18:23:11 +0000 Subject: [PATCH 2/6] MNT: Re-rendered with conda-build 24.7.1, conda-smithy 3.39.0, and conda-forge-pinning 2024.08.23.18.51.20 --- ...nux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml | 11 ++++------- ...nux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml | 11 ++++------- .../linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml | 11 ++++------- .../linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml | 11 ++++------- ...arch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml | 11 ++++------- ...arch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml | 11 ++++------- ...ux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml | 11 ++++------- ...ux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml | 11 ++++------- .ci_support/migrations/graphviz12.yaml | 8 -------- ...osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml | 11 ++++------- ...osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml | 11 ++++------- .../osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml | 11 ++++------- .../osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml | 11 ++++------- ..._arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml | 11 ++++------- ..._arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml | 11 ++++------- .../osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml | 11 ++++------- .../osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml | 11 ++++------- ...win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml | 7 ++----- ...win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml | 7 ++----- .../win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml | 7 ++----- .../win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml | 7 ++----- 21 files changed, 72 insertions(+), 140 deletions(-) delete mode 100644 .ci_support/migrations/graphviz12.yaml diff --git a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml index eb98c5f..ddac471 100644 --- a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml +++ b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml @@ -1,13 +1,13 @@ GZ_CLI_NAME_VARIANT: - gzcompatname assimp: -- 5.4.1 +- 5.4.2 bullet_cpp: - '3.25' c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -23,7 +23,7 @@ curl: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: @@ -37,7 +37,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -52,9 +52,6 @@ libuuid: - '2' libxcb: - '1.16' -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml index 63c6963..eabdf76 100644 --- a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml +++ b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml @@ -1,13 +1,13 @@ GZ_CLI_NAME_VARIANT: - gzcompatname assimp: -- 5.4.1 +- 5.4.2 bullet_cpp: - '3.25' c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -23,7 +23,7 @@ curl: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: @@ -37,7 +37,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -52,9 +52,6 @@ libuuid: - '2' libxcb: - '1.16' -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml index 5a8825b..4c8395d 100644 --- a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml +++ b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml @@ -1,13 +1,13 @@ GZ_CLI_NAME_VARIANT: - origname assimp: -- 5.4.1 +- 5.4.2 bullet_cpp: - '3.25' c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -23,7 +23,7 @@ curl: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: @@ -37,7 +37,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -52,9 +52,6 @@ libuuid: - '2' libxcb: - '1.16' -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml index cfd3ab6..190749a 100644 --- a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml +++ b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml @@ -1,13 +1,13 @@ GZ_CLI_NAME_VARIANT: - origname assimp: -- 5.4.1 +- 5.4.2 bullet_cpp: - '3.25' c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -23,7 +23,7 @@ curl: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: @@ -37,7 +37,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -52,9 +52,6 @@ libuuid: - '2' libxcb: - '1.16' -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml index db70682..0b2f412 100644 --- a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml +++ b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml @@ -3,13 +3,13 @@ BUILD: GZ_CLI_NAME_VARIANT: - gzcompatname assimp: -- 5.4.1 +- 5.4.2 bullet_cpp: - '3.25' c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -27,7 +27,7 @@ curl: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: @@ -41,7 +41,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -56,9 +56,6 @@ libuuid: - '2' libxcb: - '1.16' -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml index b02d285..42de706 100644 --- a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml +++ b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml @@ -3,13 +3,13 @@ BUILD: GZ_CLI_NAME_VARIANT: - gzcompatname assimp: -- 5.4.1 +- 5.4.2 bullet_cpp: - '3.25' c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -27,7 +27,7 @@ curl: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: @@ -41,7 +41,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -56,9 +56,6 @@ libuuid: - '2' libxcb: - '1.16' -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml index d08394a..e3536c6 100644 --- a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml +++ b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml @@ -3,13 +3,13 @@ BUILD: GZ_CLI_NAME_VARIANT: - origname assimp: -- 5.4.1 +- 5.4.2 bullet_cpp: - '3.25' c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -27,7 +27,7 @@ curl: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: @@ -41,7 +41,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -56,9 +56,6 @@ libuuid: - '2' libxcb: - '1.16' -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml index 25c36a9..cce1248 100644 --- a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml +++ b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml @@ -3,13 +3,13 @@ BUILD: GZ_CLI_NAME_VARIANT: - origname assimp: -- 5.4.1 +- 5.4.2 bullet_cpp: - '3.25' c_compiler: - gcc c_compiler_version: -- '12' +- '13' c_stdlib: - sysroot c_stdlib_version: @@ -27,7 +27,7 @@ curl: cxx_compiler: - gxx cxx_compiler_version: -- '12' +- '13' docker_image: - quay.io/condaforge/linux-anvil-cos7-x86_64 ffmpeg: @@ -41,7 +41,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -56,9 +56,6 @@ libuuid: - '2' libxcb: - '1.16' -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/migrations/graphviz12.yaml b/.ci_support/migrations/graphviz12.yaml deleted file mode 100644 index d25ad8a..0000000 --- a/.ci_support/migrations/graphviz12.yaml +++ /dev/null @@ -1,8 +0,0 @@ -__migrator: - build_number: 1 - commit_message: Rebuild for graphviz 12 - kind: version - migration_number: 1 -graphviz: -- '12' -migrator_ts: 1722688838.199906 diff --git a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml index d9c4196..a98ae47 100644 --- a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml +++ b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml @@ -5,7 +5,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '10.15' assimp: -- 5.4.1 +- 5.4.2 bullet_cpp: - '3.25' bzip2: @@ -13,7 +13,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -27,7 +27,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' ffmpeg: - '6' graphviz: @@ -39,7 +39,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -56,9 +56,6 @@ macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: - '10.15' -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml index 3b81783..efda463 100644 --- a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml +++ b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml @@ -5,7 +5,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '10.15' assimp: -- 5.4.1 +- 5.4.2 bullet_cpp: - '3.25' bzip2: @@ -13,7 +13,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -27,7 +27,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' ffmpeg: - '7' graphviz: @@ -39,7 +39,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -56,9 +56,6 @@ macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: - '10.15' -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml index 6e5f493..4b1e8e7 100644 --- a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml +++ b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml @@ -5,7 +5,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '10.15' assimp: -- 5.4.1 +- 5.4.2 bullet_cpp: - '3.25' bzip2: @@ -13,7 +13,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -27,7 +27,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' ffmpeg: - '6' graphviz: @@ -39,7 +39,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -56,9 +56,6 @@ macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: - '10.15' -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml index 5640960..59dae21 100644 --- a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml +++ b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml @@ -5,7 +5,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '10.15' assimp: -- 5.4.1 +- 5.4.2 bullet_cpp: - '3.25' bzip2: @@ -13,7 +13,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -27,7 +27,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' ffmpeg: - '7' graphviz: @@ -39,7 +39,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -56,9 +56,6 @@ macos_machine: - x86_64-apple-darwin13.4.0 macos_min_version: - '10.15' -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml index ce212ad..bda8447 100644 --- a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml +++ b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml @@ -5,7 +5,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' assimp: -- 5.4.1 +- 5.4.2 bullet_cpp: - '3.25' bzip2: @@ -13,7 +13,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -27,7 +27,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' ffmpeg: - '6' graphviz: @@ -39,7 +39,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -54,9 +54,6 @@ libxcb: - '1.16' macos_machine: - arm64-apple-darwin20.0.0 -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml index deb8ad0..e1023eb 100644 --- a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml +++ b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml @@ -5,7 +5,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' assimp: -- 5.4.1 +- 5.4.2 bullet_cpp: - '3.25' bzip2: @@ -13,7 +13,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -27,7 +27,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' ffmpeg: - '7' graphviz: @@ -39,7 +39,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -54,9 +54,6 @@ libxcb: - '1.16' macos_machine: - arm64-apple-darwin20.0.0 -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml index 6142376..2d915bd 100644 --- a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml +++ b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml @@ -5,7 +5,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' assimp: -- 5.4.1 +- 5.4.2 bullet_cpp: - '3.25' bzip2: @@ -13,7 +13,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -27,7 +27,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' ffmpeg: - '6' graphviz: @@ -39,7 +39,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -54,9 +54,6 @@ libxcb: - '1.16' macos_machine: - arm64-apple-darwin20.0.0 -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml index e5c7df7..3e807f8 100644 --- a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml +++ b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml @@ -5,7 +5,7 @@ MACOSX_DEPLOYMENT_TARGET: MACOSX_SDK_VERSION: - '11.0' assimp: -- 5.4.1 +- 5.4.2 bullet_cpp: - '3.25' bzip2: @@ -13,7 +13,7 @@ bzip2: c_compiler: - clang c_compiler_version: -- '16' +- '17' c_stdlib: - macosx_deployment_target c_stdlib_version: @@ -27,7 +27,7 @@ curl: cxx_compiler: - clangxx cxx_compiler_version: -- '16' +- '17' ffmpeg: - '7' graphviz: @@ -39,7 +39,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -54,9 +54,6 @@ libxcb: - '1.16' macos_machine: - arm64-apple-darwin20.0.0 -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml b/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml index 340eb9f..cc1deb8 100644 --- a/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml +++ b/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml @@ -1,7 +1,7 @@ GZ_CLI_NAME_VARIANT: - gzcompatname assimp: -- 5.4.1 +- 5.4.2 c_compiler: - vs2019 c_stdlib: @@ -25,7 +25,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -36,9 +36,6 @@ libode: - 0.16.2 libprotobuf: - 4.25.3 -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml index 1d979e6..25b64a2 100644 --- a/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml +++ b/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml @@ -1,7 +1,7 @@ GZ_CLI_NAME_VARIANT: - gzcompatname assimp: -- 5.4.1 +- 5.4.2 c_compiler: - vs2019 c_stdlib: @@ -25,7 +25,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -36,9 +36,6 @@ libode: - 0.16.2 libprotobuf: - 4.25.3 -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml b/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml index bb69f66..59d7178 100644 --- a/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml +++ b/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml @@ -1,7 +1,7 @@ GZ_CLI_NAME_VARIANT: - origname assimp: -- 5.4.1 +- 5.4.2 c_compiler: - vs2019 c_stdlib: @@ -25,7 +25,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -36,9 +36,6 @@ libode: - 0.16.2 libprotobuf: - 4.25.3 -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: diff --git a/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml index acfe798..fbeb77d 100644 --- a/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml +++ b/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml @@ -1,7 +1,7 @@ GZ_CLI_NAME_VARIANT: - origname assimp: -- 5.4.1 +- 5.4.2 c_compiler: - vs2019 c_stdlib: @@ -25,7 +25,7 @@ libabseil: libblas: - 3.9 *netlib libboost_devel: -- '1.84' +- '1.86' libcblas: - 3.9 *netlib libcurl: @@ -36,9 +36,6 @@ libode: - 0.16.2 libprotobuf: - 4.25.3 -pin_run_as_build: - graphviz: - max_pin: x qt_main: - '5.15' target_platform: From a52aed39fa280f1e4af93744275fbaffe6b60c2a Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sun, 25 Aug 2024 08:10:25 +1000 Subject: [PATCH 3/6] Create 3397.patch --- recipe/3397.patch | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 recipe/3397.patch diff --git a/recipe/3397.patch b/recipe/3397.patch new file mode 100644 index 0000000..c34632d --- /dev/null +++ b/recipe/3397.patch @@ -0,0 +1,23 @@ +From 0cc96de9cd128c8f2255f022f6e2b1bccc8512c4 Mon Sep 17 00:00:00 2001 +From: Tobias Fischer +Date: Sun, 25 Aug 2024 08:09:21 +1000 +Subject: [PATCH] Boost 1.86 compatibility + +Signed-off-by: Tobias Fischer +--- + gazebo/common/CommonIface.hh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gazebo/common/CommonIface.hh b/gazebo/common/CommonIface.hh +index 82606a8528..a38935250f 100644 +--- a/gazebo/common/CommonIface.hh ++++ b/gazebo/common/CommonIface.hh +@@ -229,7 +229,7 @@ namespace gazebo + std::string common::get_sha1(const T &_buffer) + { + boost::uuids::detail::sha1 sha1; +- unsigned int hash[5]; ++ boost::uuids::detail::sha1::digest_type hash; + std::stringstream stream; + + if (_buffer.size() == 0) From 31d839cd825b1dae4865794843b29d69fe74b430 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sun, 25 Aug 2024 08:10:46 +1000 Subject: [PATCH 4/6] Use 3397.patch --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index c3a24ef..9e8eaa9 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,6 +20,7 @@ source: - 3370.patch - 3380.patch - 3373.patch + - 3397.patch - ffmpeg_5_6_fix.patch build: From 91418d301f38c0741d784269ac159e96f855c642 Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sun, 25 Aug 2024 08:29:21 +1000 Subject: [PATCH 5/6] Create 3386.patch --- recipe/3386.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 recipe/3386.patch diff --git a/recipe/3386.patch b/recipe/3386.patch new file mode 100644 index 0000000..56f2638 --- /dev/null +++ b/recipe/3386.patch @@ -0,0 +1,49 @@ +From 6b4d0f0b94cb2d98e6a48970c1c128e9b4f13e47 Mon Sep 17 00:00:00 2001 +From: Steve Peters +Date: Fri, 10 May 2024 15:39:02 +0200 +Subject: [PATCH 1/2] Fix build with boost 1.85.0 + +Signed-off-by: Steve Peters +--- + gazebo/common/Console.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gazebo/common/Console.cc b/gazebo/common/Console.cc +index 6b86bc2d02..bb4dbe3180 100644 +--- a/gazebo/common/Console.cc ++++ b/gazebo/common/Console.cc +@@ -221,7 +221,7 @@ void FileLogger::Init(const std::string &_prefix, const std::string &_filename) + if (boost::filesystem::is_directory(logPath)) + this->logDirectory = logPath.string(); + else +- this->logDirectory = logPath.branch_path().string(); ++ this->logDirectory = logPath.parent_path().string(); + } + + ///////////////////////////////////////////////// + +From 27c2277a2376f9d82755e975ae8b564d9d6ca6ed Mon Sep 17 00:00:00 2001 +From: Steve Peters +Date: Fri, 10 May 2024 17:43:32 +0200 +Subject: [PATCH 2/2] Fix build error in LogPlay.cc as well + +Signed-off-by: Steve Peters +--- + gazebo/util/LogPlay.cc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gazebo/util/LogPlay.cc b/gazebo/util/LogPlay.cc +index 70cfcc3346..be00820edb 100644 +--- a/gazebo/util/LogPlay.cc ++++ b/gazebo/util/LogPlay.cc +@@ -414,8 +414,8 @@ common::Time LogPlay::LogEndTime() const + ///////////////////////////////////////////////// + std::string LogPlay::Filename() const + { +- return boost::filesystem::basename(this->dataPtr->filename) + +- boost::filesystem::extension(this->dataPtr->filename); ++ boost::filesystem::path path(this->dataPtr->filename); ++ return path.stem().string() + path.extension().string(); + } + + ///////////////////////////////////////////////// From 58a862b445b05723a5de6d128bfb84c9e9a3730d Mon Sep 17 00:00:00 2001 From: Tobias Fischer Date: Sun, 25 Aug 2024 08:29:39 +1000 Subject: [PATCH 6/6] Use 3386.patch --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 9e8eaa9..712e3b0 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -20,6 +20,7 @@ source: - 3370.patch - 3380.patch - 3373.patch + - 3386.patch - 3397.patch - ffmpeg_5_6_fix.patch