Skip to content

Commit

Permalink
Merge pull request #63 from linuxserver/zimg
Browse files Browse the repository at this point in the history
Add support for Zimg
  • Loading branch information
aptalca authored Feb 14, 2024
2 parents e57589c + 4d28b9b commit dbb3b60
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 3 deletions.
20 changes: 19 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 ****" && \
Expand Down Expand Up @@ -709,6 +710,22 @@ RUN \
./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
RUN \
Expand Down Expand Up @@ -761,6 +778,7 @@ RUN \
--enable-libx265 \
--enable-libxml2 \
--enable-libxvid \
--enable-libzimg \
--enable-nonfree \
--enable-nvdec \
--enable-nvenc \
Expand Down
22 changes: 20 additions & 2 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -421,6 +422,22 @@ RUN \
./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
RUN \
Expand Down Expand Up @@ -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 \
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

* **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.
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
* **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.
Expand Down

0 comments on commit dbb3b60

Please sign in to comment.