From 154a0501da71e45167217542b011bafec25f4c5b Mon Sep 17 00:00:00 2001 From: TC McCarthy Date: Thu, 28 Dec 2023 11:29:22 -0500 Subject: [PATCH 1/4] bumps svt-av1 version to 1.8.0 --- Dockerfile | 2 +- Dockerfile.aarch64 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3c110e4..19590a7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -41,7 +41,7 @@ ENV \ OPENJPEG=2.5.0 \ OPUS=1.4 \ SHADERC=v2023.7 \ - SVTAV1=1.7.0 \ + SVTAV1=1.8.0 \ THEORA=1.1.1 \ VORBIS=1.3.7 \ VPX=1.13.1 \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 3855608..f0a9ab8 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -30,7 +30,7 @@ ENV \ OPENCOREAMR=0.1.6 \ OPENJPEG=2.5.0 \ OPUS=1.4 \ - SVTAV1=1.7.0 \ + SVTAV1=1.8.0 \ THEORA=1.1.1 \ VORBIS=1.3.7 \ VPX=1.13.1 \ From 2f7a805bce65bf875746679e7dcf1c1a0fe12c7e Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Mon, 1 Jan 2024 18:00:07 -0500 Subject: [PATCH 2/4] Bump various libs --- Dockerfile | 12 ++++++------ Dockerfile.aarch64 | 6 +++--- README.md | 1 + readme-vars.yml | 1 + 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 19590a7..bb81773 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,8 +13,8 @@ ENV \ # versions ENV \ - AOM=v3.7.1 \ - FDKAAC=2.0.2 \ + AOM=v3.8.0 \ + FDKAAC=2.0.3 \ FFMPEG_HARD=6.1 \ FONTCONFIG=2.14.2 \ FREETYPE=2.13.2 \ @@ -25,15 +25,15 @@ ENV \ LAME=3.100 \ LIBASS=0.17.1 \ LIBDOVI=2.1.0 \ - LIBDRM=2.4.118 \ + LIBDRM=2.4.119 \ LIBMFX=22.5.4 \ LIBPLACEBO=6.338.1 \ LIBVA=2.20.0 \ LIBVDPAU=1.5 \ LIBVIDSTAB=1.1.1 \ - LIBVMAF=2.3.1 \ - LIBVPL=2023.3.1 \ - MESA=23.3.0 \ + LIBVMAF=3.0.0 \ + LIBVPL=2.10.1 \ + MESA=23.3.2 \ NVCODEC=n12.1.14.0 \ OGG=1.3.5 \ ONEVPL=23.3.4 \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index f0a9ab8..74bf27a 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -13,15 +13,15 @@ ENV \ # versions ENV \ - AOM=v3.7.1 \ - FDKAAC=2.0.2 \ + AOM=v3.8.0 \ + FDKAAC=2.0.3 \ FFMPEG_HARD=6.1 \ FREETYPE=2.13.2 \ FRIBIDI=1.0.13 \ KVAZAAR=2.2.0 \ LAME=3.100 \ LIBASS=0.17.1 \ - LIBDRM=2.4.118 \ + LIBDRM=2.4.119 \ LIBVA=2.20.0 \ LIBVDPAU=1.5 \ LIBVIDSTAB=1.1.1 \ diff --git a/README.md b/README.md index eeb04cf..60bea76 100644 --- a/README.md +++ b/README.md @@ -173,6 +173,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **01.01.24:** - Bump libaom, fdkaac, libdrm, libvmaf, libvpl, mesa and svt-av1. * **06.12.23:** - Add libplacebo and libdobi to x86_64. * **05.12.23:** - Bump Mesa. Fix vdpau. Fix AMD VAAPI. * **25.11.23:** - Compile Mesa from source. Add proper Vulkan support (env var `ENABLE_VULKAN=true` no longer needed)(tested with Intel). diff --git a/readme-vars.yml b/readme-vars.yml index c4a6f44..a473f52 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -177,6 +177,7 @@ full_custom_readme: | ## Versions + * **01.01.24:** - Bump libaom, fdkaac, libdrm, libvmaf, libvpl, mesa and svt-av1. * **06.12.23:** - Add libplacebo and libdobi to x86_64. * **05.12.23:** - Bump Mesa. Fix vdpau. Fix AMD VAAPI. * **25.11.23:** - Compile Mesa from source. Add proper Vulkan support (env var `ENABLE_VULKAN=true` no longer needed)(tested with Intel). From e35de124c8e9da226bd4430e97d3335291e57c40 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Mon, 1 Jan 2024 21:32:41 -0500 Subject: [PATCH 3/4] Add rav1e support --- Dockerfile | 15 +++++++++++++++ Dockerfile.aarch64 | 15 +++++++++++++++ readme-vars.yml | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index bb81773..38cb9c0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -40,6 +40,7 @@ ENV \ OPENCOREAMR=0.1.6 \ OPENJPEG=2.5.0 \ OPUS=1.4 \ + RAV1E=0.7.0 \ SHADERC=v2023.7 \ SVTAV1=1.8.0 \ THEORA=1.1.1 \ @@ -478,6 +479,19 @@ RUN \ --enable-shared && \ make && \ make install +RUN \ + echo "**** grabbing rav1e ****" && \ + mkdir -p /tmp/rav1e && \ + git clone \ + --branch v${RAV1E} \ + https://github.com/xiph/rav1e.git \ + /tmp/rav1e +RUN \ + echo "**** compiling rav1e ****" && \ + cd /tmp/rav1e && \ + cargo install cargo-c@0.9.27+cargo-0.74.0 --locked && \ + cargo cinstall --release && \ + strip -d /usr/local/lib/librav1e.so RUN \ echo "**** grabbing shaderc ****" && \ mkdir -p /tmp/shaderc && \ @@ -725,6 +739,7 @@ RUN \ --enable-libopenjpeg \ --enable-libopus \ --enable-libplacebo \ + --enable-librav1e \ --enable-libshaderc \ --enable-libsvtav1 \ --enable-libtheora \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 74bf27a..372c5ac 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -30,6 +30,7 @@ ENV \ OPENCOREAMR=0.1.6 \ OPENJPEG=2.5.0 \ OPUS=1.4 \ + RAV1E=0.7.0 \ SVTAV1=1.8.0 \ THEORA=1.1.1 \ VORBIS=1.3.7 \ @@ -260,6 +261,19 @@ RUN \ --enable-shared && \ make && \ make install +RUN \ + echo "**** grabbing rav1e ****" && \ + mkdir -p /tmp/rav1e && \ + git clone \ + --branch v${RAV1E} \ + https://github.com/xiph/rav1e.git \ + /tmp/rav1e +RUN \ + echo "**** compiling rav1e ****" && \ + cd /tmp/rav1e && \ + cargo install cargo-c@0.9.27+cargo-0.74.0 --locked && \ + cargo cinstall --release && \ + strip -d /usr/local/lib/librav1e.so RUN \ echo "**** grabbing SVT-AV1 ****" && \ mkdir -p /tmp/svt-av1 && \ @@ -434,6 +448,7 @@ RUN \ --enable-libopencore-amrwb \ --enable-libopenjpeg \ --enable-libopus \ + --enable-librav1e \ --enable-libsvtav1 \ --enable-libtheora \ --enable-libv4l2 \ diff --git a/readme-vars.yml b/readme-vars.yml index a473f52..2a2f6ac 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -177,7 +177,7 @@ full_custom_readme: | ## Versions - * **01.01.24:** - Bump libaom, fdkaac, libdrm, libvmaf, libvpl, mesa and svt-av1. + * **01.01.24:** - Add rav1e support. Bump libaom, fdkaac, libdrm, libvmaf, libvpl, mesa and svt-av1. * **06.12.23:** - Add libplacebo and libdobi to x86_64. * **05.12.23:** - Bump Mesa. Fix vdpau. Fix AMD VAAPI. * **25.11.23:** - Compile Mesa from source. Add proper Vulkan support (env var `ENABLE_VULKAN=true` no longer needed)(tested with Intel). From 8f049b3db9bc189d06254c317f56b48ad3579b4e Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Mon, 1 Jan 2024 22:04:08 -0500 Subject: [PATCH 4/4] add cargo to aarch64 --- Dockerfile.aarch64 | 1 + README.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 372c5ac..c37de2f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -47,6 +47,7 @@ RUN \ autoconf \ automake \ bzip2 \ + cargo \ cmake \ diffutils \ g++ \ diff --git a/README.md b/README.md index 60bea76..45564c7 100644 --- a/README.md +++ b/README.md @@ -173,7 +173,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions -* **01.01.24:** - Bump libaom, fdkaac, libdrm, libvmaf, libvpl, mesa and svt-av1. +* **01.01.24:** - Add rav1e support. Bump libaom, fdkaac, libdrm, libvmaf, libvpl, mesa and svt-av1. * **06.12.23:** - Add libplacebo and libdobi to x86_64. * **05.12.23:** - Bump Mesa. Fix vdpau. Fix AMD VAAPI. * **25.11.23:** - Compile Mesa from source. Add proper Vulkan support (env var `ENABLE_VULKAN=true` no longer needed)(tested with Intel).