Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion projects/ffmpeg/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions projects/ffmpeg/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand All @@ -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
Expand Down