diff --git a/Dockerfile b/Dockerfile index 22d553a..da63282 100644 --- a/Dockerfile +++ b/Dockerfile @@ -49,7 +49,8 @@ ENV \ VULKANSDK=vulkan-sdk-1.3.275.0 \ WEBP=1.3.2 \ X265=3.5 \ - XVID=1.3.7 + XVID=1.3.7 \ + ZIMG=3.0.5 RUN \ echo "**** install build packages ****" && \ @@ -708,6 +709,22 @@ RUN \ cd /tmp/xvid/build/generic && \ ./configure && \ make && \ + make install && \ +RUN \ + echo "**** grabbing zimg ****" && \ + mkdir -p /tmp/zimg && \ + git clone \ + --branch release-${ZIMG} --depth 1 \ + https://github.com/sekrit-twc/zimg.git \ + /tmp/zimg +RUN \ + echo "**** compiling zimg ****" && \ + cd /tmp/zimg && \ + ./autogen.sh && \ + ./configure \ + --disable-static \ + --enable-shared && \ + make && \ make install # main ffmpeg build @@ -761,6 +778,7 @@ RUN \ --enable-libx265 \ --enable-libxml2 \ --enable-libxvid \ + --enable-libzimg \ --enable-nonfree \ --enable-nvdec \ --enable-nvenc \ diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 6eab333..b02eb81 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -37,7 +37,8 @@ ENV \ VPX=1.14.0 \ WEBP=1.3.2 \ X265=master \ - XVID=1.3.7 + XVID=1.3.7 \ + ZIMG=3.0.5 # x265 aarch64 build fixes not in a release yet https://bitbucket.org/multicoreware/x265_git/issues/604/linux-arm-aarch64-build-failing-for-high RUN \ @@ -420,6 +421,22 @@ RUN \ cd /tmp/xvid/build/generic && \ ./configure && \ make && \ + make install && \ +RUN \ + echo "**** grabbing zimg ****" && \ + mkdir -p /tmp/zimg && \ + git clone \ + --branch release-${ZIMG} --depth 1 \ + https://github.com/sekrit-twc/zimg.git \ + /tmp/zimg +RUN \ + echo "**** compiling zimg ****" && \ + cd /tmp/zimg && \ + ./autogen.sh && \ + ./configure \ + --disable-static \ + --enable-shared && \ + make && \ make install # main ffmpeg build @@ -463,11 +480,12 @@ RUN \ --enable-libvidstab \ --enable-libvorbis \ --enable-libvpx \ + --enable-libwebp \ --enable-libxml2 \ --enable-libx264 \ --enable-libx265 \ --enable-libxvid \ - --enable-libwebp \ + --enable-libzimg \ --enable-nonfree \ --enable-openssl \ --enable-stripping \ diff --git a/README.md b/README.md index b4a3b6d..dd7726f 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 +* **11.02.24:** - Add Zimg support. * **09.02.24:** - Bump ffmpeg to 6.1.1, bump other deps. * **08.02.24:** - Enable cuda-llvm, clean up rustc. * **01.02.24:** - Bump Mesa to v24. diff --git a/readme-vars.yml b/readme-vars.yml index 8618195..1670fb9 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -177,6 +177,7 @@ full_custom_readme: | ## Versions + * **11.02.24:** - Add Zimg support. * **09.02.24:** - Bump ffmpeg to 6.1.1, bump other deps. * **08.02.24:** - Enable cuda-llvm, clean up rustc. * **01.02.24:** - Bump Mesa to v24.