* [gentoo-commits] repo/gentoo:master commit in: x11-apps/intel-gpu-tools/, x11-apps/intel-gpu-tools/files/
@ 2016-06-21 18:47 Mike Frysinger
0 siblings, 0 replies; 3+ messages in thread
From: Mike Frysinger @ 2016-06-21 18:47 UTC (permalink / raw
To: gentoo-commits
commit: f640a3c0f7560d0bcc23e6a3e0ff9f7346e707f1
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 21 18:43:13 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jun 21 18:47:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f640a3c0
x11-libs/intel-gpu-tools: fix building due to missing inttypes.h #582430
.../files/intel-gpu-tools-1.12-inttypes.patch | 28 ++++++++++++++++++++++
.../intel-gpu-tools/intel-gpu-tools-1.12.ebuild | 4 ++++
2 files changed, 32 insertions(+)
diff --git a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-inttypes.patch b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-inttypes.patch
new file mode 100644
index 0000000..02a97c4
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-inttypes.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/582430
+
+From d24f4a5c5fe45e2fad8942acc137f87cd8f35ea5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Tue, 21 Jun 2016 14:37:38 -0400
+Subject: [PATCH] include inttypes.h for PRI defines
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96620
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ lib/igt_fb.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/igt_fb.c b/lib/igt_fb.c
+index 61205f345707..ba29eae5cabd 100644
+--- a/lib/igt_fb.c
++++ b/lib/igt_fb.c
+@@ -28,6 +28,7 @@
+ #define _GNU_SOURCE
+ #include <stdio.h>
+ #include <math.h>
++#include <inttypes.h>
+
+ #include "drmtest.h"
+ #include "igt_fb.h"
+--
+2.8.2
+
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.12.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.12.ebuild
index 6ce5c35..b25044b 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.12.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.12.ebuild
@@ -22,6 +22,10 @@ DEPEND="dev-libs/glib:2
unwind? ( sys-libs/libunwind )"
RDEPEND="${DEPEND}"
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.12-inttypes.patch #582430
+)
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-apps/intel-gpu-tools/, x11-apps/intel-gpu-tools/files/
@ 2018-06-13 22:16 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2018-06-13 22:16 UTC (permalink / raw
To: gentoo-commits
commit: 51203b9911df85b9aac2e6d353d7ebac173d4baa
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 13 22:15:37 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 13 22:15:56 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=51203b99
x11-apps/intel-gpu-tools: Drop old versions
x11-apps/intel-gpu-tools/Manifest | 2 -
.../files/intel-gpu-tools-1.12-inttypes.patch | 28 --------
.../files/intel-gpu-tools-1.12-sysmacros.patch | 35 ---------
.../intel-gpu-tools/intel-gpu-tools-1.15.ebuild | 55 ---------------
.../intel-gpu-tools/intel-gpu-tools-1.20.ebuild | 82 ----------------------
x11-apps/intel-gpu-tools/metadata.xml | 1 -
6 files changed, 203 deletions(-)
diff --git a/x11-apps/intel-gpu-tools/Manifest b/x11-apps/intel-gpu-tools/Manifest
index 98fae4bdea3..28006c423b5 100644
--- a/x11-apps/intel-gpu-tools/Manifest
+++ b/x11-apps/intel-gpu-tools/Manifest
@@ -1,3 +1 @@
-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.12-inttypes.patch b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-inttypes.patch
deleted file mode 100644
index 02a97c48d12..00000000000
--- a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-inttypes.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://bugs.gentoo.org/582430
-
-From d24f4a5c5fe45e2fad8942acc137f87cd8f35ea5 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 21 Jun 2016 14:37:38 -0400
-Subject: [PATCH] include inttypes.h for PRI defines
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96620
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- lib/igt_fb.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/igt_fb.c b/lib/igt_fb.c
-index 61205f345707..ba29eae5cabd 100644
---- a/lib/igt_fb.c
-+++ b/lib/igt_fb.c
-@@ -28,6 +28,7 @@
- #define _GNU_SOURCE
- #include <stdio.h>
- #include <math.h>
-+#include <inttypes.h>
-
- #include "drmtest.h"
- #include "igt_fb.h"
---
-2.8.2
-
diff --git a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-sysmacros.patch b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-sysmacros.patch
deleted file mode 100644
index c805c120f55..00000000000
--- a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.12-sysmacros.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-https://bugs.gentoo.org/581080
-
-From 3e8cc82d371b23303cd4f30e4bcc9c5ecb10ad11 Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Tue, 21 Jun 2016 14:24:42 -0400
-Subject: [PATCH] pull in headers for major/minor/makedev funcs
-
-Use the portable autoconf helper to figure out which header to include
-for these funcs. Linux C libs are moving to not implicitly include them
-via sys/types.h anymore, and other OS's have long required you to pull
-in the right header directly.
-
-Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=96618
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- configure.ac | 1 +
- lib/igt_sysfs.c | 9 +++++++++
- tools/aubdump.c | 8 +++++++-
- 3 files changed, 17 insertions(+), 1 deletion(-)
-
---- a/tools/aubdump.c
-+++ b/tools/aubdump.c
-@@ -38,6 +38,9 @@
- #include <errno.h>
- #include <sys/mman.h>
- #include <dlfcn.h>
-+#ifdef __linux__
-+#include <sys/sysmacros.h>
-+#endif
- #include <i915_drm.h>
-
- #include "intel_aub.h"
---
-2.8.2
-
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.15.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.15.ebuild
deleted file mode 100644
index a05dea860cf..00000000000
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.15.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit xorg-2
-
-DESCRIPTION="Intel GPU userland tools"
-KEYWORDS="~amd64 ~x86"
-IUSE="test-programs unwind video_cards_nouveau"
-RESTRICT="test"
-
-DEPEND="dev-libs/glib:2
- >=x11-libs/cairo-1.12.0
- >=x11-libs/libdrm-2.4.64[video_cards_intel,video_cards_nouveau?]
- >=x11-libs/libpciaccess-0.10
- unwind? ( sys-libs/libunwind )"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.12-inttypes.patch #582430
- "${FILESDIR}"/${PN}-1.12-sysmacros.patch #581080
-)
-
-src_configure() {
- XORG_CONFIGURE_OPTIONS=(
- $(use_enable video_cards_nouveau nouveau)
- $(use_enable test-programs tests)
- $(use_with unwind libunwind)
- )
- 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/intel-gpu-tools-1.20.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild
deleted file mode 100644
index 69ac7b3936c..00000000000
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.20.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit xorg-2
-
-DESCRIPTION="Intel GPU userland tools"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="alsa glib gsl sound test-programs udev unwind valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv"
-REQUIRED_USE="test-programs? ( sound? ( alsa gsl ) )"
-RESTRICT="test"
-
-X86_RDEPEND="
- xv? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXv
- )"
-X86_DEPEND="x11-base/xorg-proto"
-RDEPEND="sys-apps/kmod:=
- sys-process/procps:=
- >=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:= )
- glib? ( dev-libs/glib:2 )
- gsl? ( sci-libs/gsl )
- udev? ( virtual/libudev:= )
- unwind? ( sys-libs/libunwind )
- 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} )"
-
-src_configure() {
- sed -i -E \
- -e "s:\<alsa=(no|yes):alsa=$(usex alsa):g" \
- -e "s:\<glib=(no|yes):glib=$(usex glib):g" \
- -e "s:\<gsl=(no|yes):gsl=$(usex gsl):g" \
- -e "s:\<udev=(no|yes):udev=$(usex udev):g" \
- -e "s:\<have_valgrind=(no|yes):have_valgrind=$(usex valgrind):g" \
- -e "s:\<enable_overlay_xvlib=(no|yes):enable_overlay_xvlib=$(usex xv):g" \
- configure || die
- XORG_CONFIGURE_OPTIONS=(
- $(usex test-programs $(use_enable sound audio) --disable-audio)
- $(use_enable test-programs tests)
- $(use_with unwind libunwind)
- $(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 d4405bd15d8..511e4111b43 100644
--- a/x11-apps/intel-gpu-tools/metadata.xml
+++ b/x11-apps/intel-gpu-tools/metadata.xml
@@ -9,7 +9,6 @@
<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>
<flag name="valgrind">Support valgrind annotations</flag>
<flag name="xrandr">Enable support for the X RandR extension</flag>
</use>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-apps/intel-gpu-tools/, x11-apps/intel-gpu-tools/files/
@ 2018-06-13 22:16 Matt Turner
0 siblings, 0 replies; 3+ messages in thread
From: Matt Turner @ 2018-06-13 22:16 UTC (permalink / raw
To: gentoo-commits
commit: b2204cc6d0f633f0c527aea340c3b4b41074f035
Author: Casey Bowman <casey.g.bowman <AT> intel <DOT> com>
AuthorDate: Fri Jun 1 00:48:10 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 13 22:15:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2204cc6
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 <AT> intel.com>
x11-apps/intel-gpu-tools/Manifest | 1 +
.../intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch | 53 +++++++++++++
.../intel-gpu-tools/intel-gpu-tools-1.22.ebuild | 90 ++++++++++++++++++++++
x11-apps/intel-gpu-tools/metadata.xml | 1 +
4 files changed, 145 insertions(+)
diff --git a/x11-apps/intel-gpu-tools/Manifest b/x11-apps/intel-gpu-tools/Manifest
index 3c5fcdd9c52..98fae4bdea3 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 00000000000..ff51969def4
--- /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 00000000000..be16cea0651
--- /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 82c48e5a7a2..d4405bd15d8 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>
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-06-13 22:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-13 22:16 [gentoo-commits] repo/gentoo:master commit in: x11-apps/intel-gpu-tools/, x11-apps/intel-gpu-tools/files/ Matt Turner
-- strict thread matches above, loose matches on Subject: below --
2018-06-13 22:16 Matt Turner
2016-06-21 18:47 Mike Frysinger
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox