diff options
Diffstat (limited to 'meta/recipes-graphics/igt-gpu-tools')
-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 | 28 |
2 files changed, 41 insertions, 11 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..e7c782055b --- /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 <alex@linutronix.de> +Date: Mon, 25 Oct 2021 18:18:15 +0200 +Subject: [PATCH] lib/meson.build: fix meson 0.60 compatibility + +Upstream-Status: Backport [https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/963917a3565466832a3b2fc22e9285d34a0bf944] +Signed-off-by: Alexander Kanavin <alex@linutronix.de> +--- + 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 f60880c292..bb2f9564d2 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 @@ -1,28 +1,34 @@ SUMMARY = "IGT GPU Tools" DESCRIPTION = "IGT GPU Tools is a collection of tools for development and testing of the DRM drivers" +HOMEPAGE = "https://gitlab.freedesktop.org/drm/igt-gpu-tools" +BUGTRACKER = "https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues" LIC_FILES_CHKSUM = "file://COPYING;md5=67bfee4df38fa6ecbe3a675c552d4c08" LICENSE = "MIT" -inherit meson +inherit meson pkgconfig -SRCREV = "d16ad07e7f2a028e14d61f570931c87fa5ce404c" -PV = "1.25+git${SRCPV}" +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;branch=master \ + file://0001-lib-meson.build-fix-meson-0.60-compatibility.patch \ + " S = "${WORKDIR}/git" DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 procps libunwind kmod openssl elfutils alsa-lib json-c bison-native" -RDEPENDS_${PN} += "bash" -RDEPENDS_${PN}-tests += "bash" +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN}-tests += "bash" PACKAGE_BEFORE_PN = "${PN}-benchmarks ${PN}-tests" -EXTRA_OEMESON = "-Ddocs=disabled -Drunner=enabled" +PACKAGECONFIG[chamelium] = "-Dchamelium=enabled,-Dchamelium=disabled,gsl xmlrpc-c" + +EXTRA_OEMESON = "-Ddocs=disabled -Drunner=enabled -Dsrcdir=/usr/src/debug/${PN}/${PV}-${PR}/git/" COMPATIBLE_HOST = "(x86_64.*|i.86.*|arm.*|aarch64).*-linux" -COMPATIBLE_HOST_libc-musl_class-target = "null" +COMPATIBLE_HOST:libc-musl:class-target = "null" SECURITY_LDFLAGS = "${SECURITY_X_LDFLAGS}" gputools_sysroot_preprocess() { @@ -30,7 +36,7 @@ gputools_sysroot_preprocess() { } SYSROOT_PREPROCESS_FUNCS += "gputools_sysroot_preprocess" -do_install_append() { +do_install:append() { install -d ${D}/usr/share/${BPN}/scripts install ${S}/scripts/run-tests.sh ${D}/usr/share/${BPN}/scripts install -d ${D}/usr/share/${BPN}/runner @@ -38,8 +44,8 @@ do_install_append() { install -D ${B}/runner/igt_resume ${D}/usr/share/${BPN}/runner } -FILES_${PN}-benchmarks += "${libexecdir}/${BPN}/benchmarks" -FILES_${PN}-tests += "\ +FILES:${PN}-benchmarks += "${libexecdir}/${BPN}/benchmarks" +FILES:${PN}-tests += "\ ${libexecdir}/${BPN}/*\ ${datadir}/${BPN}/1080p-right.png\ ${datadir}/${BPN}/1080p-left.png\ |