[meta-intel] [PATCH v2] igt-gpu-tools: upgrade 1.23 -> 1.24

[Naveen Saini]

GCC9 build failures already fixed, patch is not
required anymore.

Below Copyright information is appended to COPYING

Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
Copyright 2015 Philip Taylor <philip at zaynar.co.uk>
Copyright 2018 Advanced Micro Devices, Inc.

Shader debugger removed due to lack of use and accumulation of
bitrot. (Arkadiusz Hiler)

So removing --disable-shader-debugger configuration option.

Added support for testing DP/HDMI audio with the Chamelium device,
dropping the audio tests that required exotic custom hardware to
execute. (Simon Ser)

Removing audio configuration.

Stack traces now contain source file names and line numbers, using
libdw. (Maarten Lankhorst)
Due to this faced build failure:
| checking for libdw... no
| configure: error: Package requirements (libdw) were not met:
|
| No package 'libdw' found

To fix above added elfutils in DEPENDS.

Dropped gtkdoc support. So no need to inherit gtkdoc

More details can be found here:
https://gitlab.freedesktop.org/drm/igt-gpu-tools/commit/22850c1906550fb97b405c019275dcfb34be8cf7

Signed-off-by: Naveen Saini <naveen.kumar.saini at intel.com>
---
 ...-lib-fb-Fix-rgb24-to-nv12-conversion.patch | 40 -------------------
 ...pu-tools_1.23.bb => igt-gpu-tools_1.24.bb} | 19 ++++-----
 2 files changed, 7 insertions(+), 52 deletions(-)
 delete mode 100644 recipes-graphics/igt-gpu-tools/files/0001-lib-fb-Fix-rgb24-to-nv12-conversion.patch
 rename recipes-graphics/igt-gpu-tools/{igt-gpu-tools_1.23.bb => igt-gpu-tools_1.24.bb} (61%)

diff --git a/recipes-graphics/igt-gpu-tools/files/0001-lib-fb-Fix-rgb24-to-nv12-conversion.patch b/recipes-graphics/igt-gpu-tools/files/0001-lib-fb-Fix-rgb24-to-nv12-conversion.patch
deleted file mode 100644
index 46b2eef5..00000000
--- a/recipes-graphics/igt-gpu-tools/files/0001-lib-fb-Fix-rgb24-to-nv12-conversion.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From f01796214bbde31e37b0593e547ad9436fdd02ba Mon Sep 17 00:00:00 2001
-From: Petri Latvala <petri.latvala at intel.com>
-Date: Wed, 9 Jan 2019 14:28:29 +0200
-Subject: [PATCH] lib/fb: Fix rgb24 to nv12 conversion
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-A typo fix in 1x2 pixel block conversion code, revealed by GCC 9
-
-Fixes: 1c7ef3890045 ("lib: Use igt_matrix for ycbcr<->rgb conversion")
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=109257
-Reported-by: Martin Liska <mliska at suse.cz>
-Signed-off-by: Petri Latvala <petri.latvala at intel.com>
-Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
-Cc: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
-Reviewed-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
-
-Upstream-Status: Backport
-Signed-off-by: Anuj Mittal <anuj.mittal at intel.com>
----
- lib/igt_fb.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lib/igt_fb.c b/lib/igt_fb.c
-index 8244e517..5cd1829a 100644
---- a/lib/igt_fb.c
-+++ b/lib/igt_fb.c
-@@ -1779,7 +1779,7 @@ static void convert_rgb24_to_nv12(struct fb_convert *cvt)
- 			struct igt_vec4 yuv[2];
- 
- 			read_rgb(&rgb[0], &rgb24[j * 8 + 0]);
--			read_rgb(&rgb[2], &rgb24[j * 8 + 0 + rgb24_stride]);
-+			read_rgb(&rgb[1], &rgb24[j * 8 + 0 + rgb24_stride]);
- 
- 			yuv[0] = igt_matrix_transform(&m, &rgb[0]);
- 			yuv[1] = igt_matrix_transform(&m, &rgb[1]);
--- 
-2.20.1
-
diff --git a/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.23.bb b/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.24.bb
similarity index 61%
rename from recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.23.bb
rename to recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.24.bb
index 33c04e77..156798c6 100644
--- a/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.23.bb
+++ b/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.24.bb
@@ -3,32 +3,27 @@ require ${COREBASE}/meta/recipes-graphics/xorg-app/xorg-app-common.inc
 SUMMARY = "Intel GPU tools"
 DESCRIPTION = "Variety of small tools for testing intel graphics."
 
-LIC_FILES_CHKSUM = "file://COPYING;md5=e4b3dd344780e0400593b21b115a6947"
+LIC_FILES_CHKSUM = "file://COPYING;md5=67bfee4df38fa6ecbe3a675c552d4c08"
 
 LICENSE_append = " & ISC"
 
-inherit autotools gtk-doc
+inherit autotools
 
-SRC_URI = "${XORG_MIRROR}/individual/app/${BP}.tar.xz \
-           file://0001-lib-fb-Fix-rgb24-to-nv12-conversion.patch \
-           "
+SRC_URI = "${XORG_MIRROR}/individual/app/${BP}.tar.xz"
 
-DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 libxv libx11 libxext libxrandr procps libunwind kmod openssl"
+DEPENDS += "libdrm libpciaccess cairo udev glib-2.0 libxv libx11 libxext libxrandr procps libunwind kmod openssl elfutils"
 RDEPENDS_${PN} += "bash"
 RDEPENDS_${PN}-tests += "bash"
 
 PACKAGE_BEFORE_PN = "${PN}-benchmarks ${PN}-tests"
 
-SRC_URI[md5sum] = "04c1f10d6fd85e079271540b0ea786e9"
-SRC_URI[sha256sum] = "4d4b086c513bace5c23d0889de3f42ac3ebd3d968c64dedae6e28e006a499ad0"
+SRC_URI[md5sum] = "0e0b4a1a80dc2e09c2705e0c5159e0a1"
+SRC_URI[sha256sum] = "57357c72feeafc923c9cfd2d1234bd80e120fc7cc6099eac81158ec351a821bf"
 
-EXTRA_OECONF = "--disable-nouveau --disable-shader-debugger"
+EXTRA_OECONF = "--disable-nouveau"
 COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
 COMPATIBLE_HOST_libc-musl_class-target = "null"
 
-PACKAGECONFIG ??= ""
-PACKAGECONFIG[audio] = "--enable-audio,--disable-audio,alsa-lib gsl"
-
 gputools_sysroot_preprocess() {
 	rm -f ${SYSROOT_DESTDIR}${libdir}/pkgconfig/intel-gen4asm.pc
 }
-- 
2.17.1