Not primary scope of relevant MR, just some incremental changes.
Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21977>
git clone --single-branch -b master --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer
pushd third_party/virglrenderer
git checkout "$VIRGLRENDERER_VERSION"
-meson build/ -Drender-server-worker=process -Dvenus=true $EXTRA_MESON_ARGS
-ninja -C build install
+meson setup build/ -Drender-server-worker=process -Dvenus=true $EXTRA_MESON_ARGS
+meson install -C build
popd
RUSTFLAGS='-L native=/usr/local/lib' cargo install \
-#!/bin/bash
+#!/usr/bin/env bash
# shellcheck disable=SC2086 # we want word splitting
set -ex
https://dri.freedesktop.org/libdrm/"$LIBDRM_VERSION".tar.xz
tar -xvf "$LIBDRM_VERSION".tar.xz && rm "$LIBDRM_VERSION".tar.xz
cd "$LIBDRM_VERSION"
-meson build -D vc4=false -D freedreno=false -D etnaviv=false $EXTRA_MESON_ARGS
-ninja -C build install
+meson setup build -D vc4=false -D freedreno=false -D etnaviv=false $EXTRA_MESON_ARGS
+meson install -C build
cd ..
rm -rf "$LIBDRM_VERSION"
-#!/bin/bash
+#!/usr/bin/env bash
# shellcheck disable=SC2086 # we want word splitting
set -ex
git clone https://gitlab.freedesktop.org/wayland/wayland
cd wayland
git checkout "$LIBWAYLAND_VERSION"
-meson -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true _build $EXTRA_MESON_ARGS
-ninja -C _build install
+meson setup -Ddocumentation=false -Ddtd_validation=false -Dlibraries=true _build $EXTRA_MESON_ARGS
+meson install -C _build
cd ..
rm -rf wayland
git clone https://gitlab.freedesktop.org/wayland/wayland-protocols
cd wayland-protocols
git checkout "$WAYLAND_PROTOCOLS_VERSION"
-meson _build $EXTRA_MESON_ARGS
-ninja -C _build install
+meson setup _build $EXTRA_MESON_ARGS
+meson install -C _build
cd ..
rm -rf wayland-protocols
cd $LIBDRM_VERSION
rm -rf build-$arch
- meson build-$arch \
+ meson setup build-$arch \
--cross-file=/cross_file-$arch.txt \
--libdir=lib/$arch \
-Dlibkms=false \
-Dintel=false \
-Dcairo-tests=false \
-Dvalgrind=false
- ninja -C build-$arch install
+ meson install -C build-$arch
cd ..
done
popd
git clone https://github.com/microsoft/DirectX-Headers -b v1.610.0 --depth 1
-mkdir -p DirectX-Headers/build
-pushd DirectX-Headers/build
-meson .. --backend=ninja --buildtype=release -Dbuild-test=false
-ninja
-ninja install
+pushd DirectX-Headers
+meson setup build --backend=ninja --buildtype=release -Dbuild-test=false
+meson install -C build
popd
rm -rf DirectX-Headers