Skip to content

Commit

Permalink
Merge pull request #52 from tc-mccarthy/svtav1_bump
Browse files Browse the repository at this point in the history
Bump various libs, add rav1e
  • Loading branch information
aptalca authored Jan 2, 2024
2 parents 984c133 + 8f049b3 commit 63a0415
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 11 deletions.
29 changes: 22 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -25,23 +25,24 @@ 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 \
OPENCOREAMR=0.1.6 \
OPENJPEG=2.5.0 \
OPUS=1.4 \
RAV1E=0.7.0 \
SHADERC=v2023.7 \
SVTAV1=1.7.0 \
SVTAV1=1.8.0 \
THEORA=1.1.1 \
VORBIS=1.3.7 \
VPX=1.13.1 \
Expand Down Expand Up @@ -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 [email protected]+cargo-0.74.0 --locked && \
cargo cinstall --release && \
strip -d /usr/local/lib/librav1e.so
RUN \
echo "**** grabbing shaderc ****" && \
mkdir -p /tmp/shaderc && \
Expand Down Expand Up @@ -725,6 +739,7 @@ RUN \
--enable-libopenjpeg \
--enable-libopus \
--enable-libplacebo \
--enable-librav1e \
--enable-libshaderc \
--enable-libsvtav1 \
--enable-libtheora \
Expand Down
24 changes: 20 additions & 4 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -30,7 +30,8 @@ ENV \
OPENCOREAMR=0.1.6 \
OPENJPEG=2.5.0 \
OPUS=1.4 \
SVTAV1=1.7.0 \
RAV1E=0.7.0 \
SVTAV1=1.8.0 \
THEORA=1.1.1 \
VORBIS=1.3.7 \
VPX=1.13.1 \
Expand All @@ -46,6 +47,7 @@ RUN \
autoconf \
automake \
bzip2 \
cargo \
cmake \
diffutils \
g++ \
Expand Down Expand Up @@ -260,6 +262,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 [email protected]+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 && \
Expand Down Expand Up @@ -434,6 +449,7 @@ RUN \
--enable-libopencore-amrwb \
--enable-libopenjpeg \
--enable-libopus \
--enable-librav1e \
--enable-libsvtav1 \
--enable-libtheora \
--enable-libv4l2 \
Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64

## Versions

* **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).
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@ full_custom_readme: |
## Versions
* **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).
Expand Down

0 comments on commit 63a0415

Please sign in to comment.