Cuda fixes

Author: Markus Perl

.github/workflows/build.yml

@@ -103,30 +103,6 @@ jobs:
         run: |
           docker run --rm ffmpeg:cuda-ubuntu -buildconf
 
-  build-cuda-rocky-docker:
-    name: build in Rockylinux docker with cuda
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: pull base image
-        id: cuda_centos_pull
-        run: |
-          docker pull nvidia/cuda:11.6.0-devel-centos8
-          docker pull rockylinux:8
-      - name: run if cuda_centos_pull failed
-        if: failure() && steps.cuda_centos_pull.outcome == 'failure'
-        run: |
-          docker pull nvidia/cuda:11.6.0-devel-centos8
-          docker pull rockylinux:8
-      - name: build ffmpeg
-        run: |
-          docker build -t ffmpeg:cuda-rocky -f cuda-rocky.dockerfile .
-      - name: test run ffmepg
-        run: |
-          docker run --rm ffmpeg:cuda-rocky -buildconf
-
   build-full-static:
     name: full static build in docker
     runs-on: ubuntu-22.04

.gitignore

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

README.md

@@ -150,14 +150,9 @@ $ docker build --tag=ffmpeg:default --output type=local,dest=build -f Dockerfile
 ##### CUDA
 These builds are always built with the --enable-gpl-and-non-free switch, as CUDA is non-free. See https://ffmpeg.org/legal.html
 ```bash
-export DOCKER_BUILDKIT=1
-
-## Set the DIST (`ubuntu` or `rocky`) and VER (ubuntu: `16.04` , `18.04`, `20.04` or rocky: `8`) environment variables to select the preferred Docker base image.
-$ export DIST=centos
-$ export VER=8
 
 ## Start the build
-$ docker build --tag=ffmpeg:cuda-$DIST -f cuda-$DIST.dockerfile --build-arg VER=$VER .
+$ docker build --tag=ffmpeg:cuda-$DIST -f cuda-ubunu.dockerfile --build-arg .
 ```
 
 Build an `export.dockerfile` that copies only what you need from the image you just built as follows. When running,

build-ffmpeg

@@ -878,7 +878,7 @@ if [[ "$OSTYPE" == "linux-gnu" ]]; then
     fi
     CFLAGS+=" -I/usr/local/cuda/include"
     LDFLAGS+=" -L/usr/local/cuda/lib64"
-    CONFIGURE_OPTIONS+=("--enable-cuda-nvcc" "--enable-nvenc" "--enable-cuda-llvm")
+    CONFIGURE_OPTIONS+=("--enable-cuda-nvcc" "--enable-cuvid" "--enable-nvenc" "--enable-cuda-llvm")
 
     if [ -z "$LDEXEFLAGS" ]; then
       CONFIGURE_OPTIONS+=("--enable-libnpp") # Only libnpp cannot be statically linked.

cuda-rocky.dockerfile

@@ -1,15 +1,24 @@
 ARG VER=22.04
 
-FROM nvidia/cuda:11.8.0-devel-ubuntu${VER} AS build
+FROM ubuntu:${VER} AS build
+
+ARG CUDAVER=11.8.0-1
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV NVIDIA_VISIBLE_DEVICES all
 ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
 
 RUN apt-get update \
-    && 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
+    && apt-get -y --no-install-recommends install wget ca-certificates \
+    && update-ca-certificates \
+    && wget https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/x86_64/cuda-keyring_1.0-1_all.deb \
+    && dpkg -i cuda-keyring_1.0-1_all.deb \
+    && apt-get update
+
+RUN apt-get -y --no-install-recommends install build-essential curl libva-dev python3 python-is-python3 ninja-build meson \
+    cuda="${CUDAVER}" \
+    && apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
+
 
 WORKDIR /app
 COPY ./build-ffmpeg /app/build-ffmpeg