From b76785739c91ba2291091c82895184b4445d68af Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Thu, 15 Feb 2018 08:58:30 +0800
Subject: [PATCH] intel-gpu-tools: upgrade to 1.21

* Remove the backported patch
* libunwind is a hard dependency now
* Point the SRC_URI to xz file since i-g-t doesn't have the default format tarball.

Part of Intel graphics stack 2017Q4.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
---
 .../0001-lib-Fix-compilation-on-non-x86.patch | 82 -------------------
 ...-tools_1.20.bb => intel-gpu-tools_1.21.bb} | 11 +--
 2 files changed, 4 insertions(+), 89 deletions(-)
 delete mode 100644 recipes-graphics/intel-gpu-tools/intel-gpu-tools/0001-lib-Fix-compilation-on-non-x86.patch
 rename recipes-graphics/intel-gpu-tools/{intel-gpu-tools_1.20.bb => intel-gpu-tools_1.21.bb} (76%)

diff --git a/recipes-graphics/intel-gpu-tools/intel-gpu-tools/0001-lib-Fix-compilation-on-non-x86.patch b/recipes-graphics/intel-gpu-tools/intel-gpu-tools/0001-lib-Fix-compilation-on-non-x86.patch
deleted file mode 100644
index 0c8c24c1..00000000
--- a/recipes-graphics/intel-gpu-tools/intel-gpu-tools/0001-lib-Fix-compilation-on-non-x86.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 4fbb4b9c12d1944e5d60bc4f3d0cbd0bf7bed36d Mon Sep 17 00:00:00 2001
-From: Thierry Reding <treding@nvidia.com>
-Date: Thu, 12 Oct 2017 10:33:37 +0200
-Subject: [PATCH] lib: Fix compilation on non-x86
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The meson build avoids the failure by excluding the igt_x86.c file from
-the compilation. autotools being what they are don't support that in an
-easy way, so just use the preprocessor to avoid the duplicate function
-definitions.
-
-Since igt_x86.c will now be ignored for non-x86 builds, the meson work-
-around can be removed.
-
-Upstream-Status: backport.
-
-Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
-Signed-off-by: Thierry Reding <treding@nvidia.com>
----
- lib/igt_x86.c   | 2 ++
- lib/igt_x86.h   | 2 +-
- lib/meson.build | 5 +----
- 3 files changed, 4 insertions(+), 5 deletions(-)
-
-diff --git a/lib/igt_x86.c b/lib/igt_x86.c
-index 0f0963ce..0ed3c6f1 100644
---- a/lib/igt_x86.c
-+++ b/lib/igt_x86.c
-@@ -93,6 +93,7 @@
- 
- #define has_YMM 0x1
- 
-+#if defined(__x86_64__) || defined(__i386__)
- unsigned igt_x86_features(void)
- {
- 	unsigned max = __get_cpuid_max(BASIC_CPUID, 0);
-@@ -172,3 +173,4 @@ char *igt_x86_features_to_string(unsigned features, char *line)
- 
- 	return ret;
- }
-+#endif
-diff --git a/lib/igt_x86.h b/lib/igt_x86.h
-index d6dcfa10..27b7f0fd 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
-diff --git a/lib/meson.build b/lib/meson.build
-index b31c68e4..ddf93ec6 100644
---- a/lib/meson.build
-+++ b/lib/meson.build
-@@ -64,6 +64,7 @@ lib_sources = [
- 	'igt_syncobj.c',
- 	'igt_sysfs.c',
- 	'igt_vgem.c',
-+	'igt_x86.c',
- 	'instdone.c',
- 	'intel_batchbuffer.c',
- 	'intel_chipset.c',
-@@ -96,10 +97,6 @@ lib_sources = [
- 	'igt_kmod.c',
- ]
- 
--if ['x86', 'x86_64'].contains(host_machine.cpu_family())
--    lib_sources += 'igt_x86.c'
--endif
--
- lib_deps = [
- 	cairo,
- 	glib,
--- 
-2.14.3
-
diff --git a/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.20.bb b/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.21.bb
similarity index 76%
rename from recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.20.bb
rename to recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.21.bb
index 4fdd0911..962f228f 100644
--- a/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.20.bb
+++ b/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.21.bb
@@ -9,19 +9,16 @@ LICENSE_append = " & ISC"
 
 inherit autotools gtk-doc
 
-SRC_URI += "file://0001-lib-Fix-compilation-on-non-x86.patch"
+SRC_URI = "${XORG_MIRROR}/individual/app/${BP}.tar.xz"
 
-DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 libxv libx11 libxext libxrandr procps"
+DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 libxv libx11 libxext libxrandr procps libunwind"
 RDEPENDS_${PN} += "bash"
 RDEPENDS_${PN}-tests += "bash"
 
 PACKAGE_BEFORE_PN = "${PN}-benchmarks ${PN}-tests"
 
-SRC_URI[md5sum] = "3b77a6a23274afe363bd5c942fe42562"
-SRC_URI[sha256sum] = "2fffe7a66789f56f301e6b60a3afe21556f34acbad8b7b29c8f3dd41f0b148e8"
-
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind,libunwind"
+SRC_URI[md5sum] = "94125e46d528b67b060ba98f3c2e3bee"
+SRC_URI[sha256sum] = "d9af6e7a24cb22e5b6ff8db03a0e6b230f08c17908cedee59e8795d74e18703f"
 
 EXTRA_OECONF = "--disable-nouveau --disable-shader-debugger"
 COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"