commit a63c6ceb4d82939fdc04a06e28b390e1b26039db
Author: Jakub Bogusz <[email protected]>
Date: Wed Jun 26 17:48:38 2019 +0200
- updated to 1.24
- removed obsolete update patch
xorg-app-igt-gpu-tools-update.patch | 44 -------------------------
xorg-app-igt-gpu-tools.spec | 64 +++++++++++++++++--------------------
2 files changed, 30 insertions(+), 78 deletions(-)
---
diff --git a/xorg-app-igt-gpu-tools.spec b/xorg-app-igt-gpu-tools.spec
index d4fb1ef..6acbd76 100644
--- a/xorg-app-igt-gpu-tools.spec
+++ b/xorg-app-igt-gpu-tools.spec
@@ -1,39 +1,42 @@
Summary: Tools for Intel DRM driver
Summary(pl.UTF-8): Narzędzia do sterownika Intel DRM
Name: xorg-app-igt-gpu-tools
-Version: 1.23
+Version: 1.24
Release: 1
License: MIT
Group: X11/Applications
Source0:
https://xorg.freedesktop.org/archive/individual/app/igt-gpu-tools-%{version}.tar.xz
-# Source0-md5: 04c1f10d6fd85e079271540b0ea786e9
-Patch1: %{name}-update.patch
+# Source0-md5: 0e0b4a1a80dc2e09c2705e0c5159e0a1
URL: http://intellinuxgraphics.org/
BuildRequires: alsa-lib-devel
-BuildRequires: autoconf >= 2.63
-BuildRequires: automake >= 1:1.12
BuildRequires: bison
BuildRequires: cairo-devel >= 1.12.0
+BuildRequires: curl-devel
# rst2man
BuildRequires: docutils
+# libdw
+BuildRequires: elfutils-devel
BuildRequires: flex
+# -std=gnu11
+BuildRequires: gcc >= 6:4.7
BuildRequires: glib2-devel >= 2.0
%if %(locale -a | grep -q '^C\.utf8$'; echo $?)
BuildRequires: glibc-localedb-all
%endif
BuildRequires: gsl-devel
BuildRequires: gtk-doc >= 1.14
+BuildRequires: json-c-devel
BuildRequires: kmod-devel
BuildRequires: libdrm-devel >= 2.4.82
-BuildRequires: libtool >= 2:2.2
BuildRequires: libunwind-devel
+BuildRequires: meson >= 0.47.0
+BuildRequires: ninja >= 1.5
BuildRequires: peg
-BuildRequires: pixman-devel
+BuildRequires: pixman-devel >= 0.36.0
BuildRequires: pkgconfig
BuildRequires: procps-devel >= 1:3.3
BuildRequires: python3-devel >= 1:3.0
BuildRequires: sed >= 4.0
-BuildRequires: swig-python >= 2.0.0
BuildRequires: tar >= 1:1.22
BuildRequires: udev-devel
BuildRequires: xmlrpc-c-client-devel
@@ -51,7 +54,7 @@ Requires: xorg-lib-libXrandr >= 1.3
Requires: xorg-lib-libpciaccess >= 0.10
Obsoletes: xorg-app-intel-gpu-tools < 1.23
# libunwind is required
-ExclusiveArch: %{ix86} %{x8664} x32 %{arm} hppa ia64 mips ppc ppc64 sh
+ExclusiveArch: %{ix86} %{x8664} x32 %{arm} aarch64 hppa ia64 mips ppc ppc64 sh
tilegx
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -64,54 +67,47 @@ sterownika Intel DRM.
%prep
%setup -q -n igt-gpu-tools-%{version}
-%patch1 -p1
%build
-%{__gtkdocize}
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
- --enable-audio \
- --enable-chamellium \
- --enable-gtk-doc \
- --enable-shader-debugger \
- --disable-silent-rules \
- --with-html-dir=%{_gtkdocdir}
+%meson build \
+ -Dbuild_chamelium=enabled
-# python needs UTF-8 locale to read non-ascii debugger/system_routine/*.g4a
files
-LC_ALL=C.UTF-8 \
-%{__make}
+%ninja_build -C build
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} install \
- DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/intel_aubdump.la
+%ninja_install -C build
# tests
%{__rm} -r $RPM_BUILD_ROOT%{_libexecdir}/igt-gpu-tools \
- $RPM_BUILD_ROOT%{_datadir}/igt-gpu-tools
+ $RPM_BUILD_ROOT%{_datadir}/igt-gpu-tools/{README,*.testlist}
%clean
rm -rf $RPM_BUILD_ROOT
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
%files
%defattr(644,root,root,755)
-%doc COPYING NEWS README
+%doc COPYING NEWS README.md TODO.rst
+%attr(755,root,root) %{_bindir}/dpcd_reg
+%attr(755,root,root) %{_bindir}/igt_results
+%attr(755,root,root) %{_bindir}/igt_resume
+%attr(755,root,root) %{_bindir}/igt_runner
%attr(755,root,root) %{_bindir}/igt_stats
%attr(755,root,root) %{_bindir}/intel_*
-%attr(755,root,root) %{_libdir}/intel_aubdump.so
+%attr(755,root,root) %{_libdir}/intel_aubdump.so*
+%attr(755,root,root) %{_libdir}/libigt.so*
%ifarch %{ix86} %{x8664} x32
-%attr(755,root,root) %{_bindir}/eudb
%attr(755,root,root) %{_bindir}/intel-gen4asm
%attr(755,root,root) %{_bindir}/intel-gen4disasm
%attr(755,root,root) %{_bindir}/intel-gpu-overlay
%{_pkgconfigdir}/intel-gen4asm.pc
%endif
+%dir %{_datadir}/igt-gpu-tools
+%{_datadir}/igt-gpu-tools/registers
+%{_datadir}/igt-gpu-tools/*.png
%{_gtkdocdir}/igt-gpu-tools
%{_mandir}/man1/intel_*.1*
diff --git a/xorg-app-igt-gpu-tools-update.patch
b/xorg-app-igt-gpu-tools-update.patch
deleted file mode 100644
index 9958c0a..0000000
--- a/xorg-app-igt-gpu-tools-update.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- intel-gpu-tools-1.19/debugger/debug_rdata.c.orig 2016-06-15
14:29:32.000000000 +0200
-+++ intel-gpu-tools-1.19/debugger/debug_rdata.c 2017-06-13
20:07:26.318127896 +0200
-@@ -30,6 +30,7 @@
- #include <stdlib.h>
- #include "intel_io.h"
- #include "intel_chipset.h"
-+#include "drmtest.h"
-
- struct eu_rdata {
- union {
-@@ -132,10 +133,12 @@
- }
-
- int main(int argc, char *argv[]) {
-+ int drm_fd;
- struct pci_device *pci_dev;
- pci_dev = intel_get_pci_device();
-
-- intel_register_access_init(pci_dev, 1);
-+ drm_fd = drm_open_driver(DRIVER_INTEL);
-+ intel_register_access_init(pci_dev, 1, drm_fd);
- find_stuck_threads();
- // collect_rdata(atoi(argv[1]), atoi(argv[2]));
- return 0;
---- intel-gpu-tools-1.19/debugger/eudb.c.orig 2016-11-14 13:30:52.000000000
+0100
-+++ intel-gpu-tools-1.19/debugger/eudb.c 2017-06-13 20:09:48.481459607
+0200
-@@ -540,7 +540,8 @@
- abort();
- }
-
-- assert(intel_register_access_init(pci_dev, 1) == 0);
-+ drm_fd = drm_open_driver(DRIVER_INTEL);
-+ assert(intel_register_access_init(pci_dev, 1, drm_fd) == 0);
-
- memset(bits, -1, sizeof(bits));
- /*
-@@ -549,7 +550,6 @@
- */
- if (!clear_waits) {
- int dh_handle;
-- drm_fd = drm_open_driver(DRIVER_INTEL);
- bufmgr = drm_intel_bufmgr_gem_init(drm_fd, 4096);
-
- setup_hw_bits();
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xorg-app-igt-gpu-tools.git/commitdiff/a63c6ceb4d82939fdc04a06e28b390e1b26039db
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
