summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /x11-apps/intel-gpu-tools
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'x11-apps/intel-gpu-tools')
-rw-r--r--x11-apps/intel-gpu-tools/Manifest3
-rw-r--r--x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.10-clang.patch44
-rw-r--r--x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.7-shader-debugger-Force-file-stdout-IO-as-UTF-8.patch37
-rw-r--r--x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild60
-rw-r--r--x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild60
-rw-r--r--x11-apps/intel-gpu-tools/intel-gpu-tools-1.7.ebuild40
-rw-r--r--x11-apps/intel-gpu-tools/metadata.xml10
7 files changed, 254 insertions, 0 deletions
diff --git a/x11-apps/intel-gpu-tools/Manifest b/x11-apps/intel-gpu-tools/Manifest
new file mode 100644
index 000000000000..f8b3cc64492d
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/Manifest
@@ -0,0 +1,3 @@
+DIST intel-gpu-tools-1.10.tar.bz2 1501523 SHA256 6df2bef12d7cd252d702e4412937fbdc48fa954dd5f7f6988f567912f63b9874 SHA512 b6d5e2b377534a2132a22e22af5786086360646ea6d788b863e7424dd68898c6e35c31c2620f4301b00659cea56aa5739609781d8324c04929bba367f61fc8da WHIRLPOOL 916d97f24972fc9f3dad52b80193921e2fff309345d7c977d9bee89d0f03db361ce167c52eaeda311ba87d4de11a4bdc1824ed27c79bf11a64581ecb085ef5bf
+DIST intel-gpu-tools-1.11.tar.bz2 1586385 SHA256 48823450452b57c52c74e00c8c763ed7cdd0c81cc877e8c2f619f7f6c45dade4 SHA512 4d36240dbc5b40ba452d49a7d7af9512f8ace923a2f87bfb3d6bec32053390e672308f1bac0dc5f83ff5430ad9806a9f5e487ca2b27ac4bc941de2c21fd5826f WHIRLPOOL d443b48b32b0101b6e0a3767933d910619ee02a6c082c026034ec5d814bbd121f370566e6a09a283988a24e955f4d0aa02829764ade766d25a4e6008947a3db3
+DIST intel-gpu-tools-1.7.tar.bz2 11780573 SHA256 22612343bbd9b518b9f92a983555dbbcae8040ee577a38277dbf873c8900207a SHA512 13181db6d2424fa27c97c30ecb83b8554fc2e9ce98bec7b7735f919aa9d7e2563c3e1860dc6e5aedf3918c029acb205b8fcf6a32de1567f557f8cd98c09a5d98 WHIRLPOOL f66e0710377aa4f46067840efd1cf70814e10cd81ff24ebb5db21b901787846f63b1461502ec01ba7383ead76e985c25860801355a9582d5509a861fa70aacb0
diff --git a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.10-clang.patch b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.10-clang.patch
new file mode 100644
index 000000000000..2f7b7a2c1ba1
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.10-clang.patch
@@ -0,0 +1,44 @@
+fix from upstream for building w/clang
+
+From 95019c2a3c4ed5943ad16e17c8dcf36fd6492adc Mon Sep 17 00:00:00 2001
+From: Yunlian Jiang <yunlian@google.com>
+Date: Tue, 26 May 2015 10:22:31 -0700
+Subject: [PATCH] debugger: remove unnecessary struct per_thread_data
+
+This removes unnecessary 'struct per_thread_data' and avoids the
+compilation error 'variable length array in structure extension
+will never be supported' by clang. The bug entry is
+https://code.google.com/p/chromium/issues/detail?id=476001
+
+Cc: Benjamin Widawsky <benjamin.widawsky@intel.com>
+Cc: Thomas Wood <thomas.wood@intel.com>
+Signed-off-by: Yunlian Jiang <yunlian@google.com>
+Signed-off-by: Thomas Wood <thomas.wood@intel.com>
+---
+ debugger/eudb.c | 6 +-----
+ 1 file changed, 1 insertion(+), 5 deletions(-)
+
+diff --git a/debugger/eudb.c b/debugger/eudb.c
+index 0e810db..39c5cca 100644
+--- a/debugger/eudb.c
++++ b/debugger/eudb.c
+@@ -207,15 +207,11 @@ wait_for_attn(int timeout, int *out_bits) {
+ #define eu_tid(bit) eu_info->debuggees[bit].tid
+ static struct eu_state *
+ find_eu_shmem(int bit, volatile uint8_t *buf) {
+- struct per_thread_data {
+- uint8_t ____[dh.per_thread_scratch];
+- }__attribute__((packed)) *data;
+ struct eu_state *eu;
+ int mem_tid, mem_euid, i;
+
+- data = (struct per_thread_data *)buf;
+ for(i = 0; i < eu_info->num_threads; i++) {
+- eu = (struct eu_state *)&data[i];
++ eu = (struct eu_state *)(buf + i * dh.per_thread_scratch);
+ mem_tid = eu->sr0 & 0x7;
+ mem_euid = (eu->sr0 >> 8) & 0xf;
+ if (mem_tid == eu_tid(bit) && mem_euid == eu_id(bit))
+--
+2.4.1
+
diff --git a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.7-shader-debugger-Force-file-stdout-IO-as-UTF-8.patch b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.7-shader-debugger-Force-file-stdout-IO-as-UTF-8.patch
new file mode 100644
index 000000000000..3b87f69ac590
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.7-shader-debugger-Force-file-stdout-IO-as-UTF-8.patch
@@ -0,0 +1,37 @@
+From e9e9df216180bcecc5d4c17bbe48b2efd88b3ed2 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org>
+Date: Mon, 18 Aug 2014 00:44:32 +0200
+Subject: [PATCH] shader-debugger: Force file/stdout IO as UTF-8
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Not all locales on linux are UTF-8, the most notable being the C locale.
+Python will use the ASCII codec for stream IO in this case and will barf
+on the Copyright sign at the top of .g4a files.
+
+Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=519434
+Signed-off-by: Rémi Cardona <remi@gentoo.org>
+---
+ debugger/system_routine/pre_cpp.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/debugger/system_routine/pre_cpp.py b/debugger/system_routine/pre_cpp.py
+index effea0e..584d2af 100755
+--- a/debugger/system_routine/pre_cpp.py
++++ b/debugger/system_routine/pre_cpp.py
+@@ -33,7 +33,10 @@
+
+ import sys,re
+
+-file = open(sys.argv[1], "r")
++# make sure both input file and stdout are handled as utf-8 text, regardless
++# of current locale (eg. LANG=C which tells python to use ascii encoding)
++sys.stdout = open(sys.__stdout__.fileno(), "a", encoding="utf-8")
++file = open(sys.argv[1], "r", encoding="utf-8")
+
+ lines = file.readlines()
+ len(lines)
+--
+2.0.4
+
diff --git a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild
new file mode 100644
index 000000000000..e0296a17a121
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit python-single-r1 xorg-2
+
+DESCRIPTION="Intel GPU userland tools"
+KEYWORDS="~amd64 ~x86"
+IUSE="python test-programs video_cards_nouveau"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+DEPEND="dev-libs/glib:2
+ >=x11-libs/cairo-1.12.0
+ >=x11-libs/libdrm-2.4.52[video_cards_intel,video_cards_nouveau?]
+ >=x11-libs/libpciaccess-0.10
+ python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-clang.patch" )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable python dumper)
+ $(use_enable video_cards_nouveau nouveau)
+ $(use_enable test-programs tests)
+ )
+ xorg-2_src_configure
+}
+
+src_install() {
+ xorg-2_src_install
+ if use test-programs; then
+ local testprogram
+ pushd "${AUTOTOOLS_BUILD_DIR}"/tests || die
+ for testprogram in $(<multi-tests.txt) $(<single-tests.txt); do
+ if [[ -f ${testprogram} ]]; then
+ dobin "${testprogram}"
+ fi
+ done
+ popd
+ 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.11-r1.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild
new file mode 100644
index 000000000000..8251c6f968d0
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit python-single-r1 xorg-2
+
+DESCRIPTION="Intel GPU userland tools"
+KEYWORDS="~amd64 ~x86"
+IUSE="python test-programs unwind video_cards_nouveau"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+DEPEND="dev-libs/glib:2
+ >=x11-libs/cairo-1.12.0
+ >=x11-libs/libdrm-2.4.52[video_cards_intel,video_cards_nouveau?]
+ >=x11-libs/libpciaccess-0.10
+ python? ( ${PYTHON_DEPS} )
+ unwind? ( sys-libs/libunwind )"
+RDEPEND="${DEPEND}"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable python dumper)
+ $(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 || die
+ for testprogram in $(<multi-tests.txt) $(<single-tests.txt); do
+ if [[ -f ${testprogram} ]]; then
+ dobin "${testprogram}"
+ fi
+ done
+ popd
+ 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.7.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.7.ebuild
new file mode 100644
index 000000000000..7d27f37019bb
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.7.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+PYTHON_COMPAT=( python{3_3,3_4} )
+
+inherit python-single-r1 xorg-2
+
+DESCRIPTION="Intel GPU userland tools"
+KEYWORDS="amd64 x86"
+IUSE="python video_cards_nouveau"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+RESTRICT="test"
+
+DEPEND="dev-libs/glib:2
+ >=x11-libs/cairo-1.12.0
+ >=x11-libs/libdrm-2.4.52[video_cards_intel,video_cards_nouveau?]
+ >=x11-libs/libpciaccess-0.10
+ python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-shader-debugger-Force-file-stdout-IO-as-UTF-8.patch"
+ "${FILESDIR}/${PN}-1.10-clang.patch"
+)
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ XORG_CONFIGURE_OPTIONS=(
+ $(use_enable python dumper)
+ $(use_enable video_cards_nouveau nouveau)
+ --disable-tests #484618
+ )
+ xorg-2_src_configure
+}
diff --git a/x11-apps/intel-gpu-tools/metadata.xml b/x11-apps/intel-gpu-tools/metadata.xml
new file mode 100644
index 000000000000..fe7694404ff5
--- /dev/null
+++ b/x11-apps/intel-gpu-tools/metadata.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>x11</herd>
+<use>
+ <flag name='python'>Install python based register dumper utilities</flag>
+ <flag name='test-programs'>Install test programs for DRM driver development</flag>
+ <flag name='unwind'>Provide automatic stack traces on test failures</flag>
+</use>
+</pkgmetadata>