commit: 3baaa6904bc3b294ade2ef3b7d34086f7e703a8f Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Nov 12 20:02:09 2021 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Nov 12 20:02:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3baaa690
x11-apps/igt-gpu-tools: backport meson fix Closes: https://bugs.gentoo.org/821628 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> ....26-lib-meson-build-Fix-underscorify-call.patch | 36 ++++++++++++++++++++++ .../igt-gpu-tools/igt-gpu-tools-1.26-r1.ebuild | 3 ++ 2 files changed, 39 insertions(+) diff --git a/x11-apps/igt-gpu-tools/files/igt-gpu-tools-1.26-lib-meson-build-Fix-underscorify-call.patch b/x11-apps/igt-gpu-tools/files/igt-gpu-tools-1.26-lib-meson-build-Fix-underscorify-call.patch new file mode 100644 index 00000000000..142e2fa44fb --- /dev/null +++ b/x11-apps/igt-gpu-tools/files/igt-gpu-tools-1.26-lib-meson-build-Fix-underscorify-call.patch @@ -0,0 +1,36 @@ +From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001 +From: Petri Latvala <[email protected]> +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 <[email protected]> +Signed-off-by: Petri Latvala <[email protected]> +Reviewed-by: José Roberto de Souza <[email protected]> +--- + 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/x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r1.ebuild b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r1.ebuild index e165a87a6c3..17c026cd7d0 100644 --- a/x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r1.ebuild +++ b/x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r1.ebuild @@ -77,6 +77,9 @@ BDEPEND="${PYTHON_DEPS}" src_prepare() { sed -e "s/find_program('rst2man-3'/find_program('rst2man.py', 'rst2man-3'/" -i man/meson.build + local PATCHES=( + "${FILESDIR}"/igt-gpu-tools-1.26-lib-meson-build-Fix-underscorify-call.patch + ) default_src_prepare }
