Merge branch 'markus-perl:master' into patch-1

Author: useafterfree

build-ffmpeg

@@ -5,7 +5,7 @@
 
 PROGNAME=$(basename "$0")
 FFMPEG_VERSION=6.0
-SCRIPT_VERSION=1.46
+SCRIPT_VERSION=1.47
 CWD=$(pwd)
 PACKAGES="$CWD/packages"
 WORKSPACE="$CWD/workspace"

cuda-ubuntu.dockerfile

@@ -15,11 +15,10 @@ RUN apt-get update \
     && 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 \
+RUN apt-get -y --no-install-recommends install build-essential curl libva-dev python3 python-is-python3 ninja-build meson cmake \
     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