Add fix from upstream for building w/clang.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

4 files changed, 69 insertions, 20 deletions

diff --git a/x11-apps/intel-gpu-tools/ChangeLog b/x11-apps/intel-gpu-tools/ChangeLog
index 8ff83c75a7f5..c32070d2214f 100644
--- a/x11-apps/intel-gpu-tools/ChangeLog
+++ b/x11-apps/intel-gpu-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-apps/intel-gpu-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/ChangeLog,v 1.23 2015/04/10 12:26:47 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/ChangeLog,v 1.24 2015/05/28 22:52:28 vapier Exp $
+
+  28 May 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/intel-gpu-tools-1.10-clang.patch, intel-gpu-tools-1.10.ebuild:
+  Add fix from upstream for building w/clang.
 
 *intel-gpu-tools-1.10 (10 Apr 2015)
 
diff --git a/x11-apps/intel-gpu-tools/Manifest b/x11-apps/intel-gpu-tools/Manifest
index f282f5c419fa..192c258e67b7 100644
--- a/x11-apps/intel-gpu-tools/Manifest
+++ b/x11-apps/intel-gpu-tools/Manifest
@@ -1,33 +1,32 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX intel-gpu-tools-1.10-clang.patch 1557 SHA256 e95499589c795f11ae5819807041957c0854a93c77375100730c4e85672512e0 SHA512 2d152ee9b1f0ebae58d4458a9135479c6cc6b4de9dae5df46cddfa81b57fa9d1441f06fb8f46d8154cab6a5afedc4aa012b60b58058249336933ce3d069fae63 WHIRLPOOL 882f9c43ceecfa018c1810a584a03c22a3aca28186c1ca02e4f6734680825aed776d91c173713f0d8ffaa007e0eb3f3c18d02f349f9ff7557e1c5cbfe23a34aa
 AUX intel-gpu-tools-1.7-shader-debugger-Force-file-stdout-IO-as-UTF-8.patch 1304 SHA256 e63d273740876669482e459a1bef21bb4d3207004695776b21a8311cd58546a1 SHA512 10f9722367c3f060725218161d4b0774f17f23ea6cd9cc5a19cde068bdca2f933f84243ccc2af6157dadd94c0b67284f826ca9829050a69a3c0310b252ec0019 WHIRLPOOL f22811cef57178bbab517aa0d2d4b488065f0d20c10e2250ac876bad0b9cc1b007c731bb77eb68c21b2a4b48033383fb6e15f04e961a52afef9431ea2b2ffc3f
 DIST intel-gpu-tools-1.10.tar.bz2 1501523 SHA256 6df2bef12d7cd252d702e4412937fbdc48fa954dd5f7f6988f567912f63b9874 SHA512 b6d5e2b377534a2132a22e22af5786086360646ea6d788b863e7424dd68898c6e35c31c2620f4301b00659cea56aa5739609781d8324c04929bba367f61fc8da WHIRLPOOL 916d97f24972fc9f3dad52b80193921e2fff309345d7c977d9bee89d0f03db361ce167c52eaeda311ba87d4de11a4bdc1824ed27c79bf11a64581ecb085ef5bf
 DIST intel-gpu-tools-1.2.tar.bz2 531491 SHA256 104eeed3087e7eff7aa3a843b3988cb767f013ce2f476d32be8d1dfbb13d7932 SHA512 d4206a0438e1280fd77700dce82a26720ef4ed954d587fb630bd2bf141055c931e0965a7fb4ce685069a8ce18c35866b7e899c53e0a6da262e24e40edf8191d7 WHIRLPOOL 81f10e6e5361cc77a1e7396050d81992ae1bf98fc31925ed172b02f40b634224d94317fffcd069fb498ccfd359c2f45c05ad7147ffc024411fc000621caf9980
 DIST intel-gpu-tools-1.3.tar.bz2 589027 SHA256 51d22fdb3d415a1b3b7d0a172c1bb24dec6f16116e80a9ce49873f44527f20a0 SHA512 de0c8601dc1910b22c343e3709a0f2266b8bd509b582ff0e4d8a0c629a7678f4822e6c7c0e18d06fcd0cfec76e411d0e26b987dc021bb4b948ce64801382b94f WHIRLPOOL 2b513db673e1e337c2590d98850cb5b2f34be3d733738c85f18800539065c29aa65ccb7d9b53c50e9b109f15c9ba20f147e965e6f882a44a36161e2161e98ac0
 DIST intel-gpu-tools-1.7.tar.bz2 11780573 SHA256 22612343bbd9b518b9f92a983555dbbcae8040ee577a38277dbf873c8900207a SHA512 13181db6d2424fa27c97c30ecb83b8554fc2e9ce98bec7b7735f919aa9d7e2563c3e1860dc6e5aedf3918c029acb205b8fcf6a32de1567f557f8cd98c09a5d98 WHIRLPOOL f66e0710377aa4f46067840efd1cf70814e10cd81ff24ebb5db21b901787846f63b1461502ec01ba7383ead76e985c25860801355a9582d5509a861fa70aacb0
-EBUILD intel-gpu-tools-1.10.ebuild 1466 SHA256 ab1ec1b69b7103db66f9b3252a17d6dea6d34f4301b5884267b317003ffa1058 SHA512 df82a098688f79daa16d5973557885b3cc803382c9d7f1508b9c53f1d72e2b80f6df4154c717ebb11df8af41c5f33f42574c41f73b4f3d45754575dbb43fab63 WHIRLPOOL 70e26ed3148ce76e438c5fd92c2d7148859c1a9ff2ead0395627179e594b5a3f2e72711e43ed9f4a52981948f9259cc35601c780ef7abf3db049d68da2856d4b
+EBUILD intel-gpu-tools-1.10.ebuild 1508 SHA256 08a1af466b2ac3f5a842642b8b549dcd948120633fd573569ef33392f0f9161a SHA512 877a652f86f8dcfb30e5c270a9ccdca6b838a7444b959776beb012a6da7cc12035a6159a152a7808f6a52343ff83821e35a6efdb50cc87d9727cc2353787544a WHIRLPOOL b5146f1999647e5d5417688f56779fe6843482aaa70ec17b43bf5d370900a32e30f153b442d74a1bd582fe2cf045be49300351f23e2f2de2ffae3d06ff68c7b8
 EBUILD intel-gpu-tools-1.2.ebuild 458 SHA256 fdad3dbf94c6b85fa6731441358ddebf3592c3f958a17ba80be5a608b2f9a6d9 SHA512 89f084c31683674e22a18175d0ea40eb5ef64d7753d5fb9f79548fa28aa6ed26e4b00ab988a92a0ac222251020be0ccd5501e257c685b2d3b73a71a1a558bd9c WHIRLPOOL a086480bf28b211867405023d163d7b5382ea553fbccd3fdb8848415f56b149cffed88f944bbcbce46b2d2643869f421981f8c62fd87e208479291f64528b308
 EBUILD intel-gpu-tools-1.3.ebuild 631 SHA256 8b2d645170e4ab0ed6fd90a7305dd66cc0213987f1cf93dfd11a988562e70f7e SHA512 538ab6e5c42e91365876a83c2db8e7f73a2ab9844d0e909aeb32c45b9d815e54a8f60682bf534e0feba0e82f50d80f437fc5b5b6eadc831bf8a7663ff00fe212 WHIRLPOOL d232fb9bf0a32c9c1ea96adb204ce9ad640f2015ede74f3839acf125036d622b6f58669168b4bc7a33ed6af7cddddee9e06ef01abc9b04384aa2e202e2d50205
 EBUILD intel-gpu-tools-1.7.ebuild 977 SHA256 05ee597fead566d382735a75605be4cff7c5e58dc283258ed51ba16c0c96228f SHA512 d1651d94062eb903ba435c0aaf9a824ea4e437e53e77d3a71430270638634fffc5c9b8e96a7eee5fd9046b7904f0f58b2ba29605f849fc3c7e6c4beba1867c29 WHIRLPOOL 90414d51f6888319bc4001beb5ea892578d877d7aa2db1e157b43560f39c5ea1a82b688e73596cbbe8ce2bddbe1896dada53dcb02d1b2548ad6ed22536e92f11
-MISC ChangeLog 3719 SHA256 a5a01fed206d7a054ce6974f3ec30203d1d551cfe4b0cf04a7bd0168fd1b04d6 SHA512 3fb5ea926d47ef5b1a19996d8fa9c06125660fec2019d237a9db97847bff423f31e5826ba3b07cf3351366a4a2d6c2471d8200fcf98be8d3048e7f79cbda5cac WHIRLPOOL b0096aa8b38bc141d68a77f1336939567a2a33dc381bf32d0480697b43047cd88b1cdaf5ed13718492fe9c81b4fb63ba96ae5c1761d0733c521df1a7f240f00d
+MISC ChangeLog 3886 SHA256 ed8c1762da741f5344ad7bb0f985394db021f8eee61479f8929e187370f909dc SHA512 66b9b123c6a26836f3dda9298a064c58bce86ea3c9157636daef1347056492dbd24d191c45f4f9e74ea9d04689bcf79de1e5f5499d48fc3118322c36cd14fc8a WHIRLPOOL a5e4db712bdb225256a491a7ac3e3dc9a8a59165963e14ea60451ddfc579e0dbdd8a2c3e63ef281533c5f87f2e8ef4a4bc3643342cbd39e17bf0164bf07ed0d4
 MISC metadata.xml 328 SHA256 45191023da9515279f79b27f00c9810595efe9dbff2de74c25d14937c1b6fcea SHA512 996e69c32b4061c567c499ddba62f35e53d31ae07afe89035d05710f2b5e9f523fc3855569f4b331e9174757e2437ba6743e7104b23fc868784fe0c127025756 WHIRLPOOL 01064df069dfc8c29754280852512fb4a472580be7fda957f0ecd7330022a5be089b915ec3d40c6a3d6f4a4ce364ab7028229c4ce26c66f8d5834ea233bf903c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJ8G2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
-MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRh+kP/iY0qM431ofmP1ZrdRpSA+lJ
-psfyH7nswyKLSrrZKGBJwam/a/6lNpbNVB5I3oksuUlZUWlwgvRpB6bP3UGmfaDk
-UhdoPxq8t5WzDA3rLGH+7ZQxXBZRMMVe0PtNt6HWSON5PYL/7Jzyi7NjbTaRCziz
-y0ML7hLdFfxtDwXUI7PQFL4NsGYC6TJZkyhMTtmOCrhrq7HlTlZxTcDe3qG6lO4V
-UBpUqCfRQtgaOAyk5LeF41NXqkewnP3S2DWk3N4rzrQ2XM5h8Ja4oCMIkhK9GrbU
-8WmJPfD1d3iyA7wCqjkH/ATtxcQ4BjktVIo6Vl7NDhNR+lVq6Tp6sAX9bObaVXVS
-Mzc/i9mKAcDi87FKbwbYTppDlZaOKvl769DggybQbz+1pEpHiQ7/9BtPC4PMIgnF
-lL/NbFZhTIOdAzrP2GntyhVcl1Oy0ssPNktwyatHaKJebWXgLZwy4CoktHC/FrPc
-Nk1ZaVR/nppLNlo/vkMjIguBS39T/RAviDHtoq/nvXFOV57Q1f0tLj27hFq3Qte0
-/QU5+lCPnLvZOKnslkXFzuYUAFHvw0CZnNpVjhkT9kMiW7u9DyLE1lyaGlCMsyvH
-CtnzkGgAy7H22euR49nNVVXv4X5UCCGsZoOF6rgdAB3B32js2a857MTn3KxvKYq8
-BC43TAErEQX6imKSvGWG
-=w+uz
+iQIcBAEBCAAGBQJVZ5wtAAoJEPGu1DbS6WIAlngP/iP+/3XM4WQufBpTiPLJY6yQ
+b5K2bXov9eD3nzoW4miqyrIayOMcs71E/pE5fBLskMKaCajGkAd2V27Es2AOEc9r
+exoGKP3kbIHI0mxE1HB+h1+MllMutvrXg1J12lODKyuRVVg52av7riws9Nljs/Gr
+vAxQ8PfXuLPoOVsH/ZU6A+Op9r3eE4qvLVF6kNMWx20hTcqBUlPx7IfPNMS6ztXX
+mPErES0RDTIg57R6LN1RuYcmzTQEpYlk96c1ayiWQ+sqh8rVsnQxX+tHicrlPZDb
+cnPWFvgWXg1RBJrSXvouIRfv/HtKSqCe5oMIusvBixvuJvzbQQleX6mqCH+xdIIf
+brTKpUWZuZNALqJcTGdet8MGbTSL9qWkbGOLpXstc7SLgTsbSQoHo9A/4Hogsvdg
+HKxbtVpbaHMmdrZapJg3/AK/H0uPLk9YQqxdbMW+6o24Q8KWxMivoX2HZGSlw3mB
+kwgim1m13bVQAJ1CkZKeU55Gp4n8qacYNgVHkQ52Q4WnhteATX3k2zoQjHkCG1rl
+fyTGkL4U4J1H1Msrsgdl1DMUTa8fPgCSTLmN3k6DlkPicUVtHRgZWV9nVwq+ZSjQ
+Nfa0Vlhor0MQ59/lbZTqnIiY+MKOaO5F2rGcyEEHh0Ef0/pqaCYpqUwONjpvhTNn
+lB1ztmVQmRh1Mol+eS/2
+=KnmF
 -----END PGP SIGNATURE-----
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/intel-gpu-tools-1.10.ebuild b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild
index 30d9a91bb370..10ebdc51bec4 100644
--- a/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild
+++ b/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild,v 1.1 2015/04/10 12:26:47 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-apps/intel-gpu-tools/intel-gpu-tools-1.10.ebuild,v 1.2 2015/05/28 22:52:28 vapier Exp $
 
 EAPI=5
 
@@ -21,6 +21,8 @@ DEPEND="dev-libs/glib:2
 	python? ( ${PYTHON_DEPS} )"
 RDEPEND="${DEPEND}"
 
+PATCHES=( "${FILESDIR}/${P}-clang.patch" )
+
 pkg_setup() {
 	use python && python-single-r1_pkg_setup
 }