x11-apps/intel-gpu-tools: Version bump to 1.22

This updates intel-gpu-tools to version 1.22, which will use autotools
because the meson build options are essentially nonexistent, compared to
the autotools configuration scripts.

This change also adds a live version that uses meson instead of
autotools.

A patch was included to add KBL and ICL GPU PCI IDs.

Closes: https://bugs.gentoo.org/655224
Closes: https://github.com/gentoo/gentoo/pull/8729
Signed-off-by: Casey Bowman <casey.g.bowman@intel.com>

4 files changed, 145 insertions, 0 deletions

diff --git a/x11-apps/intel-gpu-tools/Manifest b/x11-apps/intel-gpu-tools/Manifest
index 3c5fcdd9c523..98fae4bdea31 100644
--- a/x11-apps/intel-gpu-tools/Manifest
+++ b/x11-apps/intel-gpu-tools/Manifest
@@ -1,2 +1,3 @@
 DIST intel-gpu-tools-1.15.tar.bz2 1827851 BLAKE2B dac481571603ff36957ad2d5ef89266e744ec39a5623bb2b8e3d2e389d39d7aa09130cd7591e876b02d8edd970fb287c53ea9b520801a4a9ceede294e2917a7f SHA512 407f7c4ce72babbbd3ed08fc77719f88321b56745601b588bb6dce1a659786215e6d1b121af748087746df6f7da1bfd3ae8f9a898173eede5d5bb4a5b24b4559
 DIST intel-gpu-tools-1.20.tar.bz2 2274390 BLAKE2B 55c8614f93f5ed6391d35570ed6e4e36a659bd8ba5d98e321cb1daaf89413a95d1f0911cd07ed00670f0dceacd8f4443894a59b85cce1debeae9f8e01a75f824 SHA512 7b930c6949c04a600792df359f7cd230ca7b843072936c0c674cb9212b2d8c0701c43ef3bebe66b34141ed7a9b39774bbb99466cd52d70b3f1abfe5e52608f25
+DIST intel-gpu-tools-1.22.tar.xz 1022396 BLAKE2B c84338f3f84fcbe21a5b918b1afcc47d5419bd37828054fc3fa128d346b0f1b633d42f842464d96b28d4430788bfa9945a7596c14e6a79f8183440d3b9329c92 SHA512 af7964a3782bbc335c50c1c9c42f090306932423e76b9968d6919a2b633f3c11837e7ba572d352632c2b4db79bc98218d9d425c3b62e69abad5aa83d733dea8a
diff --git a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch
new file mode 100644
index 000000000000..ff51969def4d
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch
@@ -0,0 +1,53 @@
+From 0896b88d1b80244832f9eacbca993c5121315d05 Mon Sep 17 00:00:00 2001
+From: Paulo Zanoni <paulo.r.zanoni@intel.com>
+Date: Thu, 26 Apr 2018 17:49:41 -0700
+Subject: lib: sync with the newer i915_pciids.h from the Kernel (KBL + ICL)
+
+I just copied the Kernel file into the IGT repository.
+
+New IDs:
+- KBL GT2 sku from 672e314b21dc ("drm/i915/kbl: Add KBL GT2 sku")
+- ICL IDs from d55cb4fa2cf0 ("drm/i915/icl: Add the ICL PCI IDs")
+
+Cc: Matt Atwood <matthew.s.atwood@intel.com>
+Acked-by: Antonio Argenziano <antonio.argenziano@intel.com>
+Reviewed-by: Jose Roberto de Souza <jose.souza@intel.com>
+Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
+---
+ lib/i915_pciids.h | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+https://cgit.freedesktop.org/xorg/app/intel-gpu-tools/patch/?id=0896b88d1b80244832f9eacbca993c5121315d05
+
+diff --git a/lib/i915_pciids.h b/lib/i915_pciids.h
+index 0b2ba46..bab70ff 100644
+--- a/lib/i915_pciids.h
++++ b/lib/i915_pciids.h
+@@ -349,6 +349,7 @@
+ #define INTEL_KBL_GT2_IDS(info)	\
+ 	INTEL_VGA_DEVICE(0x5916, info), /* ULT GT2 */ \
+ 	INTEL_VGA_DEVICE(0x5917, info), /* Mobile GT2 */ \
++	INTEL_VGA_DEVICE(0x591C, info), /* ULX GT2 */ \
+ 	INTEL_VGA_DEVICE(0x5921, info), /* ULT GT2F */ \
+ 	INTEL_VGA_DEVICE(0x591E, info), /* ULX GT2 */ \
+ 	INTEL_VGA_DEVICE(0x5912, info), /* DT  GT2 */ \
+@@ -431,4 +432,16 @@
+ 	INTEL_VGA_DEVICE(0x5A44, info), \
+ 	INTEL_VGA_DEVICE(0x5A4C, info)
+ 
++/* ICL */
++#define INTEL_ICL_11_IDS(info) \
++	INTEL_VGA_DEVICE(0x8A50, info), \
++	INTEL_VGA_DEVICE(0x8A51, info), \
++	INTEL_VGA_DEVICE(0x8A5C, info), \
++	INTEL_VGA_DEVICE(0x8A5D, info), \
++	INTEL_VGA_DEVICE(0x8A52, info), \
++	INTEL_VGA_DEVICE(0x8A5A, info), \
++	INTEL_VGA_DEVICE(0x8A5B, info), \
++	INTEL_VGA_DEVICE(0x8A71, info), \
++	INTEL_VGA_DEVICE(0x8A70, info)
++
+ #endif /* _I915_PCIIDS_H */
+-- 
+cgit v1.1
+
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.22.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.22.ebuild
new file mode 100644
index 000000000000..be16cea0651b
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.22.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+XORG_EAUTORECONF="yes"
+
+inherit xorg-2
+
+DESCRIPTION="Intel GPU userland tools"
+
+HOMEPAGE="https://01.org/linuxgraphics https://cgit.freedesktop.org/xorg/app/intel-gpu-tools/"
+SRC_URI="https://www.x.org/releases/individual/app/${P}.tar.xz"
+KEYWORDS="~amd64 ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="alsa chamelium doc glib gsl sound test-programs valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv"
+REQUIRED_USE="
+	test-programs? ( sound? ( alsa gsl ) )
+	chamelium? ( glib gsl )"
+RESTRICT="test"
+
+X86_RDEPEND="
+	xv? (
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXv
+	)"
+X86_DEPEND="x11-base/xorg-proto
+	>=dev-util/peg-0.1.18"
+RDEPEND="sys-apps/kmod:=
+	sys-libs/libunwind:=
+	sys-process/procps:=
+	virtual/libudev:=
+	>=x11-libs/cairo-1.12.0[X?]
+	>=x11-libs/libdrm-2.4.82[video_cards_amdgpu?,video_cards_intel?,video_cards_nouveau?]
+	>=x11-libs/libpciaccess-0.10
+	alsa? ( media-libs/alsa-lib:= )
+	chamelium? ( dev-libs/xmlrpc-c )
+	glib? ( dev-libs/glib:2 )
+	gsl? ( sci-libs/gsl )
+	valgrind? ( dev-util/valgrind )
+	video_cards_intel? ( sys-libs/zlib:= )
+	xrandr? ( >=x11-libs/libXrandr-1.3 )
+	amd64? ( ${X86_RDEPEND} )
+	x86? ( ${X86_RDEPEND} )"
+DEPEND="${RDEPEND}
+	amd64? ( ${X86_DEPEND} )
+	x86? ( ${X86_DEPEND} )
+	doc? ( >=dev-util/gtk-doc-1.25-r1 )"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-KBL-ICL-PCI-IDs.patch
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+	$(usex test-programs $(use_enable sound audio) --disable-audio)
+	$(use_enable chamelium)
+	$(use_enable doc gtk-doc)
+	$(use_enable test-programs tests)
+	$(use_enable video_cards_amdgpu amdgpu)
+	$(use_enable video_cards_intel intel)
+	$(use_enable video_cards_nouveau nouveau)
+	)
+	xorg-2_src_configure
+}
+
+src_install() {
+	xorg-2_src_install
+	if use test-programs; then
+		local testprogram
+		pushd "${AUTOTOOLS_BUILD_DIR}"/tests >/dev/null || die
+		for testprogram in $(<multi-tests.txt) $(<single-tests.txt); do
+			if [[ -f ${testprogram} ]]; then
+				dobin "${testprogram}"
+			fi
+		done
+		popd >/dev/null
+	fi
+}
+
+pkg_postinst() {
+	xorg-2_pkg_postinst
+	if use test-programs; then
+		elog "Test programs for DRM driver development were installed. These are not"
+		elog "designed to run outside their source tree, so may or may not work as"
+		elog "intended."
+	fi
+}
diff --git a/x11-apps/intel-gpu-tools/metadata.xml b/x11-apps/intel-gpu-tools/metadata.xml
index 82c48e5a7a21..d4405bd15d82 100644
--- a/x11-apps/intel-gpu-tools/metadata.xml
+++ b/x11-apps/intel-gpu-tools/metadata.xml
@@ -6,6 +6,7 @@
  <name>X11</name>
 </maintainer>
 <use>
+ <flag name="chamelium">Enables support for building Chamelium tests</flag>
  <flag name="glib">Support reading config files via glib helpers</flag>
  <flag name="test-programs">Install test programs for DRM driver development</flag>
  <flag name="unwind">Provide automatic stack traces on test failures</flag>