diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-11-03 08:36:22 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-11-03 08:36:22 +0000 |
commit | f65628136faa35d0c4d3b5e7332275c7b35fcd96 (patch) | |
tree | 021998302365c5652e37824b6c26d4d969a62055 /x11-apps/intel-gpu-tools | |
parent | 70b82ae359a5538711e103b0e8dfb92654296644 (diff) |
gentoo resync : 03.11.2018
Diffstat (limited to 'x11-apps/intel-gpu-tools')
-rw-r--r-- | x11-apps/intel-gpu-tools/Manifest | 5 | ||||
-rw-r--r-- | x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch | 53 | ||||
-rw-r--r-- | x11-apps/intel-gpu-tools/intel-gpu-tools-1.22.ebuild | 90 | ||||
-rw-r--r-- | x11-apps/intel-gpu-tools/intel-gpu-tools-9999.ebuild | 54 | ||||
-rw-r--r-- | x11-apps/intel-gpu-tools/metadata.xml | 15 |
5 files changed, 0 insertions, 217 deletions
diff --git a/x11-apps/intel-gpu-tools/Manifest b/x11-apps/intel-gpu-tools/Manifest deleted file mode 100644 index b72af04d6d4a..000000000000 --- a/x11-apps/intel-gpu-tools/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -AUX intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch 1823 BLAKE2B df389f5b08771c22fd49b82c425d53560f9ae5fd4176f06ddba4582c4a22d42f67377b2bd99fff6f1d4bd3b7a7c9276149272c1548c0ce166c42063640a48888 SHA512 1e9afea48f3ecc000ca3994e5f9c899bb163a3295dd81012e8bdccf7db90ab4c9fd3ac5a68d3b44879fa93b89ae05a3c6b918055558e66516a0cc5bfda0d26bc -DIST intel-gpu-tools-1.22.tar.xz 1022396 BLAKE2B c84338f3f84fcbe21a5b918b1afcc47d5419bd37828054fc3fa128d346b0f1b633d42f842464d96b28d4430788bfa9945a7596c14e6a79f8183440d3b9329c92 SHA512 af7964a3782bbc335c50c1c9c42f090306932423e76b9968d6919a2b633f3c11837e7ba572d352632c2b4db79bc98218d9d425c3b62e69abad5aa83d733dea8a -EBUILD intel-gpu-tools-1.22.ebuild 2342 BLAKE2B 4e6bcd2eba157a9a040a9ae0958bbc163048cd4c60a289a996cd64b0394e263bdd6aeb2b4a06b3720afb579f437dbde321124a09516fc1f47f80af180402d808 SHA512 8a3df167a0f12595f1b00586181c47fc381714bb570734babdf6664b780b5cef1f398038692de5e35a8ba4cf3bb1ac52049641a0bff72cf975a063df312f97dc -EBUILD intel-gpu-tools-9999.ebuild 1499 BLAKE2B a818e0e39705fe6842ffecf71e17804abfb283cd6330471e68e51a61336066e786abdc6f105d339e0b4424dbc5588075076c1e33e9907581508e8910c4b10089 SHA512 c533d3ecca88f455c357fe6860fb870c1e9e14bbf4c39fa725e330456df57b516bcb1b2d622bd8450be9bbd977fc755f181d19c4f4c86c67b0ef3b1561f03409 -MISC metadata.xml 603 BLAKE2B 7eaa85a41a130abd8a149127bd2724d989a3e2242576823df58edce57da658e09c8b8e76e449a77974de3403b79a8df85c96eae2eec184d359d1b67366a98949 SHA512 173906d2cd0ef4ea36e4d720e7fd1b4e1a05fc239e89d22205ae8237a5c87f35532a01988bb5af1a647d15293ead89b61e46c886dacc893b1d94e351aea82596 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 deleted file mode 100644 index ff51969def4d..000000000000 --- a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.22-KBL-ICL-PCI-IDs.patch +++ /dev/null @@ -1,53 +0,0 @@ -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 deleted file mode 100644 index 805a51f63791..000000000000 --- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.22.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# 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} ) - >=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/intel-gpu-tools-9999.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-9999.ebuild deleted file mode 100644 index dcf138f5a867..000000000000 --- a/x11-apps/intel-gpu-tools/intel-gpu-tools-9999.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -EGIT_REPO_URI="https://anongit.freedesktop.org/git/xorg/app/${PN}.git" -if [[ ${PV} = *9999* ]]; then - GIT_ECLASS="git-r3" -fi - -inherit ${GIT_ECLASS} meson - -DESCRIPTION="Intel GPU userland tools" - -HOMEPAGE="https://01.org/linuxgraphics https://cgit.freedesktop.org/xorg/app/intel-gpu-tools/" -if [[ ${PV} = *9999* ]]; then - SRC_URI="" -else - KEYWORDS="~amd64 ~x86" - SRC_URI="https://www.x.org/releases/individual/app/${P}.tar.xz" -fi -LICENSE="MIT" -SLOT="0" -IUSE="alsa chamelium doc glib gsl sound valgrind video_cards_amdgpu video_cards_intel video_cards_nouveau X xrandr xv" -REQUIRED_USE="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 )" diff --git a/x11-apps/intel-gpu-tools/metadata.xml b/x11-apps/intel-gpu-tools/metadata.xml deleted file mode 100644 index 511e4111b43c..000000000000 --- a/x11-apps/intel-gpu-tools/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> -<maintainer type="project"> - <email>x11@gentoo.org</email> - <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="valgrind">Support valgrind annotations</flag> - <flag name="xrandr">Enable support for the X RandR extension</flag> -</use> -</pkgmetadata> |