File tree 2 files changed +5
-4
lines changed
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
20
20
apt install ./automake_1.16.5-1.3_all.deb
21
21
RUN curl -LO https://mirrors.kernel.org/ubuntu/pool/main/a/autoconf/autoconf_2.72-3_all.deb && \
22
22
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
24
25
25
26
RUN git clone https://git.ffmpeg.org/ffmpeg.git ffmpeg
26
27
Original file line number Diff line number Diff line change @@ -64,7 +64,7 @@ meson_install() {
64
64
cd $SRC /$1
65
65
CFLAGS=" $MESON_CFLAGS " CXXFLAGS=" $MESON_CXXFLAGS " \
66
66
meson setup build -Dprefix=" $FFMPEG_DEPS_PATH " -Ddefault_library=static -Dprefer_static=true \
67
- --libdir " $LIBDIR " ${2:- }
67
+ --wrap-mode=nofallback -- libdir " $LIBDIR " ${2:- }
68
68
meson compile -C build
69
69
meson install -C build
70
70
}
@@ -85,10 +85,10 @@ make clean
85
85
make -j$( nproc)
86
86
make install
87
87
88
- meson_install freetype
88
+ meson_install freetype " -Dharfbuzz=disabled "
89
89
meson_install fribidi " -Ddocs=false -Dtests=false"
90
90
meson_install harfbuzz " -Ddocs=disabled -Dtests=disabled"
91
- meson_install fontconfig
91
+ meson_install fontconfig " -Dtests=disabled -Dtools=disabled "
92
92
93
93
cd $SRC /libass
94
94
./autogen.sh
You can’t perform that action at this time.
0 commit comments