mpv: pin Meson to 1.7.2 for now (#13298)

* mpv: pin Meson to 1.7.2 for now
* mpv: download all sources in Dockerfile
* mpv: --disable-postproc doesn't exist anymore in ffmpeg config

Author: kasper93

projects/mpv/Dockerfile

@@ -22,11 +22,24 @@ ENV PYTHONDONTWRITEBYTECODE=1
 ENV VIRTUAL_ENV=$SRC/venv
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
+# Meson is pinned to get around https://github.com/mesonbuild/meson/issues/14524
 RUN python -m venv $VIRTUAL_ENV && \
-    python -m pip --no-cache-dir install meson ninja
+    python -m pip --no-cache-dir install meson==1.7.2 ninja
 
 RUN git clone --depth 1 https://github.com/mpv-player/mpv mpv
 RUN git clone --depth 1 https://github.com/FFmpeg/FFmpeg ffmpeg
+RUN git clone --depth 1 --recursive https://github.com/haasn/libplacebo mpv/subprojects/libplacebo
+RUN git clone --depth 1 https://github.com/libass/libass mpv/subprojects/libass
+RUN mkdir mpv/subprojects -p && cd mpv && \
+    meson wrap install expat && \
+    meson wrap install fontconfig && \
+    meson wrap install freetype2 && \
+    meson wrap install fribidi && \
+    meson wrap install harfbuzz && \
+    meson wrap install lcms2 && \
+    meson wrap install uchardet && \
+    meson wrap install xxhash && \
+    meson subprojects download
 
 WORKDIR $SRC/mpv
 COPY build.sh $SRC/

projects/mpv/build.sh

@@ -39,9 +39,11 @@ EOF
 pushd $SRC/ffmpeg
 ./configure --cc=$CC --cxx=$CXX --ld="$CXX $CXXFLAGS" \
             --enable-{gpl,nonfree} \
-            --disable-{asm,bsfs,doc,encoders,filters,muxers,network,postproc,programs,shared} \
+            --disable-{asm,bsfs,doc,encoders,filters,muxers,network,programs,shared} \
             --enable-filter={sine,yuvtestsrc} \
             --pkg-config-flags="--static" \
+            --disable-{debug,optimizations} \
+            --optflags=-O1 \
             $FFMPEG_BUILD_ARGS
 make -j`nproc`
 make install
@@ -64,39 +66,20 @@ pushd $SRC/mpv
 sed -i -e "/^\s*flags += \['-fsanitize=address,undefined,fuzzer', '-fno-omit-frame-pointer'\]/d; \
           s|^\s*link_flags += \['-fsanitize=address,undefined,fuzzer', '-fno-omit-frame-pointer'\]| \
           link_flags += \['$LIB_FUZZING_ENGINE'\]|" meson.build
-mkdir subprojects -p
-meson wrap install expat
-meson wrap install fontconfig
-meson wrap install freetype2
-meson wrap install fribidi
-meson wrap install harfbuzz
-meson wrap install lcms2
-meson wrap install uchardet
-cat <<EOF > subprojects/libplacebo.wrap
-[wrap-git]
-url = https://github.com/haasn/libplacebo
-revision = master
-depth = 1
-clone-recursive = true
-EOF
-cat <<EOF > subprojects/libass.wrap
-[wrap-git]
-url = https://github.com/libass/libass
-revision = master
-depth = 1
-EOF
-meson setup build -Dbackend_max_links=4 -Ddefault_library=static -Dprefer_static=true \
+
+meson setup build --wrap-mode=nodownload -Dbuildtype=plain -Dbackend_max_links=4 -Ddefault_library=static -Dprefer_static=true \
                   -Dfuzzers=true -Dlibmpv=true -Dcplayer=false -Dgpl=true \
                   -Duchardet=enabled -Dlcms2=enabled -Dtests=false \
                   -Dfreetype2:harfbuzz=disabled -Dfreetype2:zlib=disabled -Dfreetype2:png=disabled \
                   -Dharfbuzz:tests=disabled -Dharfbuzz:introspection=disabled -Dharfbuzz:docs=disabled \
-                  -Dharfbuzz:utilities=disabled -Dfontconfig:doc=disabled -Dfontconfig:nls=disabled \
+                  -Dharfbuzz:utilities=disabled -Dfontconfig:doc=disabled -Dfontconfig:nls=disabled -Dfontconfig:xml-backend=expat \
                   -Dfontconfig:tests=disabled -Dfontconfig:tools=disabled -Dfontconfig:cache-build=disabled \
                   -Dfribidi:deprecated=false -Dfribidi:docs=false -Dfribidi:bin=false -Dfribidi:tests=false \
-                  -Dlibplacebo:lcms=enabled -Dlibplacebo:demos=false \
+                  -Dlibplacebo:lcms=enabled -Dlibplacebo:xxhash=enabled -Dlibplacebo:demos=false \
                   -Dlcms2:jpeg=disabled -Dlcms2:tiff=disabled \
                   -Dlibass:fontconfig=enabled -Dlibass:asm=disabled \
-                  -Dc_link_args="$CXXFLAGS -lc++" -Dcpp_link_args="$CXXFLAGS" \
+                  -Dc_args="$CFLAGS" -Dcpp_args="$CXXFLAGS" \
+                  -Dc_link_args="$CFLAGS" -Dcpp_link_args="$CXXFLAGS" \
                   --libdir $LIBDIR
 meson compile -C build fuzzers