Upgrad CUDA build to jammy

datarhei · Apr 3, 2024 · 08ff593 · 08ff593
1 parent f10337f
commit 08ff593
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 23 deletions.
diff --git a/Build.ubuntu.cuda.env b/Build.ubuntu.cuda.env
@@ -1,5 +1,5 @@
 # FFMPEG CUDA PACKAGES
-OS_VERSION=20.04
+OS_VERSION=22.04
 XML2_VERSION=2.9.14
 CUDA_VERSION=11.7.1
 FFNVCODEC_VERSION=11.1.5.3
diff --git a/Dockerfile.ubuntu.cuda b/Dockerfile.ubuntu.cuda
@@ -36,10 +36,21 @@ RUN apt-get update -y && \
   build-essential \
   libtool \
   autoconf \
+  libx265-dev \
   libv4l-dev \
   libasound2-dev \
   rust-all \
-  meson
+  meson \
+  zlib1g-dev
+
+# install librav1e
+RUN mkdir -p /dist && cd /dist && \
+  curl -OLk https://github.com/xiph/rav1e/archive/refs/tags/v${RAV1E_VERSION}.tar.gz && \
+  tar xfvz v${RAV1E_VERSION}.tar.gz && \
+  rm v${RAV1E_VERSION}.tar.gz && \
+  cd rav1e-${RAV1E_VERSION} && \
+  cargo install cargo-c && \
+  cargo cinstall --release
 
 # install libxml2
 RUN mkdir -p /dist && cd /dist && \
@@ -64,15 +75,6 @@ RUN mkdir -p /dist && cd /dist && \
   meson setup .. && \
   ninja && ninja install
 
-# install librav1e
-RUN mkdir -p /dist && cd /dist && \
-  curl -OLk https://github.com/xiph/rav1e/archive/refs/tags/v${RAV1E_VERSION}.tar.gz && \
-  tar xfvz v${RAV1E_VERSION}.tar.gz && \
-  rm v${RAV1E_VERSION}.tar.gz && \
-  cd rav1e-${RAV1E_VERSION} && \
-  cargo install cargo-c && \
-  cargo cinstall --release
-
 # install x264
 RUN mkdir -p /dist && cd /dist && \
   curl -OLk https://code.videolan.org/videolan/x264/-/archive/stable/x264-${X264_VERSION}.tar.gz && \
@@ -86,18 +88,6 @@ RUN mkdir -p /dist && cd /dist && \
   make -j$(nproc) && \
   make install
 
-# install x265
-RUN mkdir -p /dist && cd /dist && \
-  curl -OLk https://bitbucket.org/multicoreware/x265_git/downloads/x265_${X265_VERSION}.tar.gz && \
-  tar xfvz x265_${X265_VERSION}.tar.gz && \
-  rm x265_${X265_VERSION}.tar.gz && \
-  cd x265_${X265_VERSION}/build/linux \
-  sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_SRC=\${SRC}/" multilib.sh && \
-  sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \
-  ./multilib.sh && \
-  make -j$(nproc) -C 8bit && \
-  make install
-
 # install opus
 RUN mkdir -p /dist && cd /dist && \
   curl -OLk https://downloads.xiph.org/releases/opus/opus-${OPUS_VERSION}.tar.gz && \
@@ -254,6 +244,8 @@ RUN echo "/usr/local/lib" > /etc/ld.so.conf.d/ffmpeg.conf && \
   apt-get install -y \
   v4l-utils \
   fbset \
+  x265 \
+  zlib1g \
   libasound2-dev && \
   ffmpeg -buildconf