Upgrade library versions for ubuntu

datarhei · Feb 21, 2024 · e089be6 · e089be6
1 parent 6c089ca
commit e089be6
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 34 deletions.
diff --git a/Build.alpine.env b/Build.alpine.env
@@ -13,4 +13,4 @@ VORBIS_VERSION=1.3.7-r2
 FBDEV_VERSION=0.5.0-r5
 ALSA_VERSION=1.2.10-r0
 V4L_VERSION=1.24.1-r1
-FFMPEG_VERSION=6.1.1
+FFMPEG_VERSION=6.1.1
diff --git a/Build.ubuntu.cuda.env b/Build.ubuntu.cuda.env
@@ -1,3 +1,3 @@
 # FFMPEG CUDA PACKAGES
 CUDA_VERSION=11.7.1
-FFNVCODEC_VERSION=11.1.5.2
+FFNVCODEC_VERSION=11.1.5.3
diff --git a/Build.ubuntu.env b/Build.ubuntu.env
@@ -1,14 +1,14 @@
 # FFMPEG BASE PACKAGES
 OS_NAME=ubuntu
 OS_VERSION=20.04
-FREETYPE_VERSION=2.12.1
-XML2_VERSION=2.9.14
-SRT_VERSION=1.4.4
+FREETYPE_VERSION=2.13.2
+XML2_VERSION=2.11.17
+SRT_VERSION=1.5.3
 X264_VERSION=stable
-X265_VERSION=3.4
-VPX_VERSION=1.12.0
+X265_VERSION=3.5
+VPX_VERSION=1.14.0
 LAME_VERSION=3.100
-OPUS_VERSION=1.3.1
+OPUS_VERSION=1.4
 OGG_VERSION=1.3.5
 VORBIS_VERSION=1.3.7
 FFMPEG_VERSION=6.1.1
diff --git a/Dockerfile.ubuntu.cuda b/Dockerfile.ubuntu.cuda
@@ -52,26 +52,26 @@ RUN mkdir -p /dist && cd /dist && \
 
 # install x265
 RUN mkdir -p /dist && cd /dist && \
-  curl -OLk https://github.com/videolan/x265/archive/refs/tags/${X265_VERSION}.tar.gz && \
-  tar xfvz ${X265_VERSION}.tar.gz && \
-  rm ${X265_VERSION}.tar.gz && \
-  cd x265-${X265_VERSION}/build/linux \
+  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 -C 8bit install && \
+  make -j$(nproc) -C 8bit install && \
   rm -rf ${DIR}
 
 # install opus
 RUN mkdir -p /dist && cd /dist && \
-  curl -OLk https://archive.mozilla.org/pub/opus/opus-${OPUS_VERSION}.tar.gz && \
+  curl -OLk https://downloads.xiph.org/releases/opus/opus-${OPUS_VERSION}.tar.gz && \
   tar xfvz opus-${OPUS_VERSION}.tar.gz && \
   rm opus-${OPUS_VERSION}.tar.gz && \
   cd opus-${OPUS_VERSION} && \
   autoreconf -fiv && \
   ./configure --prefix="${SRC}" \
   --enable-shared && \
-  make && \
+  make -j$(nproc) && \
   make install
 
 # install ogg
@@ -82,7 +82,7 @@ RUN mkdir -p /dist && cd /dist && \
   cd libogg-${OGG_VERSION} && \
   ./configure --prefix="${SRC}" \
   --enable-shared  && \
-  make && \
+  make -j$(nproc) && \
   make install
 
 # install vorbis
@@ -93,7 +93,7 @@ RUN mkdir -p /dist && cd /dist && \
   cd libvorbis-${VORBIS_VERSION} && \
   ./configure --prefix="${SRC}" --with-ogg="${SRC}" \
   --enable-shared && \
-  make && \
+  make -j$(nproc) && \
   make install
 
 # install libmp3lame
@@ -126,7 +126,7 @@ RUN mkdir -p /dist && cd /dist && \
   --disable-examples \
   --disable-docs \
   --disable-install-bins && \
-  make && \
+  make -j$(nproc) && \
   make install
 
 # install freetype
@@ -138,7 +138,7 @@ RUN mkdir -p /dist && cd /dist && \
   ./configure --prefix="${SRC}" \
   --disable-static \
   --enable-shared && \
-  make && \
+  make -j$(nproc) && \
   make install
 
 # install srt
@@ -153,7 +153,7 @@ RUN mkdir -p /dist && cd /dist && \
   -DCMAKE_INSTALL_INCLUDEDIR="$SRC/include" \
   -DCMAKE_INSTALL_LIBDIR="$SRC/lib" \
   -DCMAKE_INSTALL_SRC="$SRC" && \
-  make && \
+  make -j$(nproc) && \
   make install
 
 # install libxml2
@@ -166,7 +166,7 @@ RUN mkdir -p /dist && cd /dist && \
   --with-ftp=no \
   --with-http=no \
   --with-python=no && \
-  make && \
+  make -j$(nproc) && \
   make install
 
 # install and patch ffmpeg

diff --git a/Dockerfile.ubuntu.vaapi b/Dockerfile.ubuntu.vaapi
@@ -54,26 +54,26 @@ RUN mkdir -p /dist && cd /dist && \
 
 # install x265
 RUN mkdir -p /dist && cd /dist && \
-  curl -OLk https://github.com/videolan/x265/archive/refs/tags/${X265_VERSION}.tar.gz && \
-  tar xfvz ${X265_VERSION}.tar.gz && \
-  rm ${X265_VERSION}.tar.gz && \
-  cd x265-${X265_VERSION}/build/linux \
+  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 -C 8bit install && \
+  make -j$(nproc) -C 8bit install && \
   rm -rf ${DIR}
 
 # install opus
 RUN mkdir -p /dist && cd /dist && \
-  curl -OLk https://archive.mozilla.org/pub/opus/opus-${OPUS_VERSION}.tar.gz && \
+  curl -OLk https://downloads.xiph.org/releases/opus/opus-${OPUS_VERSION}.tar.gz && \
   tar xfvz opus-${OPUS_VERSION}.tar.gz && \
   rm opus-${OPUS_VERSION}.tar.gz && \
   cd opus-${OPUS_VERSION} && \
   autoreconf -fiv && \
   ./configure --prefix="${SRC}" \
   --enable-shared && \
-  make && \
+  make -j$(nproc) && \
   make install
 
 # install ogg
@@ -84,7 +84,7 @@ RUN mkdir -p /dist && cd /dist && \
   cd libogg-${OGG_VERSION} && \
   ./configure --prefix="${SRC}" \
   --enable-shared  && \
-  make && \
+  make -j$(nproc) && \
   make install
 
 # install vorbis
@@ -95,7 +95,7 @@ RUN mkdir -p /dist && cd /dist && \
   cd libvorbis-${VORBIS_VERSION} && \
   ./configure --prefix="${SRC}" --with-ogg="${SRC}" \
   --enable-shared && \
-  make && \
+  make -j$(nproc) && \
   make install
 
 # install libmp3lame
@@ -128,7 +128,7 @@ RUN mkdir -p /dist && cd /dist && \
   --disable-examples \
   --disable-docs \
   --disable-install-bins && \
-  make && \
+  make -j$(nproc) && \
   make install
 
 # install freetype
@@ -140,7 +140,7 @@ RUN mkdir -p /dist && cd /dist && \
   ./configure --prefix="${SRC}" \
   --disable-static \
   --enable-shared && \
-  make && \
+  make -j$(nproc) && \
   make install
 
 # install srt
@@ -155,7 +155,7 @@ RUN mkdir -p /dist && cd /dist && \
   -DCMAKE_INSTALL_INCLUDEDIR="$SRC/include" \
   -DCMAKE_INSTALL_LIBDIR="$SRC/lib" \
   -DCMAKE_INSTALL_SRC="$SRC" && \
-  make && \
+  make -j$(nproc) && \
   make install
 
 # install libxml2
@@ -168,7 +168,7 @@ RUN mkdir -p /dist && cd /dist && \
   --with-ftp=no \
   --with-http=no \
   --with-python=no && \
-  make && \
+  make -j$(nproc) && \
   make install
 
 # install and patch ffmpeg