Merge branch 'test/meson_0_58_2'

ffmpeg_4.4.2
Javernaut 3 years ago
commit 3beeb65f75
  1. 2
      .github/workflows/compilability_check.yml
  2. 2
      tools/docker/Dockerfile

@ -12,7 +12,7 @@ jobs:
- name: Setup the environment - name: Setup the environment
run: | run: |
sudo pip3 install meson==0.57.1 sudo pip3 install meson==0.58.2
sudo apt-get install nasm ninja-build sudo apt-get install nasm ninja-build
- name: Executing the script - name: Executing the script

@ -7,7 +7,7 @@ ARG VERSION_NDK=21.4.7075529
ARG VERSION_CMAKE=3.10.2.4988404 ARG VERSION_CMAKE=3.10.2.4988404
# Package to install via pip3 # Package to install via pip3
ARG VERSION_MESON=0.57.1 ARG VERSION_MESON=0.58.2
# The HOME variable isn't available for ENV directive (during building an image). # The HOME variable isn't available for ENV directive (during building an image).
# So we define one manually. For alpine and ubuntu it should be '/root' # So we define one manually. For alpine and ubuntu it should be '/root'

Loading…
Cancel
Save