turnip: image_view rework

[mesa.git] / .gitlab-ci / build-apitrace.sh

diff --git a/.gitlab-ci/build-apitrace.sh b/.gitlab-ci/build-apitrace.sh
index 785a5ae52e7b4fd87b81147ac09daa0328a537b4..87582f3b9e655e3873e50a6aceb48439ad425905 100644 (file)
--- a/.gitlab-ci/build-apitrace.sh
+++ b/.gitlab-ci/build-apitrace.sh
@@ -2,13 +2,25 @@
 
 set -ex
 
+# Need an unreleased version of Waffle for surfaceless support in apitrace
+# Replace this build with the Debian package once that's possible
+
+WAFFLE_VERSION="e3c995d9a2693b687501715b6550619922346089"
+git clone https://gitlab.freedesktop.org/mesa/waffle.git --single-branch --no-checkout /waffle
+pushd /waffle
+git checkout "$WAFFLE_VERSION"
+cmake -B_build -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_BUILD_TYPE=Release .
+make -C _build -j4 install
+popd
+rm -rf /waffle
+
 APITRACE_VERSION="9.0"
 
 git clone https://github.com/apitrace/apitrace.git --single-branch --no-checkout /apitrace
 pushd /apitrace
 git checkout "$APITRACE_VERSION"
-cmake -G Ninja -B_build -H. -DCMAKE_BUILD_TYPE=Release -DENABLE_GUI=False
-ninja -C _build -j4
+cmake -G Ninja -B_build -H. -DCMAKE_BUILD_TYPE=Release -DENABLE_GUI=False -DENABLE_WAFFLE=on -DWaffle_DIR=/usr/local/lib/cmake/Waffle/
+ninja -C _build
 mkdir build
 cp _build/apitrace build
 cp _build/glretrace build