ubuntu update

Author: Markus Perl

.github/workflows/build.yml

@@ -10,7 +10,7 @@ on:
 jobs:
   build-linux:
     name: build in native linux
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.10
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
@@ -59,19 +59,19 @@ jobs:
 
   build-docker:
     name: build in docker
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.10
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
 
       - name: pull base image
         id: ubuntu_pull
         run: |
-          docker pull ubuntu:20.04
+          docker pull ubuntu:22.10
       - name: run if ubuntu_pull failed
         if: failure() && steps.ubuntu_pull.outcome == 'failure'
         run: |
-          docker pull ubuntu:20.04
+          docker pull ubuntu:22.10
       - name: build ffmpeg
         run: |
           docker build -t ffmpeg:ubuntu -f Dockerfile .
@@ -81,21 +81,21 @@ jobs:
 
   build-cuda-ubuntu-docker:
     name: build in ubuntu docker with cuda
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.10
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
 
       - 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.4.2-devel-ubuntu22.10
+          docker pull ubuntu:22.10
       - 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.4.2-devel-ubuntu22.10
+          docker pull ubuntu:22.10
       - name: build ffmpeg
         run: |
           docker build -t ffmpeg:cuda-ubuntu -f cuda-ubuntu.dockerfile .
@@ -129,19 +129,19 @@ jobs:
 
   build-full-static:
     name: full static build in docker
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.10
     steps:
       - name: Checkout code
         uses: actions/checkout@v2
 
       - name: pull base image
         id: cuda_ubuntu_pull
         run: |
-          docker pull nvidia/cuda:11.4.2-devel-ubuntu20.04
+          docker pull nvidia/cuda:11.4.2-devel-ubuntu22.10
       - 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.4.2-devel-ubuntu22.10
       - name: build ffmpeg
         run: |
           docker build -t ffmpeg:cuda-static -f full-static.dockerfile .

Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:20.04 AS build
+FROM ubuntu:22.10 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.10
 
 ENV DEBIAN_FRONTEND noninteractive
 

build-ffmpeg

@@ -417,15 +417,15 @@ else
     build_done "nettle" "3.8"
   fi
 
-if ! $MACOS_M1; then
+if ! $ARCH == 'arm64'; then
   if build "gnutls" "3.6.16"; then
     download "https://www.gnupg.org/ftp/gcrypt/gnutls/v3.6/gnutls-3.6.16.tar.xz"
     execute ./configure --prefix="${WORKSPACE}" --disable-shared --enable-static --disable-doc --disable-tools --disable-cxx --disable-tests --disable-gtk-doc-html --disable-libdane --disable-nls --enable-local-libopts --disable-guile --with-included-libtasn1 --with-included-unistring --without-p11-kit CPPFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}"
     execute make -j $MJOBS
     execute make install
     build_done "gnutls" "3.6.16"
   fi
-  CONFIGURE_OPTIONS+=("--enable-gmp" "--enable-gnutls")
+ # CONFIGURE_OPTIONS+=("--enable-gmp" "--enable-gnutls")
 fi
 fi
 

full-static.dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:20.04 AS build
+FROM ubuntu:22.10 AS build
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV NVIDIA_VISIBLE_DEVICES all