Skip to content

Commit 7eb80b7

Browse files
committed
Save some layers and indent some args
1 parent 102db7a commit 7eb80b7

File tree

1 file changed

+26
-5
lines changed

1 file changed

+26
-5
lines changed

Dockerfile

+26-5
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,13 @@ RUN wget $WGET_OPTS -O libvpx.tar.gz "$VPX_URL"
665665
RUN echo "$VPX_SHA256 libvpx.tar.gz" | sha256sum --status -c -
666666
RUN \
667667
tar $TAR_OPTS libvpx.tar.gz && \
668-
cd libvpx-* && ./configure --enable-static --enable-vp9-highbitdepth --disable-shared --disable-unit-tests --disable-examples && \
668+
cd libvpx-* && \
669+
./configure \
670+
--enable-static \
671+
--enable-vp9-highbitdepth \
672+
--disable-shared \
673+
--disable-unit-tests \
674+
--disable-examples && \
669675
make -j$(nproc) install
670676

671677
# bump: libwebp /LIBWEBP_VERSION=([\d.]+)/ https://github.com/webmproject/libwebp.git|*
@@ -679,7 +685,21 @@ RUN wget $WGET_OPTS -O libwebp.tar.gz "$LIBWEBP_URL"
679685
RUN echo "$LIBWEBP_SHA256 libwebp.tar.gz" | sha256sum --status -c -
680686
RUN \
681687
tar $TAR_OPTS libwebp.tar.gz && \
682-
cd libwebp-* && ./autogen.sh && ./configure --disable-shared --enable-static --with-pic --enable-libwebpmux --disable-libwebpextras --disable-libwebpdemux --disable-sdl --disable-gl --disable-png --disable-jpeg --disable-tiff --disable-gif && \
688+
cd libwebp-* && \
689+
./autogen.sh && \
690+
./configure \
691+
--disable-shared \
692+
--enable-static \
693+
--with-pic \
694+
--enable-libwebpmux \
695+
--disable-libwebpextras \
696+
--disable-libwebpdemux \
697+
--disable-sdl \
698+
--disable-gl \
699+
--disable-png \
700+
--disable-jpeg \
701+
--disable-tiff \
702+
--disable-gif && \
683703
make -j$(nproc) install
684704

685705
# x264 only have a stable branch no tags and we checkout commit so no hash is needed
@@ -842,9 +862,10 @@ RUN \
842862
cmake --build build -j$(nproc) && \
843863
cmake --install build
844864
# workaround for ffmpeg configure script
845-
RUN sed -i 's/-ljxl/-ljxl -lstdc++ /' /usr/local/lib/pkgconfig/libjxl.pc
846-
RUN sed -i 's/-ljxl_cms/-ljxl_cms -lstdc++ /' /usr/local/lib/pkgconfig/libjxl_cms.pc
847-
RUN sed -i 's/-ljxl_threads/-ljxl_threads -lstdc++ /' /usr/local/lib/pkgconfig/libjxl_threads.pc
865+
RUN \
866+
sed -i 's/-ljxl/-ljxl -lstdc++ /' /usr/local/lib/pkgconfig/libjxl.pc && \
867+
sed -i 's/-ljxl_cms/-ljxl_cms -lstdc++ /' /usr/local/lib/pkgconfig/libjxl_cms.pc && \
868+
sed -i 's/-ljxl_threads/-ljxl_threads -lstdc++ /' /usr/local/lib/pkgconfig/libjxl_threads.pc
848869

849870
# bump: ffmpeg /FFMPEG_VERSION=([\d.]+)/ https://github.com/FFmpeg/FFmpeg.git|*
850871
# bump: ffmpeg after ./hashupdate Dockerfile FFMPEG $LATEST

0 commit comments

Comments
 (0)