The package rpms/igt-gpu-tools.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/igt-gpu-tools.git/commit/?id=0aff033....
Change: +%ifnarch s390x
Thanks.
Full change: ============
commit 0aff0331ddc8a5aba632a75601b3de7f1c0f9da1 Author: Lyude Paul lyude@redhat.com Date: Sat Jul 4 18:27:01 2020 -0400
Enable libunwind on s390x for Fedora 33+
diff --git a/igt-gpu-tools.spec b/igt-gpu-tools.spec index 27338a6..8ded31a 100644 --- a/igt-gpu-tools.spec +++ b/igt-gpu-tools.spec @@ -30,9 +30,6 @@ BuildRequires: pkgconfig(libdrm) >= 2.4.82 BuildRequires: pkgconfig(pciaccess) >= 0.10 BuildRequires: pkgconfig(libkmod) BuildRequires: pkgconfig(libprocps) -%ifnarch s390x -BuildRequires: pkgconfig(libunwind) -%endif BuildRequires: pkgconfig(libdw) BuildRequires: pkgconfig(pixman-1) BuildRequires: pkgconfig(valgrind) @@ -51,6 +48,15 @@ BuildRequires: kernel-headers BuildRequires: pkgconfig(gtk-doc) BuildRequires: python3-docutils
+# libunwind 1.4.0+ supports s390x +%if 0%{?fedora} < 33 || 0%{?rhel} +%ifnarch s390x +BuildRequires: pkgconfig(libunwind) +%endif +%else +BuildRequires: pkgconfig(libunwind) >= 1.4.0 +%endif + %description igt-gpu-tools (formerly known as intel-gpu-tools) is the standard for writing test cases for DRM drivers. It also includes a handful of useful tools for @@ -73,12 +79,20 @@ igt-gpu-tools, such as i915-perf. %autosetup -c -p1
%build +%if 0%{?fedora} < 33 || 0%{?rhel} + %ifnarch s390x %global with_libunwind enabled %else %global with_libunwind disabled %endif
+%else + +%global with_libunwind enabled + +%endif + # Some explanations here # - We don't build overlay yet due to Fedora not shipping /usr/bin/leg, but we # probably don't care about that anyway @@ -173,6 +187,7 @@ rm %{buildroot}/%{_libdir}/libigt.so %changelog * Sat Jul 04 2020 Lyude Paul lyude@redhat.com - 1.25-1.20200704git75bcaf7 - New git snapshot +- Enable libunwind on s390x builds
* Tue Apr 21 2020 Björn Esser besser82@fedoraproject.org - 1.24-4.20191213git048f585 - Rebuild (json-c)
commit f190f341d85ca48eb8fb26237e72f4467c5f0878 Author: Lyude Paul lyude@redhat.com Date: Sat Jul 4 17:44:29 2020 -0400
New git snapshot: 75bcaf7a609d184305d5f6ac9da38d9297ed22ef
diff --git a/igt-gpu-tools-1.24-assembler_gen4asm_h_remove_struct_src_operand_variable.patch b/igt-gpu-tools-1.24-assembler_gen4asm_h_remove_struct_src_operand_variable.patch deleted file mode 100644 index a512201..0000000 --- a/igt-gpu-tools-1.24-assembler_gen4asm_h_remove_struct_src_operand_variable.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 6944f6515a9d2b46b2ec7dfd7bdb5153ea819d63 Mon Sep 17 00:00:00 2001 -From: Lyude Paul lyude@redhat.com -Date: Thu, 19 Mar 2020 13:40:39 -0400 -Subject: [PATCH] assembler/gen4asm.h: Remove struct src_operand src_operand - variable - -Another spot where we fail compilation with -fcommon, due to src_operand -getting included in multiple translation units without being marked as -extern: - -/usr/bin/ld: -assembler/1ca89e8@@intel-gen4asm@exe/meson-generated_gram.c.o:assembler/gen4asm.h:119: -multiple definition of `src_operand'; -assembler/1ca89e8@@intel-gen4asm@exe/meson-generated_lex.c.o:assembler/gen4asm.h:119: -first defined here -/usr/bin/ld: -assembler/1ca89e8@@intel-gen4asm@exe/main.c.o:assembler/gen4asm.h:119: -multiple definition of `src_operand'; -assembler/1ca89e8@@intel-gen4asm@exe/meson-generated_lex.c.o:assembler/gen4asm.h:119: -first defined here - -However, we never actually refer to this variable - only its type -definition. So, just remove the declaration entirely. - -Changes since v1: -* Don't make src_operand extern - just remove the variable declaration - entirely, we only ever use the typedef - Chris Wilson - -Signed-off-by: Lyude Paul lyude@redhat.com -Reviewed-by: Petri Latvala petri.latvala@intel.com ---- - assembler/gen4asm.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/assembler/gen4asm.h b/assembler/gen4asm.h -index 6b957e28..9537d457 100644 ---- a/assembler/gen4asm.h -+++ b/assembler/gen4asm.h -@@ -116,7 +116,7 @@ struct src_operand { - int default_region; - uint32_t imm32; /* set if src_operand is expressing a branch offset */ - char *reloc_target; /* bspec: branching instructions JIP and UIP are source operands */ --} src_operand; -+}; - - typedef struct { - enum { --- -2.24.1 - diff --git a/igt-gpu-tools-1.24-lib_igt_core_make_igt_subtest_jmpbuf_igt_dynamic_jmpbuf_extern.patch b/igt-gpu-tools-1.24-lib_igt_core_make_igt_subtest_jmpbuf_igt_dynamic_jmpbuf_extern.patch deleted file mode 100644 index 5904233..0000000 --- a/igt-gpu-tools-1.24-lib_igt_core_make_igt_subtest_jmpbuf_igt_dynamic_jmpbuf_extern.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 61ef576ea536d82776bd90af18cb6a590b22f520 Mon Sep 17 00:00:00 2001 -From: Lyude Paul lyude@redhat.com -Date: Fri, 13 Mar 2020 15:40:02 -0400 -Subject: [PATCH] lib/igt_core: Make igt_subtest_jmpbuf/igt_dynamic_jmpbuf - extern - -Since gcc 10, -fno-common has become the default (vs. -fcommon). As a -result, gcc is much stricter about missing extern and static keywords -and causes our build to fail in anything including igt_core.h: - -/usr/bin/ld: -lib/libigt-i915_gem_context_c.a(i915_gem_context.c.o):lib/igt_core.h:149: -multiple definition of `igt_dynamic_jmpbuf'; -lib/libigt-drmtest_c.a(drmtest.c.o):lib/igt_core.h:149: first defined -here -/usr/bin/ld: -lib/libigt-i915_gem_context_c.a(i915_gem_context.c.o):lib/igt_core.h:148: -multiple definition of `igt_subtest_jmpbuf'; -lib/libigt-drmtest_c.a(drmtest.c.o):lib/igt_core.h:148: first defined -here - -So, fix this by marking these as extern and declaring them in -lib/igt_core.c. - -Reviewed-by: Chris Wilson chris@chris-wilson.co.uk -Signed-off-by: Lyude Paul lyude@redhat.com ---- - lib/igt_core.c | 3 +++ - lib/igt_core.h | 4 ++-- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/lib/igt_core.c b/lib/igt_core.c -index 51041793..2b928f1a 100644 ---- a/lib/igt_core.c -+++ b/lib/igt_core.c -@@ -261,6 +261,9 @@ - * such as those related to Chamelium support. - */ - -+jmp_buf igt_subtest_jmpbuf; -+jmp_buf igt_dynamic_jmpbuf; -+ - static unsigned int exit_handler_count; - const char *igt_interactive_debug; - bool igt_skip_crc_compare; -diff --git a/lib/igt_core.h b/lib/igt_core.h -index c17a7ba8..fae5f59e 100644 ---- a/lib/igt_core.h -+++ b/lib/igt_core.h -@@ -145,8 +145,8 @@ void __igt_fixture_end(void) __attribute__((noreturn)); - __igt_fixture_complete()) - - /* subtest infrastructure */ --jmp_buf igt_subtest_jmpbuf; --jmp_buf igt_dynamic_jmpbuf; -+extern jmp_buf igt_subtest_jmpbuf; -+extern jmp_buf igt_dynamic_jmpbuf; - typedef int (*igt_opt_handler_t)(int opt, int opt_index, void *data); - #define IGT_OPT_HANDLER_SUCCESS 0 - #define IGT_OPT_HANDLER_ERROR -2 --- -2.24.1 - diff --git a/igt-gpu-tools-1.24-lib_rendercopy_gen_make_cc_viewport_static.patch b/igt-gpu-tools-1.24-lib_rendercopy_gen_make_cc_viewport_static.patch deleted file mode 100644 index fe24bc2..0000000 --- a/igt-gpu-tools-1.24-lib_rendercopy_gen_make_cc_viewport_static.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 59aa9e450a90b4dedbe6899fd17c317bbac741c4 Mon Sep 17 00:00:00 2001 -From: Lyude Paul lyude@redhat.com -Date: Fri, 13 Mar 2020 17:13:08 -0400 -Subject: [PATCH] lib/rendercopy_gen*: Make cc/viewport static - -Since both rendercopy_gen8.c and rendercopy_gen9.c declare cc/viewport -variables without marking them as static, -fcommon also causes these to -make our builds fail: - -/usr/bin/ld: -lib/libigt-rendercopy_gen9_c.a(rendercopy_gen9.c.o):lib/rendercopy_gen9.c:46: -multiple definition of `cc'; -lib/libigt-rendercopy_gen8_c.a(rendercopy_gen8.c.o):lib/rendercopy_gen8.c:45: -first defined here -/usr/bin/ld: -lib/libigt-rendercopy_gen9_c.a(rendercopy_gen9.c.o):lib/rendercopy_gen9.c:51: -multiple definition of `viewport'; -lib/libigt-rendercopy_gen8_c.a(rendercopy_gen8.c.o):lib/rendercopy_gen8.c:50: -first defined here - -So, fix this by marking them as static. - -Reviewed-by: Chris Wilson chris@chris-wilson.co.uk -Signed-off-by: Lyude Paul lyude@redhat.com ---- - lib/rendercopy_gen8.c | 4 ++-- - lib/rendercopy_gen9.c | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/lib/rendercopy_gen8.c b/lib/rendercopy_gen8.c -index 8e02d846..bace64a7 100644 ---- a/lib/rendercopy_gen8.c -+++ b/lib/rendercopy_gen8.c -@@ -39,12 +39,12 @@ static void dump_batch(struct intel_batchbuffer *batch) { - #define dump_batch(x) do { } while(0) - #endif - --struct { -+static struct { - uint32_t cc_state; - uint32_t blend_state; - } cc; - --struct { -+static struct { - uint32_t cc_state; - uint32_t sf_clip_state; - } viewport; -diff --git a/lib/rendercopy_gen9.c b/lib/rendercopy_gen9.c -index 835c8d80..f364c2b9 100644 ---- a/lib/rendercopy_gen9.c -+++ b/lib/rendercopy_gen9.c -@@ -40,12 +40,12 @@ static void dump_batch(struct intel_batchbuffer *batch) { - #define dump_batch(x) do { } while(0) - #endif - --struct { -+static struct { - uint32_t cc_state; - uint32_t blend_state; - } cc; - --struct { -+static struct { - uint32_t cc_state; - uint32_t sf_clip_state; - } viewport; --- -2.24.1 - diff --git a/igt-gpu-tools.spec b/igt-gpu-tools.spec index 60489ea..27338a6 100644 --- a/igt-gpu-tools.spec +++ b/igt-gpu-tools.spec @@ -1,10 +1,10 @@ -%global gitcommit 048f58513d8b8ec6bb307a939f0ac959bc0f0e10 -%global gitdate 20191213 +%global gitcommit 75bcaf7a609d184305d5f6ac9da38d9297ed22ef +%global gitdate 20200704 %global gitrev .%{gitdate}git%(c=%{gitcommit}; echo ${c:0:7})
Name: igt-gpu-tools -Version: 1.24 -Release: 4%{?gitrev}%{?dist} +Version: 1.25 +Release: 1%{?gitrev}%{?dist} Summary: Test suite and tools for DRM drivers
License: MIT @@ -17,13 +17,6 @@ Source0: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/archive/igt-g %endif Source1: make-git-snapshot.sh
-# https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/61ef576ea536d82776... -Patch0001: igt-gpu-tools-1.24-lib_igt_core_make_igt_subtest_jmpbuf_igt_dynamic_jmpbuf_extern.patch -# https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/59aa9e450a90b4dedb... -Patch0002: igt-gpu-tools-1.24-lib_rendercopy_gen_make_cc_viewport_static.patch -# https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/commit/6944f6515a9d2b46b2... -Patch0003: igt-gpu-tools-1.24-assembler_gen4asm_h_remove_struct_src_operand_variable.patch - %global provobs_version 2.99.917-42.20180618 Provides: xorg-x11-drv-intel-devel = %{provobs_version} Provides: intel-gpu-tools = %{provobs_version} @@ -69,6 +62,13 @@ Summary: Documentation for igt-gpu-tools %description docs gtk-doc generated documentation package for igt-gpu-tools.
+%package devel +Summary: Development files for igt-gpu-tools + +%description devel +Development files for compiling against certain tools provided by +igt-gpu-tools, such as i915-perf. + %prep %autosetup -c -p1
@@ -106,7 +106,6 @@ rm %{buildroot}/%{_libdir}/pkgconfig/intel-gen4asm.pc
# Remove the unversioned libigt symlinks rm %{buildroot}/%{_libdir}/libigt.so -rm %{buildroot}/%{_libdir}/intel_aubdump.so
%check # The timeout multiplier here is required due to certain tests timing out on @@ -123,13 +122,13 @@ rm %{buildroot}/%{_libdir}/intel_aubdump.so %{_bindir}/intel_framebuffer_dump %{_bindir}/intel_perf_counters %endif -%{_libdir}/intel_aubdump.so.0 %{_libdir}/libigt.so.0 +%{_libdir}/libi915_perf.so.0 %{_libexecdir}/igt-gpu-tools/* %{_datadir}/igt-gpu-tools/* %{_bindir}/dpcd_reg %{_bindir}/igt_* -%{_bindir}/intel_aubdump +%{_bindir}/i915-perf-* %{_bindir}/intel_audio_dump %{_bindir}/intel_backlight %{_bindir}/intel_bios_dumper @@ -161,11 +160,20 @@ rm %{buildroot}/%{_libdir}/intel_aubdump.so %{_bindir}/lsgpu %{_mandir}/man1/intel_*.1*
+%files devel +%license COPYING +%{_includedir}/i915-perf/* +%{_libdir}/pkgconfig/i915-perf.pc +%{_libdir}/libi915_perf.so + %files docs %license COPYING %{_datadir}/gtk-doc/html/igt-gpu-tools/*
%changelog +* Sat Jul 04 2020 Lyude Paul lyude@redhat.com - 1.25-1.20200704git75bcaf7 +- New git snapshot + * Tue Apr 21 2020 Björn Esser besser82@fedoraproject.org - 1.24-4.20191213git048f585 - Rebuild (json-c)
diff --git a/sources b/sources index ce17aff..6e42993 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (igt-gpu-tools-20191213.tar.bz2) = 134dfe0bad193e104137b906418eba000887ee3559b084bbaf8624445962188ce246d12439ad88a604049c3532047496a6e4b43ef4bcc375be4667130d5c6931 +SHA512 (igt-gpu-tools-20200704.tar.bz2) = 723242f724f8f58d8784e1440c113f5285e36507a6e8fa47fac7de5b0b4fb4f422f8ff6dadfac890da291f2a5218f06d8c317c55bc6c7e7c7e12b58b0b8b4673
commit 1a9c4aae0cab20c35ad2860c0e857cb043536616 Author: Lyude Paul lyude@redhat.com Date: Thu May 28 18:25:00 2020 -0400
Use wildcards in .gitignore
diff --git a/.gitignore b/.gitignore index d9f98c6..68194ff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,26 +1,3 @@ *.src.rpm results_igt-gpu-tools/ - -/igt-gpu-tools-20190522.tar.bz2 -/igt-gpu-tools-20190531.tar.bz2 -/igt-gpu-tools-20190619.tar.bz2 -/igt-gpu-tools-20190621.tar.bz2 -/igt-gpu-tools-20190626.tar.bz2 -/igt-gpu-tools-20190628.tar.bz2 -/igt-gpu-tools-20190709.tar.bz2 -/igt-gpu-tools-20190712.tar.bz2 -/igt-gpu-tools-20190722.tar.bz2 -/igt-gpu-tools-20190725.tar.bz2 -/igt-gpu-tools-20190801.tar.bz2 -/igt-gpu-tools-20190811.tar.bz2 -/igt-gpu-tools-20190821.tar.bz2 -/igt-gpu-tools-20190829.tar.bz2 -/igt-gpu-tools-20190830.tar.bz2 -/igt-gpu-tools-20190906.tar.bz2 -/igt-gpu-tools-20190917.tar.bz2 -/igt-gpu-tools-20190927.tar.bz2 -/igt-gpu-tools-20191008.tar.bz2 -/igt-gpu-tools-20191101.tar.bz2 -/igt-gpu-tools-20191104.tar.bz2 -/igt-gpu-tools-20191202.tar.bz2 -/igt-gpu-tools-20191213.tar.bz2 +/igt-gpu-tools-*.tar.bz2