Skip to content

Commit

Permalink
Merge pull request #216 from regro-cf-autotick-bot/rebuild-ffmpeg7-0-…
Browse files Browse the repository at this point in the history
…1_h8fbe00

Rebuild for ffmpeg 7
  • Loading branch information
traversaro authored May 16, 2024
2 parents 1cf053f + 0169684 commit 493e813
Show file tree
Hide file tree
Showing 28 changed files with 929 additions and 50 deletions.
44 changes: 32 additions & 12 deletions .azure-pipelines/azure-pipelines-linux.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

40 changes: 28 additions & 12 deletions .azure-pipelines/azure-pipelines-osx.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 14 additions & 6 deletions .azure-pipelines/azure-pipelines-win.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

72 changes: 72 additions & 0 deletions .ci_support/linux_64_GZ_CLI_NAME_VARIANTgzcompatnameffmpeg7.yaml
Original file line number Diff line number Diff line change
@@ -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
72 changes: 72 additions & 0 deletions .ci_support/linux_64_GZ_CLI_NAME_VARIANTorignameffmpeg7.yaml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Loading

0 comments on commit 493e813

Please sign in to comment.