From 9e1733de94ed8538e71ed43b05ecf6e7023e1901 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 15 May 2024 07:53:41 +0000 Subject: [PATCH 1/6] Rebuild for ffmpeg 7 --- .ci_support/migrations/ffmpeg7.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 .ci_support/migrations/ffmpeg7.yaml diff --git a/.ci_support/migrations/ffmpeg7.yaml b/.ci_support/migrations/ffmpeg7.yaml new file mode 100644 index 0000000..ba8f6e9 --- /dev/null +++ b/.ci_support/migrations/ffmpeg7.yaml @@ -0,0 +1,9 @@ +__migrator: + build_number: 1 + commit_message: Rebuild for ffmpeg 7 + kind: version + migration_number: 1 +ffmpeg: +- '6' +- '7' +migrator_ts: 1714879707.672227 From d47f3d367d8a33ef047a9494504a1b03dca7b8d1 Mon Sep 17 00:00:00 2001 From: regro-cf-autotick-bot <36490558+regro-cf-autotick-bot@users.noreply.github.com> Date: Wed, 15 May 2024 07:56:10 +0000 Subject: [PATCH 2/6] MNT: Re-rendered with conda-build 24.5.0, conda-smithy 3.35.1, and conda-forge-pinning 2024.05.15.06.35.15 --- .azure-pipelines/azure-pipelines-linux.yml | 44 +++++-- .azure-pipelines/azure-pipelines-osx.yml | 40 +++++-- .azure-pipelines/azure-pipelines-win.yml | 20 +++- ..._CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml} | 0 ...Z_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml | 72 ++++++++++++ ...4_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml} | 0 ...64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml | 72 ++++++++++++ ..._CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml} | 0 ...Z_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml | 76 ++++++++++++ ...4_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml} | 0 ...64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml | 76 ++++++++++++ ..._CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml} | 0 ...Z_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml | 74 ++++++++++++ ...4_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml} | 0 ...64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml | 74 ++++++++++++ ..._CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml} | 0 ...Z_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml | 72 ++++++++++++ ...4_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml} | 0 ...64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml | 72 ++++++++++++ ..._CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml} | 0 ...Z_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml | 51 ++++++++ ...4_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml} | 0 ...64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml | 51 ++++++++ README.md | 110 ++++++++++++++---- 24 files changed, 854 insertions(+), 50 deletions(-) rename .ci_support/{linux_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml => linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml} (100%) create mode 100644 .ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml rename .ci_support/{linux_64_GZ_CLI_NAME_VARIANTorigname.yaml => linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml} (100%) create mode 100644 .ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml rename .ci_support/{linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatname.yaml => linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml} (100%) create mode 100644 .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml rename .ci_support/{linux_aarch64_GZ_CLI_NAME_VARIANTorigname.yaml => linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml} (100%) create mode 100644 .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml rename .ci_support/{osx_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml => osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml} (100%) create mode 100644 .ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml rename .ci_support/{osx_64_GZ_CLI_NAME_VARIANTorigname.yaml => osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml} (100%) create mode 100644 .ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml rename .ci_support/{osx_arm64_GZ_CLI_NAME_VARIANTgzcompatname.yaml => osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml} (100%) create mode 100644 .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml rename .ci_support/{osx_arm64_GZ_CLI_NAME_VARIANTorigname.yaml => osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml} (100%) create mode 100644 .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml rename .ci_support/{win_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml => win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml} (100%) create mode 100644 .ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml rename .ci_support/{win_64_GZ_CLI_NAME_VARIANTorigname.yaml => win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml} (100%) create mode 100644 .ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml diff --git a/.azure-pipelines/azure-pipelines-linux.yml b/.azure-pipelines/azure-pipelines-linux.yml index d0c7a67..846b398 100755 --- a/.azure-pipelines/azure-pipelines-linux.yml +++ b/.azure-pipelines/azure-pipelines-linux.yml @@ -8,26 +8,46 @@ jobs: vmImage: ubuntu-latest strategy: matrix: - linux_64_GZ_CLI_NAME_VARIANTgzcompatname: - CONFIG: linux_64_GZ_CLI_NAME_VARIANTgzcompatname + linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6: + CONFIG: linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_GZ_CLI_NAME_VARIANTgzcompatname - linux_64_GZ_CLI_NAME_VARIANTorigname: - CONFIG: linux_64_GZ_CLI_NAME_VARIANTorigname + SHORT_CONFIG: linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 + linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7: + CONFIG: linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_64_GZ_CLI_NAME_VARIANTorigname - linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatname: - CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatname + SHORT_CONFIG: linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 + linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6: + CONFIG: linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatname - linux_aarch64_GZ_CLI_NAME_VARIANTorigname: - CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTorigname + SHORT_CONFIG: linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6 + linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7: + CONFIG: linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7 UPLOAD_PACKAGES: 'True' DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 - SHORT_CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTorigname + SHORT_CONFIG: linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7 + linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6: + CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTgz_hb084554797 + linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7: + CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTgz_hda111d1591 + linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6: + CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6 + linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7: + CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7 + UPLOAD_PACKAGES: 'True' + DOCKER_IMAGE: quay.io/condaforge/linux-anvil-cos7-x86_64 + SHORT_CONFIG: linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-osx.yml b/.azure-pipelines/azure-pipelines-osx.yml index 2787fe6..f576bc5 100755 --- a/.azure-pipelines/azure-pipelines-osx.yml +++ b/.azure-pipelines/azure-pipelines-osx.yml @@ -8,22 +8,38 @@ jobs: vmImage: macOS-12 strategy: matrix: - osx_64_GZ_CLI_NAME_VARIANTgzcompatname: - CONFIG: osx_64_GZ_CLI_NAME_VARIANTgzcompatname + osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6: + CONFIG: osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_GZ_CLI_NAME_VARIANTgzcompatname - osx_64_GZ_CLI_NAME_VARIANTorigname: - CONFIG: osx_64_GZ_CLI_NAME_VARIANTorigname + SHORT_CONFIG: osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 + osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7: + CONFIG: osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_64_GZ_CLI_NAME_VARIANTorigname - osx_arm64_GZ_CLI_NAME_VARIANTgzcompatname: - CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTgzcompatname + SHORT_CONFIG: osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 + osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6: + CONFIG: osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTgzcompatname - osx_arm64_GZ_CLI_NAME_VARIANTorigname: - CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTorigname + SHORT_CONFIG: osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6 + osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7: + CONFIG: osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTorigname + SHORT_CONFIG: osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7 + osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6: + CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 + osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7: + CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 + osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6: + CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6 + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6 + osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7: + CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7 + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7 timeoutInMinutes: 360 variables: {} diff --git a/.azure-pipelines/azure-pipelines-win.yml b/.azure-pipelines/azure-pipelines-win.yml index cdb5c93..51145be 100755 --- a/.azure-pipelines/azure-pipelines-win.yml +++ b/.azure-pipelines/azure-pipelines-win.yml @@ -8,14 +8,22 @@ jobs: vmImage: windows-2022 strategy: matrix: - win_64_GZ_CLI_NAME_VARIANTgzcompatname: - CONFIG: win_64_GZ_CLI_NAME_VARIANTgzcompatname + win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6: + CONFIG: win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_GZ_CLI_NAME_VARIANTgzcompatname - win_64_GZ_CLI_NAME_VARIANTorigname: - CONFIG: win_64_GZ_CLI_NAME_VARIANTorigname + SHORT_CONFIG: win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 + win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7: + CONFIG: win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 UPLOAD_PACKAGES: 'True' - SHORT_CONFIG: win_64_GZ_CLI_NAME_VARIANTorigname + SHORT_CONFIG: win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 + win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6: + CONFIG: win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6 + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6 + win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7: + CONFIG: win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7 + UPLOAD_PACKAGES: 'True' + SHORT_CONFIG: win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7 timeoutInMinutes: 360 variables: CONDA_BLD_PATH: D:\\bld\\ diff --git a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml similarity index 100% rename from .ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml rename to .ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml diff --git a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml new file mode 100644 index 0000000..3d0026b --- /dev/null +++ b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml @@ -0,0 +1,72 @@ +GZ_CLI_NAME_VARIANT: +- gzcompatname +assimp: +- 5.3.1 +bullet_cpp: +- '3.25' +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '8' +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +ffmpeg: +- '7' +graphviz: +- '9' +hdf5: +- 1.14.3 +libabseil: +- '20240116' +libblas: +- 3.9 *netlib +libboost_devel: +- '1.84' +libcblas: +- 3.9 *netlib +libcurl: +- '8' +libgdal: +- '3.9' +libode: +- 0.16.2 +libprotobuf: +- 4.25.3 +libuuid: +- '2' +libxcb: +- '1.15' +pin_run_as_build: + graphviz: + max_pin: x +qt_main: +- '5.15' +target_platform: +- linux-64 +tbb_devel: +- '2021' +tinyxml2: +- '10' +urdfdom: +- '4.0' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorigname.yaml b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml similarity index 100% rename from .ci_support/linux_64_GZ_CLI_NAME_VARIANTorigname.yaml rename to .ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml diff --git a/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml new file mode 100644 index 0000000..0c89fdf --- /dev/null +++ b/.ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml @@ -0,0 +1,72 @@ +GZ_CLI_NAME_VARIANT: +- origname +assimp: +- 5.3.1 +bullet_cpp: +- '3.25' +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '8' +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +ffmpeg: +- '7' +graphviz: +- '9' +hdf5: +- 1.14.3 +libabseil: +- '20240116' +libblas: +- 3.9 *netlib +libboost_devel: +- '1.84' +libcblas: +- 3.9 *netlib +libcurl: +- '8' +libgdal: +- '3.9' +libode: +- 0.16.2 +libprotobuf: +- 4.25.3 +libuuid: +- '2' +libxcb: +- '1.15' +pin_run_as_build: + graphviz: + max_pin: x +qt_main: +- '5.15' +target_platform: +- linux-64 +tbb_devel: +- '2021' +tinyxml2: +- '10' +urdfdom: +- '4.0' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatname.yaml b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml similarity index 100% rename from .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatname.yaml rename to .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml diff --git a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml new file mode 100644 index 0000000..81a529d --- /dev/null +++ b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml @@ -0,0 +1,76 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +GZ_CLI_NAME_VARIANT: +- gzcompatname +assimp: +- 5.3.1 +bullet_cpp: +- '3.25' +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '8' +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +ffmpeg: +- '7' +graphviz: +- '9' +hdf5: +- 1.14.3 +libabseil: +- '20240116' +libblas: +- 3.9 *netlib +libboost_devel: +- '1.84' +libcblas: +- 3.9 *netlib +libcurl: +- '8' +libgdal: +- '3.9' +libode: +- 0.16.2 +libprotobuf: +- 4.25.3 +libuuid: +- '2' +libxcb: +- '1.15' +pin_run_as_build: + graphviz: + max_pin: x +qt_main: +- '5.15' +target_platform: +- linux-aarch64 +tbb_devel: +- '2021' +tinyxml2: +- '10' +urdfdom: +- '4.0' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorigname.yaml b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml similarity index 100% rename from .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorigname.yaml rename to .ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml diff --git a/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml new file mode 100644 index 0000000..5e6d976 --- /dev/null +++ b/.ci_support/linux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml @@ -0,0 +1,76 @@ +BUILD: +- aarch64-conda_cos7-linux-gnu +GZ_CLI_NAME_VARIANT: +- origname +assimp: +- 5.3.1 +bullet_cpp: +- '3.25' +c_compiler: +- gcc +c_compiler_version: +- '12' +c_stdlib: +- sysroot +c_stdlib_version: +- '2.17' +cdt_arch: +- aarch64 +cdt_name: +- cos7 +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '8' +cxx_compiler: +- gxx +cxx_compiler_version: +- '12' +docker_image: +- quay.io/condaforge/linux-anvil-cos7-x86_64 +ffmpeg: +- '7' +graphviz: +- '9' +hdf5: +- 1.14.3 +libabseil: +- '20240116' +libblas: +- 3.9 *netlib +libboost_devel: +- '1.84' +libcblas: +- 3.9 *netlib +libcurl: +- '8' +libgdal: +- '3.9' +libode: +- 0.16.2 +libprotobuf: +- 4.25.3 +libuuid: +- '2' +libxcb: +- '1.15' +pin_run_as_build: + graphviz: + max_pin: x +qt_main: +- '5.15' +target_platform: +- linux-aarch64 +tbb_devel: +- '2021' +tinyxml2: +- '10' +urdfdom: +- '4.0' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +- - c_stdlib_version + - cdt_name diff --git a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml similarity index 100% rename from .ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml rename to .ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml diff --git a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml new file mode 100644 index 0000000..8ba9f58 --- /dev/null +++ b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml @@ -0,0 +1,74 @@ +GZ_CLI_NAME_VARIANT: +- gzcompatname +MACOSX_DEPLOYMENT_TARGET: +- '10.15' +assimp: +- 5.3.1 +bullet_cpp: +- '3.25' +bzip2: +- '1' +c_compiler: +- clang +c_compiler_version: +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '8' +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +ffmpeg: +- '7' +graphviz: +- '9' +hdf5: +- 1.14.3 +libabseil: +- '20240116' +libblas: +- 3.9 *netlib +libboost_devel: +- '1.84' +libcblas: +- 3.9 *netlib +libcurl: +- '8' +libgdal: +- '3.9' +libode: +- 0.16.2 +libprotobuf: +- 4.25.3 +libxcb: +- '1.15' +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: +- osx-64 +tbb_devel: +- '2021' +tinyxml2: +- '10' +urdfdom: +- '4.0' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorigname.yaml b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml similarity index 100% rename from .ci_support/osx_64_GZ_CLI_NAME_VARIANTorigname.yaml rename to .ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml diff --git a/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml new file mode 100644 index 0000000..b091538 --- /dev/null +++ b/.ci_support/osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml @@ -0,0 +1,74 @@ +GZ_CLI_NAME_VARIANT: +- origname +MACOSX_DEPLOYMENT_TARGET: +- '10.15' +assimp: +- 5.3.1 +bullet_cpp: +- '3.25' +bzip2: +- '1' +c_compiler: +- clang +c_compiler_version: +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '10.15' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '8' +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +ffmpeg: +- '7' +graphviz: +- '9' +hdf5: +- 1.14.3 +libabseil: +- '20240116' +libblas: +- 3.9 *netlib +libboost_devel: +- '1.84' +libcblas: +- 3.9 *netlib +libcurl: +- '8' +libgdal: +- '3.9' +libode: +- 0.16.2 +libprotobuf: +- 4.25.3 +libxcb: +- '1.15' +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: +- osx-64 +tbb_devel: +- '2021' +tinyxml2: +- '10' +urdfdom: +- '4.0' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatname.yaml b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml similarity index 100% rename from .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatname.yaml rename to .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml diff --git a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml new file mode 100644 index 0000000..19e9b35 --- /dev/null +++ b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml @@ -0,0 +1,72 @@ +GZ_CLI_NAME_VARIANT: +- gzcompatname +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +assimp: +- 5.3.1 +bullet_cpp: +- '3.25' +bzip2: +- '1' +c_compiler: +- clang +c_compiler_version: +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '8' +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +ffmpeg: +- '7' +graphviz: +- '9' +hdf5: +- 1.14.3 +libabseil: +- '20240116' +libblas: +- 3.9 *netlib +libboost_devel: +- '1.84' +libcblas: +- 3.9 *netlib +libcurl: +- '8' +libgdal: +- '3.9' +libode: +- 0.16.2 +libprotobuf: +- 4.25.3 +libxcb: +- '1.15' +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + graphviz: + max_pin: x +qt_main: +- '5.15' +target_platform: +- osx-arm64 +tbb_devel: +- '2021' +tinyxml2: +- '10' +urdfdom: +- '4.0' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorigname.yaml b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml similarity index 100% rename from .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorigname.yaml rename to .ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml diff --git a/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml new file mode 100644 index 0000000..e316fa0 --- /dev/null +++ b/.ci_support/osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml @@ -0,0 +1,72 @@ +GZ_CLI_NAME_VARIANT: +- origname +MACOSX_DEPLOYMENT_TARGET: +- '11.0' +assimp: +- 5.3.1 +bullet_cpp: +- '3.25' +bzip2: +- '1' +c_compiler: +- clang +c_compiler_version: +- '16' +c_stdlib: +- macosx_deployment_target +c_stdlib_version: +- '11.0' +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '8' +cxx_compiler: +- clangxx +cxx_compiler_version: +- '16' +ffmpeg: +- '7' +graphviz: +- '9' +hdf5: +- 1.14.3 +libabseil: +- '20240116' +libblas: +- 3.9 *netlib +libboost_devel: +- '1.84' +libcblas: +- 3.9 *netlib +libcurl: +- '8' +libgdal: +- '3.9' +libode: +- 0.16.2 +libprotobuf: +- 4.25.3 +libxcb: +- '1.15' +macos_machine: +- arm64-apple-darwin20.0.0 +pin_run_as_build: + graphviz: + max_pin: x +qt_main: +- '5.15' +target_platform: +- osx-arm64 +tbb_devel: +- '2021' +tinyxml2: +- '10' +urdfdom: +- '4.0' +zip_keys: +- - c_compiler_version + - cxx_compiler_version +zlib: +- '1.2' diff --git a/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml b/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml similarity index 100% rename from .ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatname.yaml rename to .ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6.yaml diff --git a/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml b/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml new file mode 100644 index 0000000..ce21a05 --- /dev/null +++ b/.ci_support/win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml @@ -0,0 +1,51 @@ +GZ_CLI_NAME_VARIANT: +- gzcompatname +assimp: +- 5.3.1 +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '8' +cxx_compiler: +- vs2019 +ffmpeg: +- '7' +graphviz: +- '9' +hdf5: +- 1.14.3 +libabseil: +- '20240116' +libblas: +- 3.9 *netlib +libboost_devel: +- '1.84' +libcblas: +- 3.9 *netlib +libcurl: +- '8' +libgdal: +- '3.9' +libode: +- 0.16.2 +libprotobuf: +- 4.25.3 +pin_run_as_build: + graphviz: + max_pin: x +qt_main: +- '5.15' +target_platform: +- win-64 +tbb_devel: +- '2021' +tinyxml2: +- '10' +urdfdom: +- '4.0' diff --git a/.ci_support/win_64_GZ_CLI_NAME_VARIANTorigname.yaml b/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml similarity index 100% rename from .ci_support/win_64_GZ_CLI_NAME_VARIANTorigname.yaml rename to .ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6.yaml diff --git a/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml b/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml new file mode 100644 index 0000000..a632004 --- /dev/null +++ b/.ci_support/win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml @@ -0,0 +1,51 @@ +GZ_CLI_NAME_VARIANT: +- origname +assimp: +- 5.3.1 +c_compiler: +- vs2019 +c_stdlib: +- vs +channel_sources: +- conda-forge +channel_targets: +- conda-forge main +curl: +- '8' +cxx_compiler: +- vs2019 +ffmpeg: +- '7' +graphviz: +- '9' +hdf5: +- 1.14.3 +libabseil: +- '20240116' +libblas: +- 3.9 *netlib +libboost_devel: +- '1.84' +libcblas: +- 3.9 *netlib +libcurl: +- '8' +libgdal: +- '3.9' +libode: +- 0.16.2 +libprotobuf: +- 4.25.3 +pin_run_as_build: + graphviz: + max_pin: x +qt_main: +- '5.15' +target_platform: +- win-64 +tbb_devel: +- '2021' +tinyxml2: +- '10' +urdfdom: +- '4.0' diff --git a/README.md b/README.md index 54062c5..75dff2d 100644 --- a/README.md +++ b/README.md @@ -35,73 +35,143 @@ Current build status - + - + - + - + - + - + - + - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From c0ec5b38d6fb90edca49a503c9b71be26c6f5ac3 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 15 May 2024 10:19:28 +0200 Subject: [PATCH 3/6] Create 3380.patch --- recipe/3380.patch | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 recipe/3380.patch diff --git a/recipe/3380.patch b/recipe/3380.patch new file mode 100644 index 0000000..98a5ffa --- /dev/null +++ b/recipe/3380.patch @@ -0,0 +1,34 @@ +From 6ad1f2aa8501a2544d78de6dc286ef83ef238245 Mon Sep 17 00:00:00 2001 +From: Steve Peters +Date: Fri, 12 Apr 2024 14:16:25 -0700 +Subject: [PATCH] AudioDecoder: support ffmpeg 7.0 + +Signed-off-by: Steve Peters +--- + gazebo/common/AudioDecoder.cc | 24 +++++++----------------- + 1 file changed, 7 insertions(+), 17 deletions(-) + +diff --git a/gazebo/common/AudioDecoder.cc b/gazebo/common/AudioDecoder.cc +index e798d60c27..18ca3b5dd2 100644 +--- a/gazebo/common/AudioDecoder.cc ++++ b/gazebo/common/AudioDecoder.cc +@@ -138,12 +138,18 @@ bool AudioDecoder::Decode(uint8_t **_outBuffer, unsigned int *_outBufferSize) + return false; + } + ++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(59, 24, 100) ++ int numChannels = this->codecCtx->ch_layout.nb_channels; ++#else ++ int numChannels = this->codecCtx->channels; ++#endif ++ + // Total size of the data. Some padding can be added to + // decodedFrame->data[0], which is why we can't use + // decodedFrame->linesize[0]. + int size = decodedFrame->nb_samples * + av_get_bytes_per_sample(this->codecCtx->sample_fmt) * +- this->codecCtx->channels; ++ numChannels; + + // Resize the audio buffer as necessary + if (*_outBufferSize + size > maxBufferSize) From 9ee3b4d0b25ec9513274a1a4af0604b95c13473e Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 15 May 2024 10:19:44 +0200 Subject: [PATCH 4/6] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 40b1f88..5b17d67 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -18,6 +18,7 @@ source: - fix-invisible-meshes.patch - 3368.patch - 3370.patch + - 3380.patch build: number: {{ number }} From d9b9b48d1c8b66c306a40200a22a8d979f5846ba Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 15 May 2024 12:10:25 +0200 Subject: [PATCH 5/6] Create ffmpeg_5_6_fix.patch --- recipe/ffmpeg_5_6_fix.patch | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 recipe/ffmpeg_5_6_fix.patch diff --git a/recipe/ffmpeg_5_6_fix.patch b/recipe/ffmpeg_5_6_fix.patch new file mode 100644 index 0000000..4481e03 --- /dev/null +++ b/recipe/ffmpeg_5_6_fix.patch @@ -0,0 +1,30 @@ +From c5b740dc1099fbf0e9dc8ca2cf8e2ae72515eddd Mon Sep 17 00:00:00 2001 +From: Silvio Traversaro +Date: Wed, 15 May 2024 12:09:39 +0200 +Subject: [PATCH] Update AudioDecoder.cc + +Signed-off-by: Silvio Traversaro +--- + gazebo/common/AudioDecoder.cc | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/gazebo/common/AudioDecoder.cc b/gazebo/common/AudioDecoder.cc +index e798d60c27..7b689a6e52 100644 +--- a/gazebo/common/AudioDecoder.cc ++++ b/gazebo/common/AudioDecoder.cc +@@ -335,6 +335,7 @@ bool AudioDecoder::SetFile(const std::string &_filename) + // conda-forge with 5.0.0 h594f047_1 this is not happening for some reason. + // As temporary workaround, we copy directly the data structures, taking the code from + // https://github.com/FFmpeg/FFmpeg/blob/n5.0/libavcodec/codec_par.c#L120 ++#if LIBAVFORMAT_VERSION_MAJOR < 61 + AVCodecParameters* par = this->formatCtx->streams[this->audioStream]->codecpar; + this->codecCtx->sample_fmt = static_cast(par->format); + this->codecCtx->channel_layout = par->channel_layout; +@@ -346,6 +347,7 @@ bool AudioDecoder::SetFile(const std::string &_filename) + this->codecCtx->initial_padding = par->initial_padding; + this->codecCtx->trailing_padding = par->trailing_padding; + this->codecCtx->seek_preroll = par->seek_preroll; ++#endif + + // It would be better to just define codec as const AVCodec *, + // but that is not done to avoid ABI problem. Anyhow, as codec From 01696840626b6b8a3cb719908d84c618053af535 Mon Sep 17 00:00:00 2001 From: Silvio Traversaro Date: Wed, 15 May 2024 12:10:56 +0200 Subject: [PATCH 6/6] Update meta.yaml --- recipe/meta.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/recipe/meta.yaml b/recipe/meta.yaml index 5b17d67..ccc8575 100644 --- a/recipe/meta.yaml +++ b/recipe/meta.yaml @@ -19,6 +19,7 @@ source: - 3368.patch - 3370.patch - 3380.patch + - ffmpeg_5_6_fix.patch build: number: {{ number }}
VariantStatus
linux_64_GZ_CLI_NAME_VARIANTgzcompatnamelinux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 - variant + variant
linux_64_GZ_CLI_NAME_VARIANTorignamelinux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 - variant + variant
linux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnamelinux_64_GZ_CLI_NAME_VARIANTorignameffmpeg6 - variant + variant
linux_aarch64_GZ_CLI_NAME_VARIANTorignamelinux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7 - variant + variant
osx_64_GZ_CLI_NAME_VARIANTgzcompatnamelinux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 - variant + variant
osx_64_GZ_CLI_NAME_VARIANTorignamelinux_aarch64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 - variant + variant
osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnamelinux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg6 - variant + variant
osx_arm64_GZ_CLI_NAME_VARIANTorignamelinux_aarch64_GZ_CLI_NAME_VARIANTorignameffmpeg7 - variant + variant
win_64_GZ_CLI_NAME_VARIANTgzcompatnameosx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 - variant + variant
win_64_GZ_CLI_NAME_VARIANTorignameosx_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 - variant + variant + +
osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg6 + + variant + +
osx_64_GZ_CLI_NAME_VARIANTorignameffmpeg7 + + variant + +
osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 + + variant + +
osx_arm64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 + + variant + +
osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg6 + + variant + +
osx_arm64_GZ_CLI_NAME_VARIANTorignameffmpeg7 + + variant + +
win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg6 + + variant + +
win_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7 + + variant + +
win_64_GZ_CLI_NAME_VARIANTorignameffmpeg6 + + variant + +
win_64_GZ_CLI_NAME_VARIANTorignameffmpeg7 + + variant