From 28c9337302f0a4525c6696549c7ea7800d6c63a1 Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Mon, 20 Apr 2020 14:50:51 +0800
Subject: igt-gpu-tools: upgrade 1.24 -> 1.25

aubdump has been removed upstream. Switch to using meson.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
---
 .../igt-gpu-tools/igt-gpu-tools_1.24.bb            | 39 ----------------------
 .../igt-gpu-tools/igt-gpu-tools_1.25.bb            | 37 ++++++++++++++++++++
 2 files changed, 37 insertions(+), 39 deletions(-)
 delete mode 100644 recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.24.bb
 create mode 100644 recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.25.bb

diff --git a/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.24.bb b/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.24.bb
deleted file mode 100644
index 156798c6..00000000
--- a/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.24.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-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=67bfee4df38fa6ecbe3a675c552d4c08"
-
-LICENSE_append = " & ISC"
-
-inherit autotools
-
-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 elfutils"
-RDEPENDS_${PN} += "bash"
-RDEPENDS_${PN}-tests += "bash"
-
-PACKAGE_BEFORE_PN = "${PN}-benchmarks ${PN}-tests"
-
-SRC_URI[md5sum] = "0e0b4a1a80dc2e09c2705e0c5159e0a1"
-SRC_URI[sha256sum] = "57357c72feeafc923c9cfd2d1234bd80e120fc7cc6099eac81158ec351a821bf"
-
-EXTRA_OECONF = "--disable-nouveau"
-COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
-COMPATIBLE_HOST_libc-musl_class-target = "null"
-
-gputools_sysroot_preprocess() {
-	rm -f ${SYSROOT_DESTDIR}${libdir}/pkgconfig/intel-gen4asm.pc
-}
-SYSROOT_PREPROCESS_FUNCS += "gputools_sysroot_preprocess"
-
-FILES_${PN} += "${libdir}/intel_aubdump.so"
-FILES_${PN}-benchmarks += "${libexecdir}/${BPN}/benchmarks"
-FILES_${PN}-tests += "\
-		${libexecdir}/${BPN}/*\
-		${datadir}/${BPN}/1080p-right.png\
-		${datadir}/${BPN}/1080p-left.png\
-		${datadir}/${BPN}/pass.png\
-		${datadir}/${BPN}/test-list.txt"
diff --git a/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.25.bb b/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.25.bb
new file mode 100644
index 00000000..af696630
--- /dev/null
+++ b/recipes-graphics/igt-gpu-tools/igt-gpu-tools_1.25.bb
@@ -0,0 +1,37 @@
+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=67bfee4df38fa6ecbe3a675c552d4c08"
+
+LICENSE_append = " & ISC"
+
+inherit meson
+
+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 elfutils bison-native"
+RDEPENDS_${PN} += "bash"
+RDEPENDS_${PN}-tests += "bash"
+
+PACKAGE_BEFORE_PN = "${PN}-benchmarks ${PN}-tests"
+
+SRC_URI[sha256sum] = "40454d8f0484ea2477862007398a08eef78a6c252c4defce1c934548593fdd11"
+
+EXTRA_OEMESON = "-Dlibdrm_drivers=intel"
+COMPATIBLE_HOST = "(x86_64.*|i.86.*)-linux"
+COMPATIBLE_HOST_libc-musl_class-target = "null"
+
+gputools_sysroot_preprocess() {
+	rm -f ${SYSROOT_DESTDIR}${libdir}/pkgconfig/intel-gen4asm.pc
+}
+SYSROOT_PREPROCESS_FUNCS += "gputools_sysroot_preprocess"
+
+FILES_${PN}-benchmarks += "${libexecdir}/${BPN}/benchmarks"
+FILES_${PN}-tests += "\
+		${libexecdir}/${BPN}/*\
+		${datadir}/${BPN}/1080p-right.png\
+		${datadir}/${BPN}/1080p-left.png\
+		${datadir}/${BPN}/pass.png\
+		${datadir}/${BPN}/test-list.txt"
-- 
cgit v1.2.3-54-g00ecf