summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2021-11-12 15:02:09 -0500
committerMike Gilbert <floppym@gentoo.org>2021-11-12 15:02:35 -0500
commit3baaa6904bc3b294ade2ef3b7d34086f7e703a8f (patch)
tree82cf358c0f2f02e8cdc2a188d6daacfb389ee692 /x11-apps
parentdev-lang/rust: add rust-src useflag (diff)
downloadgentoo-3baaa6904bc3b294ade2ef3b7d34086f7e703a8f.tar.gz
gentoo-3baaa6904bc3b294ade2ef3b7d34086f7e703a8f.tar.bz2
gentoo-3baaa6904bc3b294ade2ef3b7d34086f7e703a8f.zip
x11-apps/igt-gpu-tools: backport meson fix
Closes: https://bugs.gentoo.org/821628 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'x11-apps')
-rw-r--r--x11-apps/igt-gpu-tools/files/igt-gpu-tools-1.26-lib-meson-build-Fix-underscorify-call.patch36
-rw-r--r--x11-apps/igt-gpu-tools/igt-gpu-tools-1.26-r1.ebuild3
2 files changed, 39 insertions, 0 deletions
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 000000000000..142e2fa44fb6
--- /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 <petri.latvala@intel.com>
+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 <arek@hiler.eu>
+Signed-off-by: Petri Latvala <petri.latvala@intel.com>
+Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
+---
+ 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 e165a87a6c39..17c026cd7d0e 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
}