Merge pull request #5 from descriptinc/master-2021-10-25

Bring ffmpeg-build-script master branch up-to-date with the upstream repo

Author: AlabasterAxe

.github/workflows/build.yml

@@ -23,7 +23,7 @@ jobs:
       - name: build ffmpeg
         run: |
           while sleep 300; do echo "=====[ $SECONDS seconds still running ]====="; done &
-          SKIPINSTALL=yes VERBOSE=yes ./build-ffmpeg --build
+          SKIPINSTALL=yes VERBOSE=yes ./build-ffmpeg --build --enable-gpl-and-non-free
           kill %1
       - name: check shared library
         run: |
@@ -45,7 +45,7 @@ jobs:
       - name: build ffmpeg
         run: |
           while sleep 300; do echo "=====[ $SECONDS seconds still running ]====="; done &
-          SKIPINSTALL=yes VERBOSE=yes ./build-ffmpeg --build
+          SKIPINSTALL=yes VERBOSE=yes ./build-ffmpeg --build --enable-gpl-and-non-free
           kill %1
       - name: check shared library
         run: |
@@ -89,12 +89,12 @@ jobs:
       - name: pull base image
         id: cuda_ubuntu_pull
         run: |
-          docker pull nvidia/cuda:11.1-devel-ubuntu20.04
+          docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
           docker pull ubuntu:20.04
       - name: run if cuda_ubuntu_pull failed
         if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
         run: |
-          docker pull nvidia/cuda:11.1-devel-ubuntu20.04
+          docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
           docker pull ubuntu:20.04
       - name: build ffmpeg
         run: |
@@ -113,12 +113,12 @@ jobs:
       - name: pull base image
         id: cuda_centos_pull
         run: |
-          docker pull nvidia/cuda:11.1-devel-centos8
+          docker pull nvidia/cuda:11.4.2-devel-centos8
           docker pull centos:8
       - name: run if cuda_centos_pull failed
         if: failure() && steps.cuda_centos_pull.outcome == 'failure'
         run: |
-          docker pull nvidia/cuda:11.1-devel-centos8
+          docker pull nvidia/cuda:11.4.2-devel-centos8
           docker pull centos:8
       - name: build ffmpeg
         run: |
@@ -137,11 +137,11 @@ jobs:
       - name: pull base image
         id: cuda_ubuntu_pull
         run: |
-          docker pull nvidia/cuda:11.1-devel-ubuntu20.04
+          docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
       - name: run if cuda_ubuntu_pull failed
         if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
         run: |
-          docker pull nvidia/cuda:11.1-devel-ubuntu20.04
+          docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
       - name: build ffmpeg
         run: |
           docker build -t ffmpeg:cuda-static -f full-static.dockerfile .

Dockerfile

@@ -3,7 +3,8 @@ FROM ubuntu:20.04 AS build
 ENV DEBIAN_FRONTEND noninteractive
 
 RUN apt-get update \
-    && apt-get -y --no-install-recommends install build-essential curl ca-certificates libva-dev python \
+    && apt-get -y --no-install-recommends install build-essential curl ca-certificates libva-dev \
+        python3 python-is-python3 ninja-build meson \
     && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
     && update-ca-certificates
 
@@ -32,4 +33,4 @@ RUN ldd /usr/bin/ffprobe
 RUN ldd /usr/bin/ffplay
 
 CMD         ["--help"]
-ENTRYPOINT  ["/usr/bin/ffmpeg"]
+ENTRYPOINT  ["/usr/bin/ffmpeg"]