From cfc8cf198ceb67f8f1745f3e1a8acb9a21ee740f Mon Sep 17 00:00:00 2001 From: Caio Oliveira Date: Tue, 20 Feb 2024 12:52:02 -0800 Subject: [PATCH] intel/meson: Fix warning about broken str.format Meson complains: ../src/intel/decoder/meson.build:67: DEPRECATION: Project uses feature that was always broken, and is now deprecated since '1.3.0': str.format: Value other than strings, integers, bools, options, dictionaries and lists thereof.. So instead of trying to format a file, change gentest_xml to store just the string. Need to adapt genxml_path to consider the current source dir, but everything else works like before. Reviewed-by: Dylan Baker Part-of: --- src/intel/decoder/meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/intel/decoder/meson.build b/src/intel/decoder/meson.build index 52d6d2c0784..b9c87f6d022 100644 --- a/src/intel/decoder/meson.build +++ b/src/intel/decoder/meson.build @@ -36,7 +36,7 @@ idep_intel_decoder = declare_dependency( ) if with_tests and not with_platform_android - gentest_xml = files('tests/gentest.xml') + gentest_xml = 'tests/gentest.xml' _name = 'gentest_pack.h' gentest_pack = custom_target( _name, @@ -47,8 +47,8 @@ if with_tests and not with_platform_android depend_files: gen_pack_header_deps ) - genxml_path = join_paths(dir_source_root, - '@0@'.format(gentest_xml[0])) + genxml_path = join_paths(meson.current_source_dir(), + '@0@'.format(gentest_xml)) test( 'genxml_test',