File tree Expand file tree Collapse file tree 2 files changed +5
-4
lines changed
Expand file tree Collapse file tree 2 files changed +5
-4
lines changed Original file line number Diff line number Diff line change @@ -20,7 +20,8 @@ RUN curl -LO https://mirrors.kernel.org/ubuntu/pool/main/a/automake-1.16/automak
2020 apt install ./automake_1.16.5-1.3_all.deb
2121RUN curl -LO https://mirrors.kernel.org/ubuntu/pool/main/a/autoconf/autoconf_2.72-3_all.deb && \
2222 apt install ./autoconf_2.72-3_all.deb
23- RUN python3 -m pip install --upgrade pip && python3 -m pip install -U meson ninja
23+ # Meson is pinned to get around https://github.com/mesonbuild/meson/issues/14533
24+ RUN python3 -m pip install --upgrade pip && python3 -m pip install -U meson==1.7.2 ninja
2425
2526RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
2627
Original file line number Diff line number Diff line change @@ -64,7 +64,7 @@ meson_install() {
6464 cd $SRC /$1
6565 CFLAGS=" $MESON_CFLAGS " CXXFLAGS=" $MESON_CXXFLAGS " \
6666 meson setup build -Dprefix=" $FFMPEG_DEPS_PATH " -Ddefault_library=static -Dprefer_static=true \
67- --libdir " $LIBDIR " ${2:- }
67+ --wrap-mode=nofallback -- libdir " $LIBDIR " ${2:- }
6868 meson compile -C build
6969 meson install -C build
7070}
@@ -85,10 +85,10 @@ make clean
8585make -j$( nproc)
8686make install
8787
88- meson_install freetype
88+ meson_install freetype " -Dharfbuzz=disabled "
8989meson_install fribidi " -Ddocs=false -Dtests=false"
9090meson_install harfbuzz " -Ddocs=disabled -Dtests=disabled"
91- meson_install fontconfig
91+ meson_install fontconfig " -Dtests=disabled -Dtools=disabled "
9292
9393cd $SRC /libass
9494./autogen.sh
You can’t perform that action at this time.
0 commit comments