4 Commits

5 changed files with 26 additions and 73 deletions

View File

@@ -1,20 +0,0 @@
--- intel-gpu-tools-1.10/lib/intel_batchbuffer.c.orig 2015-03-25 00:26:50.835000000 +0100
+++ intel-gpu-tools-1.10/lib/intel_batchbuffer.c 2015-03-25 00:27:28.233000000 +0100
@@ -548,7 +548,7 @@
memset(obj, 0, sizeof(*obj));
obj->handle = gem_handle;
obj->relocation_count = count;
- obj->relocs_ptr = (uint64_t)relocs;
+ obj->relocs_ptr = (uintptr_t)relocs;
}
static void exec_blit(int fd,
@@ -557,7 +557,7 @@
{
struct drm_i915_gem_execbuffer2 exec;
- exec.buffers_ptr = (uint64_t)objs;
+ exec.buffers_ptr = (uintptr_t)objs;
exec.buffer_count = count;
exec.batch_start_offset = 0;
exec.batch_len = batch_len * 4;

View File

@@ -1,13 +0,0 @@
diff --git a/lib/igt_x86.h b/lib/igt_x86.h
index d6dcfa1..27b7f0f 100644
--- a/lib/igt_x86.h
+++ b/lib/igt_x86.h
@@ -40,7 +40,7 @@
#define AVX 0x80
#define AVX2 0x100
-#if defined(__x86_64__)
+#if defined(__x86_64__) || defined(__i386__)
unsigned igt_x86_features(void);
char *igt_x86_features_to_string(unsigned features, char *line);
#else

View File

@@ -1,11 +0,0 @@
--- intel-gpu-tools-1.3/lib/drmtest.h.orig 2013-04-11 14:26:55.685097783 +0200
+++ intel-gpu-tools-1.3/lib/drmtest.h 2013-04-11 14:27:03.004028824 +0200
@@ -31,7 +31,7 @@
#include <assert.h>
#include <errno.h>
#include <stdbool.h>
-#include <cairo.h>
+#include <cairo/cairo.h>
#include "xf86drm.h"
#include "xf86drmMode.h"

View File

@@ -1,14 +0,0 @@
Specify the encoding, in case it's not the same as the locale.
diff -x config.log -x config.status -ru tmp/intel-gpu-tools-1.7/debugger/system_routine/pre_cpp.py work/intel-gpu-tools-1.7/debugger/system_routine/pre_cpp.py
--- tmp/intel-gpu-tools-1.7/debugger/system_routine/pre_cpp.py 2014-05-13 13:31:22.000000000 +0100
+++ work/intel-gpu-tools-1.7/debugger/system_routine/pre_cpp.py 2014-06-30 23:16:12.743000000 +0100
@@ -33,7 +33,7 @@
import sys,re
-file = open(sys.argv[1], "r")
+file = open(sys.argv[1], "r", encoding="UTF-8")
lines = file.readlines()
len(lines)

View File

@@ -1,5 +1,5 @@
Name: intel-gpu-tools
Version: 1.27.1
Version: 2.2
Release: 1mamba
Summary: A collection of tools for development and testing of the Intel DRM driver
Group: System/X11
@@ -8,10 +8,6 @@ Distribution: openmamba
Packager: Silvan Calarco <silvan.calarco@mambasoft.it>
URL: https://x.org/wiki/
Source: https://gitlab.freedesktop.org/drm/igt-gpu-tools.git/v%{version}/igt-gpu-tools-%{version}.tar.bz2
Patch0: intel-gpu-tools-1.3-libcairo.patch
Patch1: intel-gpu-tools-1.7-unicode.patch
Patch2: intel-gpu-tools-1.10-fix-32bit-pointer-to-int-cast.patch
Patch3: intel-gpu-tools-1.20-x86-ftbfs.patch
License: MIT
## AUTOBUILDREQ-BEGIN
BuildRequires: glibc-devel
@@ -19,22 +15,21 @@ BuildRequires: libalsa-devel
BuildRequires: libcairo-devel
BuildRequires: libdrm-devel
BuildRequires: libdw-devel
BuildRequires: libgcc
BuildRequires: libglib-devel
BuildRequires: libgsl-devel
BuildRequires: libjson-c-devel
BuildRequires: libkmod-devel
BuildRequires: libpciaccess-devel
BuildRequires: libperl
BuildRequires: libpixman-devel
BuildRequires: libprocps-devel
BuildRequires: libprocps3-devel
BuildRequires: libudev-devel
BuildRequires: libunwind-devel
BuildRequires: libxmlrpc-c-devel
BuildRequires: libz-devel
BuildRequires: perl-devel
## AUTOBUILDREQ-END
BuildRequires: xorg-server-devel >= 1.1.0
BuildRequires: xorg-proto-devel
BuildRequires: xbitmaps-devel >= 1.0.1
Requires: lib%{name} = %{?epoch:%epoch:}%{version}-%{release}
%description
@@ -64,17 +59,16 @@ Summary: Documentation for %{name}
%description apidocs
This package contains the API documentation for %{name}.
%debug_package
%prep
%setup -q -n igt-gpu-tools-%{version}
#% patch3 -p1
%build
%meson
%meson_build
ninja -C build igt-gpu-tools-doc
%install
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%meson_install
@@ -82,28 +76,29 @@ This package contains the API documentation for %{name}.
%clean
[ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
%post -n lib%{name} -p /sbin/ldconfig
%postun -n lib%{name} -p /sbin/ldconfig
%files
%defattr(-,root,root)
%{_bindir}/amd_hdmi_compliance
%{_bindir}/code_cov_*
%{_bindir}/dpcd_reg
%{_bindir}/gputop
%{_bindir}/igt_*
%{_bindir}/intel-*
%{_bindir}/msm_dp_compliance
%{_bindir}/intel_*
%{_bindir}/i915-*
%{_bindir}/lsgpu
%{_bindir}/xe-perf-*
%dir %{_datadir}/igt-gpu-tools
%{_datadir}/igt-gpu-tools/*
%{_mandir}/man1/intel_*.1*
%{_mandir}/man1/lsgpu.1*
%files -n lib%{name}
%defattr(-,root,root)
%{_libdir}/libigt.so.*
%{_libdir}/libi915_perf.so.*
%{_libdir}/libxe_oa.so.*
%dir %{_libexecdir}/igt-gpu-tools
%{_libexecdir}/igt-gpu-tools/*
@@ -111,10 +106,14 @@ This package contains the API documentation for %{name}.
%defattr(-,root,root)
%dir %{_includedir}/i915-perf
%{_includedir}/i915-perf/*.h
%dir %{_includedir}/xe-oa
%{_includedir}/xe-oa/*.h
%{_libdir}/libigt.so
%{_libdir}/libi915_perf.so
%{_libdir}/libxe_oa.so
%{_libdir}/pkgconfig/i915-perf.pc
%{_libdir}/pkgconfig/intel-gen4asm.pc
%{_libdir}/pkgconfig/xe-oa.pc
%files apidocs
%defattr(-,root,root)
@@ -122,6 +121,18 @@ This package contains the API documentation for %{name}.
%{_datadir}/gtk-doc/html/igt-gpu-tools/*
%changelog
* Mon Sep 29 2025 Automatic Build System <autodist@openmamba.org> 2.2-1mamba
- automatic version update by autodist
* Sun Jul 06 2025 Automatic Build System <autodist@openmamba.org> 2.1-1mamba
- automatic version update by autodist
* Sun May 25 2025 Silvan Calarco <silvan.calarco@mambasoft.it> 2.0-1mamba
- update to 2.0
* Thu Sep 21 2023 Automatic Build System <autodist@mambasoft.it> 1.28-1mamba
- automatic version update by autodist
* Wed Jan 25 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 1.27.1-1mamba
- update to 1.27.1