From 33cd0f7e23d714869eda249ae6c3f9761caa4c96 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Wed, 27 Oct 2021 11:07:33 +0200 Subject: igt-gpu-tools: address meson 0.60 compatibility Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni --- ...-meson.build-fix-meson-0.60-compatibility.patch | 24 ++++++++++++++++++++++ .../igt-gpu-tools/igt-gpu-tools_git.bb | 4 +++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-fix-meson-0.60-compatibility.patch (limited to 'meta/recipes-graphics/igt-gpu-tools') diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-fix-meson-0.60-compatibility.patch b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-fix-meson-0.60-compatibility.patch new file mode 100644 index 0000000000..159425a643 --- /dev/null +++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-fix-meson-0.60-compatibility.patch @@ -0,0 +1,24 @@ +From b9a19aa4bdb21751c04c0e3ba8a9e2e35a10c953 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Mon, 25 Oct 2021 18:18:15 +0200 +Subject: [PATCH] lib/meson.build: fix meson 0.60 compatibility + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin +--- + lib/meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/meson.build b/lib/meson.build +index 9929520e..1a525587 100644 +--- a/lib/meson.build ++++ b/lib/meson.build +@@ -152,7 +152,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, diff --git a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb index 1a00eca7d3..7d912e4e4c 100644 --- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb +++ b/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb @@ -12,7 +12,9 @@ inherit meson pkgconfig SRCREV = "203def046b466fb2da67f9f15552d84e1c0b41f2" PV = "1.26" -SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https" +SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https \ + file://0001-lib-meson.build-fix-meson-0.60-compatibility.patch \ + " S = "${WORKDIR}/git" -- cgit 1.2.3-korg