Merge pull request #8 from markus-perl/master

Sync from upstream

.github/workflows/build.yml

@@ -10,10 +10,10 @@ on:
 jobs:
   build-linux:
     name: build in native linux
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: install libva-dev
         run: |
@@ -37,15 +37,15 @@ jobs:
 
   build-macos:
     name: build in native macOS
-    runs-on: macos-10.15
+    runs-on: macos-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: build ffmpeg
         run: |
           while sleep 300; do echo "=====[ $SECONDS seconds still running ]====="; done &
-          SKIPINSTALL=yes VERBOSE=yes ./build-ffmpeg --build --enable-gpl-and-non-free
+          SKIPINSTALL=yes VERBOSE=yes SKIPRAV1E=yes ./build-ffmpeg --build --enable-gpl-and-non-free
           kill %1
       - name: check shared library
         run: |
@@ -59,19 +59,19 @@ jobs:
 
   build-docker:
     name: build in docker
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: pull base image
         id: ubuntu_pull
         run: |
-          docker pull ubuntu:20.04
+          docker pull ubuntu:22.04
       - name: run if ubuntu_pull failed
         if: failure() && steps.ubuntu_pull.outcome == 'failure'
         run: |
-          docker pull ubuntu:20.04
+          docker pull ubuntu:22.04
       - name: build ffmpeg
         run: |
           docker build -t ffmpeg:ubuntu -f Dockerfile .
@@ -81,70 +81,46 @@ jobs:
 
   build-cuda-ubuntu-docker:
     name: build in ubuntu docker with cuda
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: pull base image
         id: cuda_ubuntu_pull
         run: |
-          docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
-          docker pull ubuntu:20.04
+          docker pull nvidia/cuda:11.8.0-devel-ubuntu22.04
+          docker pull ubuntu:22.04
       - name: run if cuda_ubuntu_pull failed
         if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
         run: |
-          docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
-          docker pull ubuntu:20.04
+          docker pull nvidia/cuda:11.8.0-devel-ubuntu22.04
+          docker pull ubuntu:22.04
       - name: build ffmpeg
         run: |
           docker build -t ffmpeg:cuda-ubuntu -f cuda-ubuntu.dockerfile .
       - name: test run ffmepg
         run: |
           docker run --rm ffmpeg:cuda-ubuntu -buildconf
 
-  build-cuda-centos-docker:
-    name: build in centos docker with cuda
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: pull base image
-        id: cuda_centos_pull
-        run: |
-          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.4.2-devel-centos8
-          docker pull centos:8
-      - name: build ffmpeg
-        run: |
-          docker build -t ffmpeg:cuda-centos -f cuda-centos.dockerfile .
-      - name: test run ffmepg
-        run: |
-          docker run --rm ffmpeg:cuda-centos -buildconf
-
   build-full-static:
     name: full static build in docker
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: pull base image
         id: cuda_ubuntu_pull
         run: |
-          docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
+          docker pull nvidia/cuda:11.8.0-devel-ubuntu22.04
       - name: run if cuda_ubuntu_pull failed
         if: failure() && steps.cuda_ubuntu_pull.outcome == 'failure'
         run: |
-          docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
+          docker pull nvidia/cuda:11.8.0-devel-ubuntu22.04
       - name: build ffmpeg
         run: |
           docker build -t ffmpeg:cuda-static -f full-static.dockerfile .
       - name: test run ffmepg
         run: |
-          docker run --rm ffmpeg:cuda-static -buildconf
+          docker run --rm ffmpeg:cuda-static -buildconf

.gitignore

@@ -3,3 +3,4 @@ workspace
 .idea
 linux
 .artifacts
+build

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:20.04 AS build
+FROM ubuntu:22.04 AS build
 
 ENV DEBIAN_FRONTEND noninteractive
 
@@ -13,7 +13,7 @@ COPY ./build-ffmpeg /app/build-ffmpeg
 
 RUN SKIPINSTALL=yes /app/build-ffmpeg --build
 
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ENV DEBIAN_FRONTEND noninteractive