Skip to content

Commit e7c88f5

Browse files
committed
Ffmpeg 5.0 update
1 parent e19c739 commit e7c88f5

File tree

2 files changed

+14
-15
lines changed

2 files changed

+14
-15
lines changed

build-ffmpeg

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# LICENSE: https://github.com/markus-perl/ffmpeg-build-script/blob/master/LICENSE
55

66
PROGNAME=$(basename "$0")
7-
FFMPEG_VERSION=4.4
7+
FFMPEG_VERSION=5.0
88
SCRIPT_VERSION=1.33
99
CWD=$(pwd)
1010
PACKAGES="$CWD/packages"
@@ -368,12 +368,12 @@ if build "autoconf" "2.71"; then
368368
build_done "autoconf" "2.71"
369369
fi
370370

371-
if build "automake" "1.16.4"; then
372-
download "https://ftp.gnu.org/gnu/automake/automake-1.16.4.tar.gz"
371+
if build "automake" "1.16.5"; then
372+
download "https://ftp.gnu.org/gnu/automake/automake-1.16.5.tar.gz"
373373
execute ./configure --prefix="${WORKSPACE}"
374374
execute make -j $MJOBS
375375
execute make install
376-
build_done "automake" "1.16.4"
376+
build_done "automake" "1.16.5"
377377
fi
378378

379379
if build "libtool" "2.4.6"; then
@@ -385,8 +385,8 @@ if build "libtool" "2.4.6"; then
385385
fi
386386

387387
if $NONFREE_AND_GPL; then
388-
if build "openssl" "1.1.1l"; then
389-
download "https://www.openssl.org/source/openssl-1.1.1l.tar.gz"
388+
if build "openssl" "1.1.1m"; then
389+
download "https://www.openssl.org/source/openssl-1.1.1m.tar.gz"
390390
if $MACOS_M1; then
391391
sed -n 's/\(##### GNU Hurd\)/"darwin64-arm64-cc" => { \n inherit_from => [ "darwin-common", asm("aarch64_asm") ],\n CFLAGS => add("-Wall"),\n cflags => add("-arch arm64 "),\n lib_cppflags => add("-DL_ENDIAN"),\n bn_ops => "SIXTY_FOUR_BIT_LONG", \n perlasm_scheme => "macosx", \n}, \n\1/g' Configurations/10-main.conf
392392
execute ./configure --prefix="${WORKSPACE}" no-shared no-asm darwin64-arm64-cc
@@ -395,17 +395,17 @@ if $NONFREE_AND_GPL; then
395395
fi
396396
execute make -j $MJOBS
397397
execute make install_sw
398-
build_done "openssl" "1.1.1l"
398+
build_done "openssl" "1.1.1m"
399399
fi
400400
CONFIGURE_OPTIONS+=("--enable-openssl")
401401
fi
402402

403-
if build "cmake" "3.22.0"; then
404-
download "https://github.com/Kitware/CMake/releases/download/v3.22.0/cmake-3.22.0.tar.gz"
403+
if build "cmake" "3.22.1"; then
404+
download "https://github.com/Kitware/CMake/releases/download/v3.22.0/cmake-3.22.1.tar.gz"
405405
execute ./configure --prefix="${WORKSPACE}" --parallel="${MJOBS}" -- -DCMAKE_USE_OPENSSL=OFF
406406
execute make -j $MJOBS
407407
execute make install
408-
build_done "cmake" "3.22.0"
408+
build_done "cmake" "3.22.1"
409409
fi
410410

411411
##
@@ -437,17 +437,16 @@ if command_exists "python3"; then
437437
fi
438438

439439
if ! $MACOS_M1; then
440-
if build "svtav1" "1a3e32b"; then
441-
execute rm -f "${PACKAGES}/SVT-AV1-master.tar.gz" "${PACKAGES}/svtav1-1a3e32b.tar.gz"
440+
if build "svtav1" "0.9.0"; then
442441
# Last known working commit which passed CI Tests from HEAD branch
443-
download "https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/1a3e32b8fdc4abf5c093ee01dfa82803afc75fb4/SVT-AV1-1a3e32b8fdc4abf5c093ee01dfa82803afc75fb4.tar.gz" "svtav1-1a3e32b.tar.gz"
442+
download "https://github.com/AOMediaCodec/SVT-AV1/archive/refs/tags/v0.9.0.tar.gz" "svtav1-0.9.0.tar.gz"
444443
cd "${PACKAGES}"/svtav1-1a3e32b/Build/linux || exit
445444
execute cmake -DCMAKE_INSTALL_PREFIX="${WORKSPACE}" -DENABLE_SHARED=off -DBUILD_SHARED_LIBS=OFF ../.. -G"Unix Makefiles" -DCMAKE_BUILD_TYPE=Release
446445
execute make -j $MJOBS
447446
execute make install
448447
execute cp SvtAv1Enc.pc "${WORKSPACE}/lib/pkgconfig/"
449448
execute cp SvtAv1Dec.pc "${WORKSPACE}/lib/pkgconfig/"
450-
build_done "svtav1" "1a3e32b";
449+
build_done "svtav1" "0.9.0";
451450
fi
452451
CONFIGURE_OPTIONS+=("--enable-libsvtav1")
453452
fi

cuda-ubuntu.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ENV NVIDIA_VISIBLE_DEVICES all
77
ENV NVIDIA_DRIVER_CAPABILITIES compute,utility,video
88

99
RUN apt-get update \
10-
&& apt-get -y --no-install-recommends install build-essential curl ca-certificates libva-dev python3 python-is-python3 ninja-build meson \
10+
&& apt-get -y --no-install-recommends install build-essential curl ca-certificates libva-dev python3 python-is-python3 ninja-build meson libnppif10 \
1111
&& apt-get clean; rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
1212
&& update-ca-certificates
1313

0 commit comments

Comments
 (0)