ci: build with subrandr on mingw64 and msys2

Author: afishhh

.github/workflows/build.yml

@@ -44,6 +44,7 @@ jobs:
             wine: wine32
           - target: x86_64-w64-mingw32
             wine: wine64
+            rustc-target: x86_64-pc-windows-gnu
     steps:
       - uses: actions/checkout@v4
 
@@ -64,6 +65,11 @@ jobs:
           sudo apt-get update
           sudo apt-get install --no-install-recommends -y ccache g++-mingw-w64 gcc-multilib meson nasm ninja-build pkgconf ${{ matrix.wine }} wine
 
+      - name: Install Rust toolchain
+        uses: dtolnay/rust-toolchain@stable
+        with:
+          targets: ${{ matrix.rustc-target }}
+
       - name: Install Meson Wraps
         run: |
           mkdir subprojects -p
@@ -74,6 +80,7 @@ jobs:
           ./ci/build-mingw64.sh
         env:
           TARGET: ${{ matrix.target }}
+          RUSTC_TARGET: ${{ matrix.rustc-target }}
 
       - name: Build with meson
         id: build
@@ -566,6 +573,7 @@ jobs:
             uchardet:p
             vapoursynth:p
             vulkan-devel:p
+            rust:p
 
       - name: Build with meson
         id: build

ci/build-common.sh

@@ -3,4 +3,20 @@ common_args="--werror \
 -Dtests=true \
 "
 
+build_subrandr() {
+    local target="$2"
+    local prefix="$1"
+
+    if [[ -n "$target" ]]; then
+        target_arg="--target $target"
+    else
+        target_arg=""
+    fi
+
+    git clone --depth=1 https://github.com/afishhh/subrandr.git
+    pushd subrandr
+    cargo xtask install $target_arg --prefix "$prefix"
+    popd
+}
+
 export CFLAGS="$CFLAGS -Wno-error=deprecated -Wno-error=deprecated-declarations -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=3"

ci/build-mingw64.sh

@@ -275,6 +275,11 @@ _luajit () {
 }
 _luajit_mark=lib/libluajit-5.1.a
 
+_subrandr () {
+    RUSTFLAGS="-L$prefix_dir/lib" build_subrandr "$prefix_dir" "$RUSTC_TARGET"
+}
+_subrandr_mark=lib/libsubrandr.dll.a
+
 for x in iconv zlib shaderc spirv-cross nv-headers dav1d; do
     build_if_missing $x
 done
@@ -285,6 +290,12 @@ fi
 for x in ffmpeg libplacebo freetype fribidi harfbuzz libass luajit; do
     build_if_missing $x
 done
+if [[ -n "$RUSTC_TARGET" ]]; then
+    build_if_missing subrandr
+    subrandr_enabled="-Dsubrandr=enabled"
+else
+    subrandr_enabled=""
+fi
 
 ## mpv
 
@@ -302,7 +313,8 @@ meson setup $build --cross-file "$prefix_dir/crossfile" $common_args \
   -Dmujs:werror=false \
   -Dmujs:default_library=static \
   -Dlua=luajit \
-  -D{shaderc,spirv-cross,d3d11,javascript}=enabled
+  -D{shaderc,spirv-cross,d3d11,javascript}=enabled \
+  $subrandr_enabled
 meson compile -C $build
 
 if [ "$2" = pack ]; then
@@ -319,7 +331,7 @@ if [ "$2" = pack ]; then
     pushd artifact/tmp
     dlls=(
         libgcc_*.dll lib{ssp,stdc++,winpthread}-[0-9]*.dll # compiler runtime
-        av*.dll sw*.dll postproc-[0-9]*.dll lib{ass,freetype,fribidi,harfbuzz,iconv,placebo}-[0-9]*.dll
+        av*.dll sw*.dll {postproc,subrandr}-[0-9]*.dll lib{ass,freetype,fribidi,harfbuzz,iconv,placebo}-[0-9]*.dll
         lib{shaderc_shared,spirv-cross-c-shared,dav1d}.dll zlib1.dll
     )
     if [[ -f vulkan-1.dll ]]; then

ci/build-msys2.sh

@@ -8,9 +8,20 @@ args=(
   -D{egl-angle-lib,egl-angle-win32,pdf-build,rubberband,win32-smtc}=enabled
 )
 
-[[ "$SYS" == "clang64" ]] && args+=(
-  -Db_sanitize=address,undefined
-)
+if [[ "$SYS" == "clang64" ]]; then
+    args+=(
+      -Db_sanitize=address,undefined
+    )
+else # sanitizers are not supported on stable rust yet so clang64 is excluded
+    echo "::group::Building subrandr"
+    build_subrandr "$PWD/subrandr_prefix"
+    echo "::endgroup::"
+    export PKG_CONFIG_PATH="$PWD/subrandr_prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
+    mkdir build
+    # make sure mpv.com will be able to find the DLL
+    cp subrandr_prefix/bin/subrandr-[0-9]*.dll build
+    args+=(-Dsubrandr=enabled)
+fi
 
 meson setup build $common_args "${args[@]}"
 meson compile -C build