From f49f3fd9c3886dba176c0a16bdb2b843f8cbfd88 Mon Sep 17 00:00:00 2001 From: Blake Blackshear Date: Sat, 5 Dec 2020 08:39:45 -0600 Subject: [PATCH] fix fontconfig issue --- docker/Dockerfile.base | 2 +- docker/Dockerfile.ffmpeg.aarch64 | 61 +--------------------------- docker/Dockerfile.ffmpeg.amd64 | 60 --------------------------- docker/Dockerfile.ffmpeg.amd64nvidia | 61 ---------------------------- docker/Dockerfile.ffmpeg.armv7 | 61 +--------------------------- 5 files changed, 3 insertions(+), 242 deletions(-) diff --git a/docker/Dockerfile.base b/docker/Dockerfile.base index 372f45953..50f126b8e 100644 --- a/docker/Dockerfile.base +++ b/docker/Dockerfile.base @@ -10,7 +10,7 @@ COPY --from=ffmpeg /usr/local /usr/local/ COPY --from=wheels /wheels/. /wheels/ ENV FLASK_ENV=development -ENV FONTCONFIG_PATH=/etc/fonts +# ENV FONTCONFIG_PATH=/etc/fonts ENV DEBIAN_FRONTEND=noninteractive # Install packages for apt repo RUN apt-get -qq update \ diff --git a/docker/Dockerfile.ffmpeg.aarch64 b/docker/Dockerfile.ffmpeg.aarch64 index 3c1d37c68..3fa630a65 100644 --- a/docker/Dockerfile.ffmpeg.aarch64 +++ b/docker/Dockerfile.ffmpeg.aarch64 @@ -18,12 +18,10 @@ FROM base as build ENV FFMPEG_VERSION=4.3.1 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ KVAZAAR_VERSION=1.2.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ @@ -42,22 +40,17 @@ ENV FFMPEG_VERSION=4.3.1 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ LIBZMQ_VERSION=4.3.2 \ SRC=/usr/local ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG LIBXML2_SHA256SUM="f07dab13bf42d2b8db80620cce7419b3b87827cc937c8bb20fe13b8571ee9501 libxml2-v2.9.10.tar.gz" -ARG LIBBLURAY_SHA256SUM="a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42 libbluray-1.1.2.tar.bz2" ARG LIBZMQ_SHA256SUM="02ecc88466ae38cf2c8d79f09cfd2675ba299a439680b64ade733e26a349edeb v4.3.2.tar.gz" @@ -287,30 +280,7 @@ RUN \ make -j1 && \ make -j $(nproc) install && \ rm -rf ${DIR} -## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ -RUN \ - DIR=/tmp/fontconfig && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ - tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make -j $(nproc) && \ - make -j $(nproc) install && \ - rm -rf ${DIR} -## libass https://github.com/libass/libass -RUN \ - DIR=/tmp/libass && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz && \ - echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make -j $(nproc) && \ - make -j $(nproc) install && \ - rm -rf ${DIR} + ## kvazaar https://github.com/ultravideo/kvazaar RUN \ DIR=/tmp/kvazaar && \ @@ -407,32 +377,6 @@ RUN \ make -j $(nproc) install && \ rm -rf ${DIR} -## libxml2 - for libbluray -RUN \ - DIR=/tmp/libxml2 && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://gitlab.gnome.org/GNOME/libxml2/-/archive/v${LIBXML2_VERSION}/libxml2-v${LIBXML2_VERSION}.tar.gz && \ - echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ - tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ - ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make -j $(nproc) && \ - make -j $(nproc) install && \ - rm -rf ${DIR} - -## libbluray - Requires libxml, freetype, and fontconfig -RUN \ - DIR=/tmp/libbluray && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://download.videolan.org/pub/videolan/libbluray/${LIBBLURAY_VERSION}/libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ - echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ - ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make -j $(nproc) && \ - make -j $(nproc) install && \ - rm -rf ${DIR} - ## libzmq https://github.com/zeromq/libzmq/ RUN \ DIR=/tmp/libzmq && \ @@ -465,8 +409,6 @@ RUN \ --enable-libopencore-amrnb \ --enable-libopencore-amrwb \ --enable-gpl \ - --enable-libass \ - --enable-fontconfig \ --enable-libfreetype \ --enable-libvidstab \ --enable-libmp3lame \ @@ -485,7 +427,6 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ - --enable-libbluray \ --enable-libzmq \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ diff --git a/docker/Dockerfile.ffmpeg.amd64 b/docker/Dockerfile.ffmpeg.amd64 index dc5c16e6c..c45b53b78 100644 --- a/docker/Dockerfile.ffmpeg.amd64 +++ b/docker/Dockerfile.ffmpeg.amd64 @@ -17,12 +17,10 @@ FROM base as build ENV FFMPEG_VERSION=4.3.1 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ KVAZAAR_VERSION=1.2.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ @@ -41,22 +39,17 @@ ENV FFMPEG_VERSION=4.3.1 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ LIBZMQ_VERSION=4.3.2 \ SRC=/usr/local ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG LIBXML2_SHA256SUM="f07dab13bf42d2b8db80620cce7419b3b87827cc937c8bb20fe13b8571ee9501 libxml2-v2.9.10.tar.gz" -ARG LIBBLURAY_SHA256SUM="a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42 libbluray-1.1.2.tar.bz2" ARG LIBZMQ_SHA256SUM="02ecc88466ae38cf2c8d79f09cfd2675ba299a439680b64ade733e26a349edeb v4.3.2.tar.gz" @@ -281,30 +274,6 @@ RUN \ make -j1 && \ make install && \ rm -rf ${DIR} -## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ -RUN \ - DIR=/tmp/fontconfig && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ - tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -## libass https://github.com/libass/libass -RUN \ - DIR=/tmp/libass && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz && \ - echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar RUN \ DIR=/tmp/kvazaar && \ @@ -399,32 +368,6 @@ RUN \ make install && \ rm -rf ${DIR} -## libxml2 - for libbluray -RUN \ - DIR=/tmp/libxml2 && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://gitlab.gnome.org/GNOME/libxml2/-/archive/v${LIBXML2_VERSION}/libxml2-v${LIBXML2_VERSION}.tar.gz && \ - echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ - tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ - ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ - make install && \ - rm -rf ${DIR} - -## libbluray - Requires libxml, freetype, and fontconfig -RUN \ - DIR=/tmp/libbluray && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://download.videolan.org/pub/videolan/libbluray/${LIBBLURAY_VERSION}/libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ - echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ - ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} - ## libzmq https://github.com/zeromq/libzmq/ RUN \ DIR=/tmp/libzmq && \ @@ -459,8 +402,6 @@ RUN \ --enable-libopencore-amrnb \ --enable-libopencore-amrwb \ --enable-gpl \ - --enable-libass \ - --enable-fontconfig \ --enable-libfreetype \ --enable-libvidstab \ --enable-libmp3lame \ @@ -479,7 +420,6 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ - --enable-libbluray \ --enable-libzmq \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ diff --git a/docker/Dockerfile.ffmpeg.amd64nvidia b/docker/Dockerfile.ffmpeg.amd64nvidia index a32a79d4e..402e8973d 100644 --- a/docker/Dockerfile.ffmpeg.amd64nvidia +++ b/docker/Dockerfile.ffmpeg.amd64nvidia @@ -40,12 +40,10 @@ ENV NVIDIA_HEADERS_VERSION=9.1.23.1 ENV FFMPEG_VERSION=4.3.1 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ KVAZAAR_VERSION=1.2.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ @@ -64,8 +62,6 @@ ENV FFMPEG_VERSION=4.3.1 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ LIBZMQ_VERSION=4.3.2 \ LIBSRT_VERSION=1.4.1 \ LIBARIBB24_VERSION=1.0.3 \ @@ -74,15 +70,12 @@ ENV FFMPEG_VERSION=4.3.1 \ ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG LIBXML2_SHA256SUM="f07dab13bf42d2b8db80620cce7419b3b87827cc937c8bb20fe13b8571ee9501 libxml2-v2.9.10.tar.gz" -ARG LIBBLURAY_SHA256SUM="a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42 libbluray-1.1.2.tar.bz2" ARG LIBZMQ_SHA256SUM="02ecc88466ae38cf2c8d79f09cfd2675ba299a439680b64ade733e26a349edeb v4.3.2.tar.gz" ARG LIBARIBB24_SHA256SUM="f61560738926e57f9173510389634d8c06cabedfa857db4b28fb7704707ff128 v1.0.3.tar.gz" @@ -317,30 +310,6 @@ RUN \ make -j1 && \ make install && \ rm -rf ${DIR} -## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ -RUN \ - DIR=/tmp/fontconfig && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ - tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -## libass https://github.com/libass/libass -RUN \ - DIR=/tmp/libass && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz && \ - echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} ## kvazaar https://github.com/ultravideo/kvazaar RUN \ DIR=/tmp/kvazaar && \ @@ -435,32 +404,6 @@ RUN \ make install && \ rm -rf ${DIR} -## libxml2 - for libbluray -RUN \ - DIR=/tmp/libxml2 && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://gitlab.gnome.org/GNOME/libxml2/-/archive/v${LIBXML2_VERSION}/libxml2-v${LIBXML2_VERSION}.tar.gz && \ - echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ - tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ - ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ - make install && \ - rm -rf ${DIR} - -## libbluray - Requires libxml, freetype, and fontconfig -RUN \ - DIR=/tmp/libbluray && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://download.videolan.org/pub/videolan/libbluray/${LIBBLURAY_VERSION}/libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ - echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ - ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} - ## libzmq https://github.com/zeromq/libzmq/ RUN \ DIR=/tmp/libzmq && \ @@ -533,8 +476,6 @@ RUN \ --enable-libopencore-amrnb \ --enable-libopencore-amrwb \ --enable-gpl \ - --enable-libass \ - --enable-fontconfig \ --enable-libfreetype \ --enable-libvidstab \ --enable-libmp3lame \ @@ -553,7 +494,6 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ - --enable-libbluray \ --enable-libzmq \ --extra-libs=-ldl \ --prefix="${PREFIX}" \ @@ -593,7 +533,6 @@ RUN \ FROM runtime-base AS release -MAINTAINER Julien Rottenberg ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64 diff --git a/docker/Dockerfile.ffmpeg.armv7 b/docker/Dockerfile.ffmpeg.armv7 index 1a353cda8..b56f8d909 100644 --- a/docker/Dockerfile.ffmpeg.armv7 +++ b/docker/Dockerfile.ffmpeg.armv7 @@ -18,12 +18,10 @@ FROM base as build ENV FFMPEG_VERSION=4.3.1 \ AOM_VERSION=v1.0.0 \ FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ FREETYPE_VERSION=2.5.5 \ FRIBIDI_VERSION=0.19.7 \ KVAZAAR_VERSION=1.2.0 \ LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ LIBPTHREAD_STUBS_VERSION=0.4 \ LIBVIDSTAB_VERSION=1.1.0 \ LIBXCB_VERSION=1.13.1 \ @@ -42,22 +40,17 @@ ENV FFMPEG_VERSION=4.3.1 \ XORG_MACROS_VERSION=1.19.2 \ XPROTO_VERSION=7.0.31 \ XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.10 \ - LIBBLURAY_VERSION=1.1.2 \ LIBZMQ_VERSION=4.3.3 \ SRC=/usr/local ARG FREETYPE_SHA256SUM="5d03dd76c2171a7601e9ce10551d52d4471cf92cd205948e60289251daddffa8 freetype-2.5.5.tar.gz" ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG LIBXML2_SHA256SUM="f07dab13bf42d2b8db80620cce7419b3b87827cc937c8bb20fe13b8571ee9501 libxml2-v2.9.10.tar.gz" -ARG LIBBLURAY_SHA256SUM="a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42 libbluray-1.1.2.tar.bz2" ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib @@ -289,30 +282,7 @@ RUN \ make -j1 && \ make -j $(nproc) install && \ rm -rf ${DIR} -## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ -RUN \ - DIR=/tmp/fontconfig && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ - tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make -j $(nproc) && \ - make -j $(nproc) install && \ - rm -rf ${DIR} -## libass https://github.com/libass/libass -RUN \ - DIR=/tmp/libass && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz && \ - echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make -j $(nproc) && \ - make -j $(nproc) install && \ - rm -rf ${DIR} + ## kvazaar https://github.com/ultravideo/kvazaar RUN \ DIR=/tmp/kvazaar && \ @@ -409,32 +379,6 @@ RUN \ make -j $(nproc) install && \ rm -rf ${DIR} -## libxml2 - for libbluray -RUN \ - DIR=/tmp/libxml2 && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://gitlab.gnome.org/GNOME/libxml2/-/archive/v${LIBXML2_VERSION}/libxml2-v${LIBXML2_VERSION}.tar.gz && \ - echo ${LIBXML2_SHA256SUM} | sha256sum --check && \ - tar -xz --strip-components=1 -f libxml2-v${LIBXML2_VERSION}.tar.gz && \ - ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make -j $(nproc) && \ - make -j $(nproc) install && \ - rm -rf ${DIR} - -## libbluray - Requires libxml, freetype, and fontconfig -RUN \ - DIR=/tmp/libbluray && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://download.videolan.org/pub/videolan/libbluray/${LIBBLURAY_VERSION}/libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ - echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ - ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make -j $(nproc) && \ - make -j $(nproc) install && \ - rm -rf ${DIR} - ## libzmq https://github.com/zeromq/libzmq/ RUN \ DIR=/tmp/libzmq && \ @@ -475,8 +419,6 @@ RUN \ --enable-libopencore-amrnb \ --enable-libopencore-amrwb \ --enable-gpl \ - --enable-libass \ - --enable-fontconfig \ --enable-libfreetype \ --enable-libvidstab \ --enable-libmp3lame \ @@ -495,7 +437,6 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ - --enable-libbluray \ --enable-libzmq \ --extra-libs=-ldl \ --prefix="${PREFIX}" \