Skip to content

Commit

Permalink
Add libzmq support
Browse files Browse the repository at this point in the history
  • Loading branch information
trapexit committed Sep 10, 2024
1 parent bc42c13 commit 9ade9b0
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 12 deletions.
32 changes: 25 additions & 7 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ ENV \
WEBP=1.4.0 \
X265=3.6 \
XVID=1.3.7 \
ZIMG=3.0.5
ZIMG=3.0.5 \
ZMQ=v4.3.5

RUN \
echo "**** install build packages ****" && \
Expand Down Expand Up @@ -459,7 +460,7 @@ RUN \
echo "**** compiling libvpl ****" && \
mkdir -p /tmp/libvpl/build && \
cd /tmp/libvpl/build && \
cmake .. && \
cmake .. && \
cmake --build . --config Release && \
cmake --build . --config Release --target install && \
strip -d /usr/local/lib/libvpl.so
Expand All @@ -476,7 +477,7 @@ RUN \
cmake \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=/usr/local/lib \
.. && \
.. && \
make && \
make install && \
strip -d /usr/local/lib/libmfx-gen.so
Expand All @@ -497,7 +498,7 @@ RUN \
-DENABLE_X11_DRI3=ON \
-DBUILD_DISPATCHER=OFF \
-DBUILD_TUTORIALS=OFF \
.. && \
.. && \
make && \
make install && \
strip -d \
Expand Down Expand Up @@ -820,7 +821,7 @@ RUN \
RUN \
echo "**** compiling xvid ****" && \
cd /tmp/xvid/build/generic && \
./configure && \
./configure && \
make && \
make install
RUN \
Expand All @@ -839,6 +840,22 @@ RUN \
--enable-shared && \
make && \
make install
RUN \
echo "**** grabbing zmq ****" && \
mkdir -p /tmp/zmq && \
git clone \
--branch ${ZMQ} --depth 1 \
https://github.com/zeromq/libzmq.git \
/tmp/zmq
RUN \
echo "**** compiling zmq ****" && \
cd /tmp/zmq && \
./autogen.sh && \
./configure \
--disable-static \
--enable-shared && \
make && \
make install

# main ffmpeg build
RUN \
Expand Down Expand Up @@ -908,7 +925,9 @@ RUN \
--enable-vaapi \
--enable-vdpau \
--enable-version3 \
--enable-vulkan && \
--enable-vulkan \
--enable-libzmq \
&& \
make

RUN \
Expand Down Expand Up @@ -1031,4 +1050,3 @@ RUN \
COPY /root /

ENTRYPOINT ["/ffmpegwrapper.sh"]

29 changes: 24 additions & 5 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
Expand Up @@ -37,19 +37,20 @@ ENV \
OPUS=1.5.2 \
RAV1E=0.7.1 \
RIST=0.2.10 \
SRT=1.5.3 \
SRT=1.5.3 \
SVTAV1=2.2.1 \
THEORA=1.1.1 \
VORBIS=1.3.7 \
VPX=1.14.1 \
WEBP=1.4.0 \
X265=3.6 \
XVID=1.3.7 \
ZIMG=3.0.5
ZIMG=3.0.5 \
ZMQ=v4.3.5

RUN \
echo "**** install build packages ****" && \
apt-get update && \
apt-get update && \
apt-get install -y \
autoconf \
automake \
Expand Down Expand Up @@ -536,7 +537,7 @@ RUN \
RUN \
echo "**** compiling xvid ****" && \
cd /tmp/xvid/build/generic && \
./configure && \
./configure && \
make && \
make install
RUN \
Expand All @@ -555,6 +556,22 @@ RUN \
--enable-shared && \
make && \
make install
RUN \
echo "**** grabbing zmq ****" && \
mkdir -p /tmp/zmq && \
git clone \
--branch ${ZMQ} --depth 1 \
https://github.com/zeromq/libzmq.git \
/tmp/zmq
RUN \
echo "**** compiling zmq ****" && \
cd /tmp/zmq && \
./autogen.sh && \
./configure \
--disable-static \
--enable-shared && \
make && \
make install

# main ffmpeg build
RUN \
Expand Down Expand Up @@ -618,7 +635,9 @@ RUN \
--enable-nvenc \
--enable-openssl \
--enable-stripping \
--enable-version3 && \
--enable-version3 \
--enable-libzmq \
&& \
make

RUN \
Expand Down
1 change: 1 addition & 0 deletions readme-vars.yml
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,7 @@ full_custom_readme: |
## Versions
* **09.09.24:** - Add libzmq.
* **31.08.24:** - Bump libaom, libdrm, libvpl, mesa and svtav1. Enable nvdec/nvenc on arm64 (untested).
* **17.08.24:** - Bump ffmpeg, freetype, libdovi and mesa.
* **14.08.24:** - Add SRT and libRIST.
Expand Down

0 comments on commit 9ade9b0

Please sign in to comment.