[packages/xorg-app-intel-gpu-tools] - updated to 1.19 - added update patch (missing internal updates)

qboosh qboosh at pld-linux.org
Tue Jun 13 20:32:50 CEST 2017


commit b7023ad3db3dd5ef709ff5743cf98f823ec5d599
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Jun 13 20:34:00 2017 +0200

    - updated to 1.19
    - added update patch (missing internal updates)

 xorg-app-intel-gpu-tools-update.patch | 44 +++++++++++++++++++++++++++++++++++
 xorg-app-intel-gpu-tools.spec         | 12 ++++++----
 2 files changed, 51 insertions(+), 5 deletions(-)
---
diff --git a/xorg-app-intel-gpu-tools.spec b/xorg-app-intel-gpu-tools.spec
index 3d31466..6af6e7b 100644
--- a/xorg-app-intel-gpu-tools.spec
+++ b/xorg-app-intel-gpu-tools.spec
@@ -2,19 +2,20 @@
 # Conditional build:
 %bcond_without	libunwind	# libunwind support in tests
 #
-%ifnarch %{ix86} %{x8664} arm hppa ia64 mips ppc ppc64 sh
+%ifnarch %{ix86} %{x8664} %{arm} hppa ia64 mips ppc ppc64 sh
 %undefine	with_libunwind
 %endif
 Summary:	Tools for Intel DRM driver
 Summary(pl.UTF-8):	Narzędzia do sterownika Intel DRM
 Name:		xorg-app-intel-gpu-tools
-Version:	1.18
+Version:	1.19
 Release:	1
 License:	MIT
 Group:		X11/Applications
 Source0:	https://xorg.freedesktop.org/archive/individual/app/intel-gpu-tools-%{version}.tar.bz2
-# Source0-md5:	6a746774c80d5bcfa0aa7f9c20f72190
+# Source0-md5:	4fdfa56acca3b046fc61fb12686656f3
 Patch0:		%{name}-link.patch
+Patch1:		%{name}-update.patch
 URL:		http://intellinuxgraphics.org/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake >= 1:1.12
@@ -24,7 +25,7 @@ BuildRequires:	cairo-devel >= 1.12.0
 BuildRequires:	docutils
 BuildRequires:	flex
 BuildRequires:	glib2-devel >= 2.0
-%if %(locale -a | grep -q '^en_US\.UTF-8$'; echo $?)
+%if %(locale -a | grep -q '^C\.UTF-8$'; echo $?)
 BuildRequires:	glibc-localedb-all
 %endif
 BuildRequires:	gtk-doc >= 1.14
@@ -64,6 +65,7 @@ sterownika Intel DRM.
 %prep
 %setup -q -n intel-gpu-tools-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -78,7 +80,7 @@ sterownika Intel DRM.
 	%{!?with_libunwind:--without-libunwind}
 
 # python needs UTF-8 locale to read non-ascii debugger/system_routine/*.g4a files
-LC_ALL=en_US.UTF-8 \
+LC_ALL=C.UTF-8 \
 %{__make}
 
 %install
diff --git a/xorg-app-intel-gpu-tools-update.patch b/xorg-app-intel-gpu-tools-update.patch
new file mode 100644
index 0000000..9958c0a
--- /dev/null
+++ b/xorg-app-intel-gpu-tools-update.patch
@@ -0,0 +1,44 @@
+--- 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-intel-gpu-tools.git/commitdiff/b7023ad3db3dd5ef709ff5743cf98f823ec5d599



More information about the pld-cvs-commit mailing list