diff options
-rw-r--r-- | meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-fix-meson-0.60-compatibility.patch | 24 | ||||
-rw-r--r-- | meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb | 4 |
2 files changed, 27 insertions, 1 deletions
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 @@ | |||
1 | From b9a19aa4bdb21751c04c0e3ba8a9e2e35a10c953 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex@linutronix.de> | ||
3 | Date: Mon, 25 Oct 2021 18:18:15 +0200 | ||
4 | Subject: [PATCH] lib/meson.build: fix meson 0.60 compatibility | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | Signed-off-by: Alexander Kanavin <alex@linutronix.de> | ||
8 | --- | ||
9 | lib/meson.build | 2 +- | ||
10 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
11 | |||
12 | diff --git a/lib/meson.build b/lib/meson.build | ||
13 | index 9929520e..1a525587 100644 | ||
14 | --- a/lib/meson.build | ||
15 | +++ b/lib/meson.build | ||
16 | @@ -152,7 +152,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h', | ||
17 | |||
18 | lib_intermediates = [] | ||
19 | foreach f: lib_sources | ||
20 | - name = f.underscorify(f) | ||
21 | + name = f.underscorify() | ||
22 | lib = static_library('igt-' + name, | ||
23 | [ f, lib_version ], | ||
24 | 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 | |||
12 | SRCREV = "203def046b466fb2da67f9f15552d84e1c0b41f2" | 12 | SRCREV = "203def046b466fb2da67f9f15552d84e1c0b41f2" |
13 | PV = "1.26" | 13 | PV = "1.26" |
14 | 14 | ||
15 | SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https" | 15 | SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https \ |
16 | file://0001-lib-meson.build-fix-meson-0.60-compatibility.patch \ | ||
17 | " | ||
16 | 18 | ||
17 | S = "${WORKDIR}/git" | 19 | S = "${WORKDIR}/git" |
18 | 20 | ||