summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2023-02-08 08:21:07 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-02-09 09:57:24 +0000
commit8d9f63edc1d8479b02c1769c6b7d0345fd0b7782 (patch)
tree0d5ff52c47c316602fc7aec4ed865413caca26a4
parentaef302222aa803e24b62ba2a43e73a42ed35abc9 (diff)
downloadpoky-8d9f63edc1d8479b02c1769c6b7d0345fd0b7782.tar.gz
igt-gpu-tools: upgrade 1.26 -> 1.27.1
/usr/bin/code_cov_parse_info is written in perl, so that's a new RDEPENDS. (From OE-Core rev: 31e5e37987e43ce2691a00763538d6061ceadf28) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-fix-meson-0.60-compatibility.patch24
-rw-r--r--meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools_git.bb10
2 files changed, 4 insertions, 30 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
deleted file mode 100644
index e7c782055b..0000000000
--- a/meta/recipes-graphics/igt-gpu-tools/igt-gpu-tools/0001-lib-meson.build-fix-meson-0.60-compatibility.patch
+++ /dev/null
@@ -1,24 +0,0 @@
1From b9a19aa4bdb21751c04c0e3ba8a9e2e35a10c953 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex@linutronix.de>
3Date: Mon, 25 Oct 2021 18:18:15 +0200
4Subject: [PATCH] lib/meson.build: fix meson 0.60 compatibility
5
6Upstream-Status: Backport [https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/963917a3565466832a3b2fc22e9285d34a0bf944]
7Signed-off-by: Alexander Kanavin <alex@linutronix.de>
8---
9 lib/meson.build | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-)
11
12diff --git a/lib/meson.build b/lib/meson.build
13index 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 bb2f9564d2..fbe5e1a4e7 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
@@ -9,17 +9,15 @@ LICENSE = "MIT"
9 9
10inherit meson pkgconfig 10inherit meson pkgconfig
11 11
12SRCREV = "203def046b466fb2da67f9f15552d84e1c0b41f2" 12SRCREV = "2b29e8ac07fbcfadc48b9d60e4d736a6e3b289ab"
13PV = "1.26" 13PV = "1.27.1"
14 14
15SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;branch=master \ 15SRC_URI = "git://gitlab.freedesktop.org/drm/igt-gpu-tools.git;protocol=https;branch=master"
16 file://0001-lib-meson.build-fix-meson-0.60-compatibility.patch \
17 "
18 16
19S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
20 18
21DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 procps libunwind kmod openssl elfutils alsa-lib json-c bison-native" 19DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 procps libunwind kmod openssl elfutils alsa-lib json-c bison-native"
22RDEPENDS:${PN} += "bash" 20RDEPENDS:${PN} += "bash perl"
23RDEPENDS:${PN}-tests += "bash" 21RDEPENDS:${PN}-tests += "bash"
24 22
25PACKAGE_BEFORE_PN = "${PN}-benchmarks ${PN}-tests" 23PACKAGE_BEFORE_PN = "${PN}-benchmarks ${PN}-tests"