From 487ca639310d92ca219638fecbb731d6cd476e92 Mon Sep 17 00:00:00 2001
From: Anuj Mittal <anuj.mittal@intel.com>
Date: Mon, 16 Apr 2018 11:04:15 +0800
Subject: intel-gpu-tools: upgrade 1.21 -> 1.22

For changes, please see: https://cgit.freedesktop.org/xorg/app/intel-gpu-tools/tree/NEWS

Also add a PACKAGECONFIG to enable audio tests.

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: California Sullivan <california.l.sullivan@intel.com>
---
 .../intel-gpu-tools/intel-gpu-tools_1.21.bb        | 39 --------------------
 .../intel-gpu-tools/intel-gpu-tools_1.22.bb        | 42 ++++++++++++++++++++++
 2 files changed, 42 insertions(+), 39 deletions(-)
 delete mode 100644 recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.21.bb
 create mode 100644 recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.22.bb

(limited to 'recipes-graphics')

diff --git a/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.21.bb b/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.21.bb
deleted file mode 100644
index 962f228f..00000000
--- a/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.21.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=e4b3dd344780e0400593b21b115a6947"
-
-LICENSE_append = " & ISC"
-
-inherit autotools gtk-doc
-
-SRC_URI = "${XORG_MIRROR}/individual/app/${BP}.tar.xz"
-
-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] = "94125e46d528b67b060ba98f3c2e3bee"
-SRC_URI[sha256sum] = "d9af6e7a24cb22e5b6ff8db03a0e6b230f08c17908cedee59e8795d74e18703f"
-
-EXTRA_OECONF = "--disable-nouveau --disable-shader-debugger"
-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}/intel-gpu-tools/benchmarks"
-FILES_${PN}-tests += "\
-		${libexecdir}/intel-gpu-tools/*\
-		${datadir}/intel-gpu-tools/1080p-right.png\
-		${datadir}/intel-gpu-tools/1080p-left.png\
-		${datadir}/intel-gpu-tools/pass.png\
-		${datadir}/intel-gpu-tools/test-list.txt"
diff --git a/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.22.bb b/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.22.bb
new file mode 100644
index 00000000..f9ee7218
--- /dev/null
+++ b/recipes-graphics/intel-gpu-tools/intel-gpu-tools_1.22.bb
@@ -0,0 +1,42 @@
+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"
+
+LICENSE_append = " & ISC"
+
+inherit autotools gtk-doc
+
+SRC_URI = "${XORG_MIRROR}/individual/app/${BP}.tar.xz"
+
+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] = "965c591b23a132084113c2a0604f537a"
+SRC_URI[sha256sum] = "3d66c1dc5110712ca4d22199b3ce9853f261be1690064edf87e69e5392e39a5c"
+
+EXTRA_OECONF = "--disable-nouveau --disable-shader-debugger"
+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
+}
+SYSROOT_PREPROCESS_FUNCS += "gputools_sysroot_preprocess"
+
+FILES_${PN} += "${libdir}/intel_aubdump.so"
+FILES_${PN}-benchmarks += "${libexecdir}/intel-gpu-tools/benchmarks"
+FILES_${PN}-tests += "\
+		${libexecdir}/intel-gpu-tools/*\
+		${datadir}/intel-gpu-tools/1080p-right.png\
+		${datadir}/intel-gpu-tools/1080p-left.png\
+		${datadir}/intel-gpu-tools/pass.png\
+		${datadir}/intel-gpu-tools/test-list.txt"
-- 
cgit v1.2.3-54-g00ecf