Add patches to fix building against newer gcc, bug #550784.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x2324E7B566DF2611!

5 files changed, 185 insertions, 16 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index 5f479cb9233c..89ea4a685723 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.168 2015/02/19 08:52:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.169 2015/06/13 22:53:00 chithanh Exp $
+
+*xf86-video-intel-2.99.917-r1 (13 Jun 2015)
+
+  13 Jun 2015; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-intel-2.99.917-sna-udev-fstat.patch,
+  +files/xf86-video-intel-2.99.917-uxa-udev-fstat.patch,
+  +xf86-video-intel-2.99.917-r1.ebuild:
+  Add patches to fix building against newer gcc, bug #550784.
 
   19 Feb 2015; Agostino Sarubbo <ago@gentoo.org>
   xf86-video-intel-2.99.917.ebuild:
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 747232648850..4409a9309919 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -7,6 +7,8 @@ AUX xf86-video-intel-2.99.906-server-crash.patch 1373 SHA256 4999e15222ae1ed6770
 AUX xf86-video-intel-2.99.907-invalidation.patch 1707 SHA256 feb57fb5acbf18dec6d72e3990db318adecf07e44f7c7e03bdfaa488f6d40b66 SHA512 7ecbeb4574ad089f58aeeb84280bfca9f48754312a6d4f68d7f32c71e29de7582556806d5f399c555751edc9b70be5780a26ed2d2187fcfeba3fef4ed1f71229 WHIRLPOOL 093ac0b591c8c781b72325fe3762de475f3e97aaa54dbaaa207bcc55c0e66dca9e5e1ccf064cef1a847c98621438e8d633187ea4480c7ef76d05de853fcc6752
 AUX xf86-video-intel-2.99.911-sna-pixmap-migration.patch 3801 SHA256 c0758266c9eceb7647316639b4408c02e6beac86eef8871c5ff756c188488276 SHA512 b5d7ca5cd93d3ed4bba150b312fc868e53867a04df94956b367caf315e32398ea8558ee0059debd7e7684794fb2e55361d0ae425ccc66187d22297003894e76b WHIRLPOOL bc273ef3add88f9ddee4cbc9f23434edf0a91e5a6157691496c907dff2391dd8ce38ed98ca382c8b1f05c09dfb21b2dc12756b56d59026450dee61452d2dea0f
 AUX xf86-video-intel-2.99.912-disable-dri3.patch 601 SHA256 03304d86ae442b1c7a0f2a1e80f0d48d2c6093fd9cc7067c8e8390e72efe61a5 SHA512 156fe8bbf6b381c9bed97241c249a3f4ce6e417776c618dbf711fd52d35088b8990eb59cc9ad881d5266a32e6b5e265833084f99281f73282f35fac775f4217e WHIRLPOOL a55c2cdc46a2b966ddf0853e033e2cc15145abc358accfed250c807d7bcc5a96196294c3de5f47d72af5e1db581615c0ea34fbd799d8173dc7c05071f6e2764e
+AUX xf86-video-intel-2.99.917-sna-udev-fstat.patch 1902 SHA256 ffbfae1a4b8577fbbb07f9fe7458afdc95c75abf8b56e8604326f1063d7f257a SHA512 33f22e7cf974cb0c285572c7d760d5308e3db1738794df237327559c8fb2581446ebca499a020f4a6e1ad70149e05cd326979d8da06b1df52062a702f72b6901 WHIRLPOOL bf64dba9567d021fdb9227db078e818bd6a9336382f89cf6ae3b1e09692c71e3d3071e76377534a31d276f08e6b950843dbb89ae6c0ae36c9c93051f1222cd98
+AUX xf86-video-intel-2.99.917-uxa-udev-fstat.patch 855 SHA256 c9735095020e0572a5e9ce4b2c18a825a2baa19ebaea5258b2c9d539d5339aa5 SHA512 e309ed75144f910cd5cebf509e9d908a72d137fca4b054bb9b9a97887523d9745c6c556c5b5d8f72025e4eb149694dd6235e6c0a31892500e1993fdc4cdca2c4 WHIRLPOOL 1820e632cbdadac17d7a25a9580b0f52af772e318ebca6afedab4d5a0169223154ab58ebc9f02de8e33a27bcfc5e7bd9e1d73548fc36975059363dca916c997c
 DIST xf86-video-intel-2.19.0.tar.bz2 1463260 SHA256 32133d61b14ce3b45b83a60e4ed8eb75159259d708f056144250aaeabf16e4bc SHA512 988f231570cdd7e5c60880472c8bee765def040addf1fa6e5bc9e8a8722b5500d4ae2b798383dc90f2ca3df439e230c4df2d7e3f7cb50341d2d3d38486520292 WHIRLPOOL a19605d2473e72fc4e81a7a327a9b8e9534bdfceca64b44a3d0fd62bf031c9ec10c7d12379b9ca327bde8bc90e15c73cee7ef2de71de00c92bc70969f2a91d37
 DIST xf86-video-intel-2.20.13.tar.bz2 1649369 SHA256 0151104b58ff3509ecd05ac4ee2c5d81a78506c97afbed511fed6b263060dce3 SHA512 4f70ba1e794d26f8cbbb52c4936cfc8cdf4f43a353d9f921bf519a02a0c7f1b1eec6b3aa706ee6fc333a89b152416b9526f5d951ddea23ed70400e975c59febe WHIRLPOOL 101dff2402c75d0a48243ce1e3ac11e529f2d26a8d81321ae9ec528b6d35a3ed7647c342a2cf60389a69d677c29798c84e3252932b64f905966ef5af695cffbf
 DIST xf86-video-intel-2.21.15.tar.bz2 1977431 SHA256 7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc SHA512 ca9680716445d0e9ba1a5d87433455f7a5f558802b4d214d79496426dbfd3e598968f784b531de024df30fefcc114d6e40cc9c6da94604beb48cd4430bf9e491 WHIRLPOOL 352b114b1030d1fbe2d33f028e7c03be8b4a6a4b0e4cb4fd7c890dd4cc5594ebf1fd6477c9319c1e2ff5033fc3276fb9caa8d91d1d3ba6b0c2f1734b60d3efed
@@ -32,23 +34,26 @@ EBUILD xf86-video-intel-2.99.909.ebuild 1563 SHA256 53127f0221102ee6da7f660480e2
 EBUILD xf86-video-intel-2.99.910.ebuild 1563 SHA256 1a183e44b5272923c737c7bcec7fa43feb505e55a1293bf042f2c2d0e4239ded SHA512 c447d587fa1d77ffa192968c3c558a69b95a3702b5f18e53884996e0a247208587631d82dffcde37419d9f1ac704e9447c1306b7101243e736c37705bec2b7ed WHIRLPOOL 6963591213e49cc4edf49c7e24cbdd819cc1e4209e9317ddee575bc1d8adf8d7365a41244b7cb88df8eac6270d7e6a4610c820466c512b1fe902dce6fbcf85a0
 EBUILD xf86-video-intel-2.99.914.ebuild 1663 SHA256 d5f2de599b881e059b8807dc04703568b07a99c90a6449bf7a0d0ba1a07f690d SHA512 393abcdda6072eca5e1069c54f1fcd5e2e716c1b86d0d43542e1ce9b57bdd897ff2e8cf6ccfd53e1334056c93c90896f537a7c07d0ad40e6b8f621c3c6717f74 WHIRLPOOL e0b099ec041c7cffb5a32d395b40f96b60faf0b8b22922e0a174040eb0d258f62b084947e060e1c264d9f75bf611ea35aff115cde5cb387f5eed1641b776fe40
 EBUILD xf86-video-intel-2.99.916.ebuild 1663 SHA256 42d7c0e643c8761292d6c54577f0781682e6263b6a7cd470a33cc2d33982a83c SHA512 917d58de58a4530482bae13077a0bb661fb5fcc434b281bf1ce017e2cb01dcfe5fc1b0d7cd07bc34d13f18d99768ba3d61a32987205e1c1d272c9aa62d97ba4d WHIRLPOOL 48f02b23d4f7e504bcf5e74a114e945cf4179761564c034a52c56a55e0035916e3c352812c224ee67f189ab69018da4ecd2fbed980ec0996f245938d5a02bf17
+EBUILD xf86-video-intel-2.99.917-r1.ebuild 1640 SHA256 a1e3af15d3f022c255f2e4aafb1f4630e1813b84dd536735adabb650a36baab8 SHA512 8496be3d468ffbaad67d9f492bfd1904f94f18f1a5b17bd6f5a3000179325cbaa36729edcc8c3bffb42b8adff1faf93715ecaae92267b600d320fe1dbd5c6382 WHIRLPOOL 74c8e7f7e5563540de0a71f7973b898beb85948fe0cddc3ed5b547334d47c0b4d2b71374d9d2836d0855770ca704468b1eb06d82e4d08348af5e20213ae0201e
 EBUILD xf86-video-intel-2.99.917.ebuild 1535 SHA256 0f356548d36166d655dac9ee99fdb23a696333d79eb9d6af447e0304f071ceb8 SHA512 843dbd333e5c7e48707e3f372220f966e44db92d834acf07e7aecb98b2b0bee49931d6f4681d75c470dbc65c487a5c015a77ef8a76b02308ca72b67e3fc3b262 WHIRLPOOL a0d8f0401e854b6faff4baaed4f71184847461e77d619f3c0a8dedc2684f2d8c7ddc6d4210e308edd48b5c923f6450bfa8c8adf0775cc359eee00f9933a54d7f
-MISC ChangeLog 60765 SHA256 44d182ed1ba25d5d28427d1c37198d189ac0958126389a2ad85ae1bb1c74abf9 SHA512 696fbdac32e5b8c672f0887a66d4a3beb1a65d857fbd63114ae7b827946a263d584fa984e4b03934134827be9fde5bde47de7494872eb157bfb8d3a41afdf2e3 WHIRLPOOL 95053f329d725bd686cfdb18568941460a6c5ac46843f21cb8470743aa60b623ceba8fd07dcb395ce3fea75ab031bf6a49fe464558639773b232974d5c48f53d
+MISC ChangeLog 61101 SHA256 61e0faa80cf809da11e018f0f980f0c0b2da21eaf69adab0bb3f10a46da5e695 SHA512 b16871b3f5bf5b52c8b86b83f0700a0131b6f12a4222a05ddb1cce69b79af41671024b5caa049889a75aab4402d38638344d69cd1de92406918a2c0aa0bb5ec8 WHIRLPOOL 7c205069bbddbebeeeda194287064c51bd29be3d03b0f40e47e93f85af00d0013681ab6e3c2fa7fd6faebde2dc41eecdbf90331ab3a91fd1b22423a765b2e8e6
 MISC metadata.xml 483 SHA256 b96de77e3bad545136bdb56ed473b997b8b1ef7ae8f7137e9fd856e4b64a8aaf SHA512 48ed87bf243bd30ff54717c0c5634660c721ed620dae9c106fda193f937a47200c7e598be118c2ea2d6dfa589d9fc918a5e269d2e583a0326a1b8132c9e243ba WHIRLPOOL 89de9b7128187483a8f44506afdc59453c4ef47ea5c5914da73fe49d651afb48fdded3d23c72e42950cd048d4f509e8aed632d090fec327f0ab5c28e9aeacafc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
+Version: GnuPG v2.0
 
-iQIcBAEBCAAGBQJU5aRcAAoJELp701BxlEWfUzwP/2iub3fw9ZEVv0w9+sq1iKFu
-NIOu31KlZWoVEBdtXeJDbN1y7uyTzZC8oBISQUzehXR6rRcuxQzU04YvHmKUN1sl
-oU8Hkm1uF7uc9yZwaAVPljJK5DTnbB4u1IJJCek0pROKomWYYT3vXTMC28lHVzIp
-NjReZdQCTZzB2fu+p5uwqIyiws69QcNdQDOkqsyVJD/6Q+TXvdrWp9x0h/hrC9Wi
-QG2UQq3NuAMmZ3KtyELxzL1ddBegv4FJ6w0mk5wrG3X2n35WC2fM9l8NNvOsqB07
-AnMykPMomMXIfbybTmz4NW6OFCmh2H2kLPMDkOaIkDxxWQsW272yFWK44kTnQc2P
-sjMAcaNSNnrPXgXhoLLxqM1p9OoDclbzdZF4rIYFtiGDTz4NUhMSpIdxvhq5TVqN
-Zwq9aoDiJ65UOVdINBVRs8LTkvXMuSO1LQJIlpcIuHCijapYTw0kaAOiuQyuMY9T
-pyWPqFxd7VivTdtVeCulYvnUdkdCO7Ko+5mxbsiVgYv4iUimW+NL2xnEzY9LOL82
-/oCJndTybOtBN8eVMtpX7jW998WG+BiIDG3qI4wWjNc06sPETGhtZJMY9ZW1ZX4R
-A9H52bVGVwYT3iZ6IOKPe4/m/xsFtNh+5Fx9eUJqbn+OUxh4A7epp/9R2+RDLvpX
-qnVVvzCNUswDdHOjR51y
-=ZjIn
+iQJ8BAEBCABmBQJVfLSDXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RDFCODdDQUUxMkUwNkJCNjUyMDMxOEIy
+MzI0RTdCNTY2REYyNjExAAoJECMk57Vm3yYRPT8QAI44ohYL7yjctSRiYJM20nk2
+xIDYPmApPjj4itTxO7ds5pMvy0S1M59ZbcuLh3nT/W8dtJ/FbpXf/BGxNUhcV++7
+7je9DpsFRFjrx1kueISirlGH+58w3sJRoe/4+wAIQIfQKfmKFBRL50Yl0aWff8ru
+SMZU3aSxHeMIDsv/7itw7FYvnuWp1IZ4XvjDtGSEShBMyMvG0De1JjIf86os1uyE
+h3miY6FHChuTsVEbdXYx8l5cqLvYDWcHufhQdsZ46xJKFqzZBq2kpiUXRQvHJTML
+51MBqoisEwBqGmb0yXBNn2YTXU+ypmdb+Pl8TXqottNwmsuNQ+ErydfHdBF7JrHV
+JHrohl07ilCOY2MRvU9TG16wc7j82gBM49wiE8brFIz047cLBGegWuatY9pGz7oZ
+ZkZcXhBDB/ZeDJb+31PFAa4kBgoLEx9e5gnfDoPJ4z1rWa1TYujfHdngLG+YYLyk
+5xHeFm5XZ1kghFegq6BrSqxK6EdCpUpZbSKtdRGuUKGElP49ZfHx7UPdPMfbbVGt
+BuQTsKplXRtEK8yNplAosws7YUOrulst8nATj9WWV3xn/WQ8SQG8fl2lAT611sqe
+FOe700yto6yQetPFesXkTWg9c5r89QT+ym2u6Qu5pTpCMQal5E5ZrRB5JwV/lh9P
+A6rauL8xwbWtX+bZRTdw
+=HCwr
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-sna-udev-fstat.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-sna-udev-fstat.patch
new file mode 100644
index 000000000000..7e276ac872fd
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-sna-udev-fstat.patch
@@ -0,0 +1,57 @@
+From 12af8a575d1518d40416f83195049157c3a062a5 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue, 24 Feb 2015 15:25:40 +0000
+Subject: sna: udev integration depends on fstat and sys/stat.h
+
+src/sna/sna_driver.c: In function 'sna_handle_uevents':
+src/sna/sna_driver.c:759:2: error: implicit declaration of function 'fstat' [-Werror=implicit-function-declaration]
+
+Also take the opportunity to include udev support in the configure
+summary.
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+diff --git a/configure.ac b/configure.ac
+index 7476e2b..de3a4b3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -197,11 +197,15 @@ AC_ARG_ENABLE(udev,
+ 
+ if test "x$UDEV" != "xno"; then
+ 	PKG_CHECK_MODULES(UDEV, [libudev], [udev="yes"], [udev="no"])
++	AC_CHECK_HEADERS([sys/stat.h], [], [udev="no"])
+ 	if test "x$UDEV" = "xyes" -a "x$udev" != "xyes"; then
+ 		AC_MSG_ERROR([udev support requested but not found (libudev)])
+ 	fi
+ 	if test "x$udev" = "xyes"; then
+ 		AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug detection])
++		udev_msg=" yes"
++	else
++		udev_msg=" no"
+ 	fi
+ fi
+ 
+@@ -911,6 +915,7 @@ echo "  Support for Kernel Mode Setting? $KMS"
+ echo "  Support for legacy User Mode Setting (for i810)? $UMS"
+ echo "  Support for Direct Rendering Infrastructure:$dri_msg"
+ echo "  Support for Xv motion compensation (XvMC and libXvMC):$xvmc_msg"
++echo "  Support for display hotplug notifications (udev):$udev_msg"
+ echo "  Build additional tools and utilities?$tools_msg"
+ if test -n "$xp_msg"; then
+ echo "  Experimental support:$xp_msg"
+diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
+index 8c0d0b5..bc20ef0 100644
+--- a/src/sna/sna_driver.c
++++ b/src/sna/sna_driver.c
+@@ -740,6 +740,8 @@ sna_wakeup_handler(WAKEUPHANDLER_ARGS_DECL)
+ }
+ 
+ #if HAVE_UDEV
++#include <sys/stat.h>
++
+ static void
+ sna_handle_uevents(int fd, void *closure)
+ {
+-- 
+cgit v0.10.2
+
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-uxa-udev-fstat.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-uxa-udev-fstat.patch
new file mode 100644
index 000000000000..66793568d4e5
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.917-uxa-udev-fstat.patch
@@ -0,0 +1,27 @@
+From 369ceec0e4910ba2c37736a59c55c0d6c26433bf Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Tue, 24 Feb 2015 15:25:40 +0000
+Subject: uxa: udev integration depends on fstat and sys/stat.h
+
+src/uxa/intel_driver.c: In function 'I830HandleUEvents':
+src/uxa/intel_driver.c:738:14: error: storage size of 's' isn't known
+src/uxa/intel_driver.c:746:2: error: implicit declaration of function 'fstat' [-Werror=implicit-function-declaration]
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+
+diff --git a/src/uxa/intel_driver.c b/src/uxa/intel_driver.c
+index c554124..6e64b8c 100644
+--- a/src/uxa/intel_driver.c
++++ b/src/uxa/intel_driver.c
+@@ -728,6 +728,8 @@ intel_flush_callback(CallbackListPtr *list,
+ }
+ 
+ #if HAVE_UDEV
++#include <sys/stat.h>
++
+ static void
+ I830HandleUEvents(int fd, void *closure)
+ {
+-- 
+cgit v0.10.2
+
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917-r1.ebuild
new file mode 100644
index 000000000000..c9e7a82dee15
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.917-r1.ebuild,v 1.1 2015/06/13 22:53:00 chithanh Exp $
+
+EAPI=5
+
+XORG_DRI=dri
+inherit linux-info xorg-2
+
+DESCRIPTION="X.Org driver for Intel cards"
+
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd -x86-fbsd"
+IUSE="debug +sna +udev uxa xvmc"
+
+REQUIRED_USE="
+	|| ( sna uxa )
+"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXfixes
+	>=x11-libs/pixman-0.27.1
+	>=x11-libs/libdrm-2.4.29[video_cards_intel]
+	sna? (
+		>=x11-base/xorg-server-1.10
+	)
+	udev? (
+		virtual/udev
+	)
+	xvmc? (
+		x11-libs/libXvMC
+		>=x11-libs/libxcb-1.5
+		x11-libs/xcb-util
+	)
+"
+DEPEND="${RDEPEND}
+	>=x11-proto/dri2proto-2.6
+	x11-proto/dri3proto
+	x11-proto/presentproto
+	x11-proto/resourceproto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-sna-udev-fstat.patch
+	"${FILESDIR}"/${P}-uxa-udev-fstat.patch
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable debug)
+		$(use_enable dri)
+		$(use_enable sna)
+		$(use_enable uxa)
+		$(use_enable udev)
+		$(use_enable xvmc)
+		--disable-dri3
+	)
+	xorg-2_src_configure
+}
+
+pkg_postinst() {
+	if linux_config_exists \
+		&& ! linux_chkconfig_present DRM_I915_KMS; then
+		echo
+		ewarn "This driver requires KMS support in your kernel"
+		ewarn "  Device Drivers --->"
+		ewarn "    Graphics support --->"
+		ewarn "      Direct Rendering Manager (XFree86 4.1.0 and higher DRI support)  --->"
+		ewarn "      <*>   Intel 830M, 845G, 852GM, 855GM, 865G (i915 driver)  --->"
+		ewarn "	      i915 driver"
+		ewarn "      [*]       Enable modesetting on intel by default"
+		echo
+	fi
+}