commit: 8669fa58141a660b8bbd585719036fec34793213 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> AuthorDate: Tue Jun 21 18:49:57 2016 +0000 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> CommitDate: Tue Jun 21 18:49:57 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8669fa58
x11-libs/intel-gpu-tools: drop old <1.12 versions x11-apps/intel-gpu-tools/Manifest | 3 -- .../files/intel-gpu-tools-1.10-clang.patch | 44 ---------------- ...er-debugger-Force-file-stdout-IO-as-UTF-8.patch | 37 ------------- .../intel-gpu-tools/intel-gpu-tools-1.10.ebuild | 60 ---------------------- .../intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild | 60 ---------------------- .../intel-gpu-tools/intel-gpu-tools-1.7.ebuild | 40 --------------- 6 files changed, 244 deletions(-) diff --git a/x11-apps/intel-gpu-tools/Manifest b/x11-apps/intel-gpu-tools/Manifest index f2b987a..276ad58 100644 --- a/x11-apps/intel-gpu-tools/Manifest +++ b/x11-apps/intel-gpu-tools/Manifest @@ -1,5 +1,2 @@ -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.12.tar.bz2 1621343 SHA256 143fe0ae4a52560b9c032aa7592fe8d36b1578abb873fa9b026a75acf7e38be3 SHA512 0643ffcc5198ad3c03d7fb2323f95b1a23fabc529ab00b5165a2355fe7b7d4d5e81b76627bf19f41fb6111fc3c9a32e83010e09941aa78097c9e58dce5832c81 WHIRLPOOL cb34e5410ef21ad143ae52c062c5d9b3b388885514364f2aca531746971cbb8775e4d3d26b7fe83ae68cf73eab9a99a1b9d6eeb4b4e5e09e896f872f68dcb905 DIST intel-gpu-tools-1.15.tar.bz2 1827851 SHA256 dcf256112d2692aa49ce6c6d17a898f60b3709b98c2f1c4592b23d22371462bd SHA512 407f7c4ce72babbbd3ed08fc77719f88321b56745601b588bb6dce1a659786215e6d1b121af748087746df6f7da1bfd3ae8f9a898173eede5d5bb4a5b24b4559 WHIRLPOOL f06c522587cb389f519939e2a2bcfe832f6b5f59f440722443fe0098fe15d9a2a7b83c3a92c330890c5bfc24a5c75f3cb963a39e9b58f9bde926e4448bf9fc6e -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 deleted file mode 100644 index 2f7b7a2..0000000 --- a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.10-clang.patch +++ /dev/null @@ -1,44 +0,0 @@ -fix from upstream for building w/clang - -From 95019c2a3c4ed5943ad16e17c8dcf36fd6492adc Mon Sep 17 00:00:00 2001 -From: Yunlian Jiang <yunl...@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.widaw...@intel.com> -Cc: Thomas Wood <thomas.w...@intel.com> -Signed-off-by: Yunlian Jiang <yunl...@google.com> -Signed-off-by: Thomas Wood <thomas.w...@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 deleted file mode 100644 index 3b87f69..0000000 --- a/x11-apps/intel-gpu-tools/files/intel-gpu-tools-1.7-shader-debugger-Force-file-stdout-IO-as-UTF-8.patch +++ /dev/null @@ -1,37 +0,0 @@ -From e9e9df216180bcecc5d4c17bbe48b2efd88b3ed2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?R=C3=A9mi=20Cardona?= <r...@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 <r...@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 deleted file mode 100644 index e0296a1..0000000 --- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# 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 deleted file mode 100644 index 8251c6f..0000000 --- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.11-r1.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# 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 deleted file mode 100644 index 7d27f37..0000000 --- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.7.ebuild +++ /dev/null @@ -1,40 +0,0 @@ -# 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 -}
