From 6df18f5052851c7d72ad88ae222f8bc8bbb9ef4b Mon Sep 17 00:00:00 2001 From: Michal Vasilek Date: Sat, 13 Nov 2021 20:02:20 +0100 Subject: [PATCH] igt-gpu-tools: fix build with meson 0.60 --- .../patches/meson-fix-underscorify-call.patch | 36 +++++++++++++++++++ srcpkgs/igt-gpu-tools/template | 2 +- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch diff --git a/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch b/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch new file mode 100644 index 00000000000..142e2fa44fb --- /dev/null +++ b/srcpkgs/igt-gpu-tools/patches/meson-fix-underscorify-call.patch @@ -0,0 +1,36 @@ +From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001 +From: Petri Latvala +Date: Thu, 28 Oct 2021 11:05:31 +0300 +Subject: [PATCH] lib/meson.build: Fix underscorify call +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +f.underscorify() is correct, f.underscorify(f) is an error that later +meson versions don't like at all. + +Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107 +Fixes: 588555f77909 ("lib/i915: Extract helpers for determining scheduler capabilities") +Cc: Arkadiusz Hiler +Signed-off-by: Petri Latvala +Reviewed-by: José Roberto de Souza +--- + lib/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/meson.build b/lib/meson.build +index c3080fc8..297b0ad2 100644 +--- a/lib/meson.build ++++ b/lib/meson.build +@@ -155,7 +155,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h', + + lib_intermediates = [] + foreach f: lib_sources +- name = f.underscorify(f) ++ name = f.underscorify() + lib = static_library('igt-' + name, + [ f, lib_version ], + include_directories: inc, +-- +GitLab + diff --git a/srcpkgs/igt-gpu-tools/template b/srcpkgs/igt-gpu-tools/template index 3b222ecd18d..3f8b4e2b616 100644 --- a/srcpkgs/igt-gpu-tools/template +++ b/srcpkgs/igt-gpu-tools/template @@ -22,7 +22,7 @@ lib32disabled=yes archs="i686* x86_64*" if [ -z "${XBPS_CHECK_PKGS}" ]; then - configure_args+=" -Dbuild_tests=disabled -Dbuild_runner=disabled -Dbuild_docs=disabled" + configure_args+=" -Dtests=disabled -Drunner=disabled -Ddocs=disabled" fi post_install() {