Accepting request 946551 from X11:XOrg

- Build with meson 0.60 (intel-gpu-tools_fix-meson.patch)
  + https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107

OBS-URL: https://build.opensuse.org/request/show/946551
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/intel-gpu-tools?expand=0&rev=2

intel-gpu-tools.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Jan 14 23:41:24 UTC 2022 - Tejas Guruswamy <tejas.guruswamy@opensuse.org>
+
+- Build with meson 0.60 (intel-gpu-tools_fix-meson.patch)
+  + https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107
+
 -------------------------------------------------------------------
 Sat May 15 22:10:00 UTC 2021 - Tejas Guruswamy <tejas.guruswamy@opensuse.org>
 

intel-gpu-tools.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package intel-gpu-tools
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -26,6 +26,8 @@ URL:            https://xorg.freedesktop.org/
 Source0:        http://xorg.freedesktop.org/releases/individual/app/igt-gpu-tools-%{version}.tar.xz
 Source1:        http://xorg.freedesktop.org/releases/individual/app/igt-gpu-tools-%{version}.tar.xz.sig
 Patch0:         u_%{name}-1.7-fix-bashisms.patch
+#PATCH-FIX-UPSTREAM build with latest meson (commit 963917a3)
+Patch1:         intel-gpu-tools_fix-meson.patch
 
 BuildRequires:  bison
 BuildRequires:  flex
@@ -62,6 +64,7 @@ DRM driver.
 
 %package devel
 Summary:        Development files for %{name}
+Group:          Development/Tools/Other
 Requires:       %{name} = %{version}
 
 %description devel
@@ -70,6 +73,7 @@ Development files and library headers for %{name}
 %prep
 %setup -q -n igt-gpu-tools-%{version}
 %patch0
+%patch1 -p1
 
 %build
 %meson

intel-gpu-tools_fix-meson.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
+