diff --git a/projects/ffmpeg/Dockerfile b/projects/ffmpeg/Dockerfile index ea4a43f1c992..55f4c2ca0f3a 100644 --- a/projects/ffmpeg/Dockerfile +++ b/projects/ffmpeg/Dockerfile @@ -20,7 +20,8 @@ RUN curl -LO https://mirrors.kernel.org/ubuntu/pool/main/a/automake-1.16/automak apt install ./automake_1.16.5-1.3_all.deb RUN curl -LO https://mirrors.kernel.org/ubuntu/pool/main/a/autoconf/autoconf_2.72-3_all.deb && \ apt install ./autoconf_2.72-3_all.deb -RUN python3 -m pip install --upgrade pip && python3 -m pip install -U meson ninja +# Meson is pinned to get around https://github.com/mesonbuild/meson/issues/14533 +RUN python3 -m pip install --upgrade pip && python3 -m pip install -U meson==1.7.2 ninja RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg diff --git a/projects/ffmpeg/build.sh b/projects/ffmpeg/build.sh index 50c906894f4c..13e50d6e715b 100755 --- a/projects/ffmpeg/build.sh +++ b/projects/ffmpeg/build.sh @@ -64,7 +64,7 @@ meson_install() { cd $SRC/$1 CFLAGS="$MESON_CFLAGS" CXXFLAGS="$MESON_CXXFLAGS" \ meson setup build -Dprefix="$FFMPEG_DEPS_PATH" -Ddefault_library=static -Dprefer_static=true \ - --libdir "$LIBDIR" ${2:-} + --wrap-mode=nofallback --libdir "$LIBDIR" ${2:-} meson compile -C build meson install -C build } @@ -85,10 +85,10 @@ make clean make -j$(nproc) make install -meson_install freetype +meson_install freetype "-Dharfbuzz=disabled" meson_install fribidi "-Ddocs=false -Dtests=false" meson_install harfbuzz "-Ddocs=disabled -Dtests=disabled" -meson_install fontconfig +meson_install fontconfig "-Dtests=disabled -Dtools=disabled" cd $SRC/libass ./autogen.sh