Remove npp suport

Author: ioppermann

Build.sh

@@ -45,6 +45,7 @@ function build_rpi() {
 
 function build_cuda() {
   export OS_NAME=ubuntu
+  export CUDA_VERSION=13.1.0
   export OS_VERSION=24.04
   export FFMPEG_VERSION=8.0.1
   export FFNVCODEC_VERSION=13.0.19.0
@@ -55,7 +56,7 @@ function build_cuda() {
     --build-arg DEPLOY_IMAGE=nvidia/cuda:$CUDA_VERSION-runtime-ubuntu$OS_VERSION \
     --build-arg FFNVCODEC_VERSION=$FFNVCODEC_VERSION \
     --build-arg FFMPEG_VERSION=$FFMPEG_VERSION \
-    -f Dockerfile.ubuntu.cuda12 \
+    -f Dockerfile.ubuntu.cuda13 \
     -t datarhei/base:ffmpeg${FFMPEG_VERSION}-cuda-ubuntu$OS_VERSION-cuda${CUDA_VERSION} .
 }
 

Dockerfile.ubuntu.cuda13

@@ -1,5 +1,5 @@
-ARG BUILD_IMAGE=nvidia/cuda:13.1.1-devel-ubuntu24.04
-ARG DEPLOY_IMAGE=nvidia/cuda:13.1.1-runtime-ubuntu24.04
+ARG BUILD_IMAGE=nvidia/cuda:13.1.0-devel-ubuntu24.04
+ARG DEPLOY_IMAGE=nvidia/cuda:13.1.0-runtime-ubuntu24.04
 
 FROM $BUILD_IMAGE AS builder
 
@@ -18,7 +18,6 @@ RUN apt-get update -y && \
   curl \
   libcurl4-openssl-dev \
   git \
-  nasm \
   openssl \
   libssl-dev \
   cmake \
@@ -48,7 +47,9 @@ RUN apt-get update -y && \
   libxcb-xfixes0-dev \
   libxcb-shm0-dev \
   libxcb-shape0-dev \
-  zlib1g-dev
+  zlib1g-dev \
+  libnuma1 \
+  libnuma-dev
 
 # install and patch ffmpeg
 RUN mkdir -p /dist && cd /dist && \
@@ -71,6 +72,7 @@ RUN cd /dist/ffmpeg-${FFMPEG_VERSION} && \
   --prefix="${SRC}" \
   --extra-cflags=-I/usr/local/cuda/include \
   --extra-ldflags=-L/usr/local/cuda/lib64 \
+  --nvccflags="-gencode arch=compute_75,code=sm_75 -O2" \
   --enable-nonfree \
   --enable-gpl \
   --enable-version3 \
@@ -83,7 +85,6 @@ RUN cd /dist/ffmpeg-${FFMPEG_VERSION} && \
   --enable-nvdec \
   --enable-nvenc \
   --enable-cuvid \
-  --enable-libnpp \
   --enable-libv4l2 \
   --enable-libfreetype \
   --enable-alsa \