From 8140eca23b8b88ce85a595b58058f92eb7e94aa4 Mon Sep 17 00:00:00 2001
From: Eric Engestrom <eric@igalia.com>
Date: Mon, 18 Apr 2022 17:27:15 +0100
Subject: [PATCH] meson: replace deprecated meson.get_cross_property(...) with
 meson.get_external_property(...)

According to the deprecation note:
> It's a pure subset of meson.get_external_property, and works strangely
> in host == build configurations, since it would be more accurately
> described as get_host_property.

Signed-off-by: Eric Engestrom <eric@igalia.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19904>
---
 .gitlab-ci/meson/build.sh                | 2 +-
 src/compiler/nir/meson.build             | 2 +-
 src/gallium/drivers/llvmpipe/meson.build | 2 +-
 src/gallium/tests/unit/meson.build       | 2 +-
 src/util/tests/format/meson.build        | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci/meson/build.sh b/.gitlab-ci/meson/build.sh
index 79783e6f4ca..f50f8531c94 100755
--- a/.gitlab-ci/meson/build.sh
+++ b/.gitlab-ci/meson/build.sh
@@ -24,7 +24,7 @@ fi
 # tests in their meson.build with:
 #
 # test(...,
-#      should_fail: meson.get_cross_property('xfail', '').contains(t),
+#      should_fail: meson.get_external_property('xfail', '').contains(t),
 #     )
 #
 # where t is the name of the test, and the '' is the string to search when
diff --git a/src/compiler/nir/meson.build b/src/compiler/nir/meson.build
index fe2165288db..f7eb260f392 100644
--- a/src/compiler/nir/meson.build
+++ b/src/compiler/nir/meson.build
@@ -437,7 +437,7 @@ if with_tests
     ),
     suite : ['compiler', 'nir'],
     # TODO: Use a negative filter for gtest instead of the expect failure here.
-    should_fail : meson.get_cross_property('xfail', '').contains('load_store_vectorizer'),
+    should_fail : meson.get_external_property('xfail', '').contains('load_store_vectorizer'),
     protocol : gtest_test_protocol,
   )
 
diff --git a/src/gallium/drivers/llvmpipe/meson.build b/src/gallium/drivers/llvmpipe/meson.build
index 210e2483970..1fd527e0313 100644
--- a/src/gallium/drivers/llvmpipe/meson.build
+++ b/src/gallium/drivers/llvmpipe/meson.build
@@ -140,7 +140,7 @@ if with_tests and with_gallium_softpipe and draw_with_llvm
         link_with : [libllvmpipe, libgallium],
       ),
       suite : ['llvmpipe'],
-      should_fail : meson.get_cross_property('xfail', '').contains(t),
+      should_fail : meson.get_external_property('xfail', '').contains(t),
       timeout: 240,
     )
   endforeach
diff --git a/src/gallium/tests/unit/meson.build b/src/gallium/tests/unit/meson.build
index 1e0e6d45835..e114c2bb075 100644
--- a/src/gallium/tests/unit/meson.build
+++ b/src/gallium/tests/unit/meson.build
@@ -39,7 +39,7 @@ foreach t : ['pipe_barrier_test', 'u_cache_test', 'u_half_test',
     endif
   elif t != 'u_cache_test' # u_cache_test is slow
     test(t, exe, suite: 'gallium',
-         should_fail : meson.get_cross_property('xfail', '').contains(t),
+         should_fail : meson.get_external_property('xfail', '').contains(t),
     )
   endif
 endforeach
diff --git a/src/util/tests/format/meson.build b/src/util/tests/format/meson.build
index 761ce49abe7..9184015c647 100644
--- a/src/util/tests/format/meson.build
+++ b/src/util/tests/format/meson.build
@@ -7,6 +7,6 @@ foreach t : ['srgb', 'u_format_test', 'u_format_compatible_test']
       dependencies : idep_mesautil,
     ),
     suite : 'format',
-    should_fail : meson.get_cross_property('xfail', '').contains(t),
+    should_fail : meson.get_external_property('xfail', '').contains(t),
   )
 endforeach