x11-drivers/xf86-video-intel: Add patch to fix RandR segfault, see bug #490414

Package-Manager: portage-2.2.7/cvs/Linux x86_64

4 files changed, 139 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index f434daaa079f..e902d328b36f 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-drivers/xf86-video-intel
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.148 2013/11/03 18:20:28 remi Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.149 2013/11/04 21:18:00 remi Exp $
+
+*xf86-video-intel-2.99.905-r1 (04 Nov 2013)
+
+  04 Nov 2013; Rémi Cardona <remi@gentoo.org>
+  +xf86-video-intel-2.99.905-r1.ebuild,
+  +files/xf86-video-intel-2.99.905-fix-randr.patch:
+  Add patch to fix RandR segfault, see bug #490414.
 
   03 Nov 2013; Rémi Cardona <remi@gentoo.org>
   xf86-video-intel-2.99.905.ebuild:
diff --git a/x11-drivers/xf86-video-intel/Manifest b/x11-drivers/xf86-video-intel/Manifest
index 1e7a454dfe7e..21b2c5a334b9 100644
--- a/x11-drivers/xf86-video-intel/Manifest
+++ b/x11-drivers/xf86-video-intel/Manifest
@@ -1,4 +1,5 @@
 AUX xf86-video-intel-2.21.10-sna-clear-clear-hint.patch 943 SHA256 33465c66b0a4bca2dfd242c86cb8cb882fbf841e1c2da632a5aa76f9d04b84d1 SHA512 8de2268f3b8e7cf4af13b53836d45de237137ba925ff196803b873772fb7315a3d159941d66c95b8cce4d95a42933de55614fb123dbb00139761b4010e1432df WHIRLPOOL 5decb4a472144e4f5fc140730f0ce9727fbced1b5569d02cd2a3d47cbb0138628d888b2ff844a947db2ed134d5c439bb408c5084e324d309bd6f47e7b045f9ed
+AUX xf86-video-intel-2.99.905-fix-randr.patch 1528 SHA256 1d41609432b63f4cc0d461633fd2056182132f3fc911a75a909112413d0447d2 SHA512 5420dc03f859cb4f7524d9daad3087ac69c685ade01ebc7dc966c236cf4e920ffaa562ea12d354c8330073c03485ce4fe162130d3ff5201cfe02a1dd96dbcd94 WHIRLPOOL 4196658f48acf0ef2e0de464b199d9721c40280619ae317e23aa56ec351a6eae16b7192df520be4f83eb88984aee51289d1b0c6147d3b3ee227ee27eaaf4ca17
 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.10.tar.bz2 1905905 SHA256 7a4bcad83e8153ab1eec46dfee2412b7b20d087f438af4bf97f460f67c5ca9b6 SHA512 f80317c4bfef80dc5e32274d1fe6fe643eb2fdb9bfb999b092a227b53bc6bc01bfc0f3e67156daae9d83543ef437f8ffc4a52c686517ba1314296d6bedf74305 WHIRLPOOL 2cf1eb9f7f1be24585de8162452acc8d2812d2ac6cfd375cd0063665f535f05d4c1f20a8593cdeb31e389e4918faa7e69ae220664c79fea2cb9324995e005e14
@@ -22,6 +23,7 @@ EBUILD xf86-video-intel-2.21.15.ebuild 1510 SHA256 9c055fcba979cd1e781746faab15e
 EBUILD xf86-video-intel-2.9.1.ebuild 776 SHA256 4c1d2a0b50b0f4355e894395db96d4f975a52f42ef38a7ea29da7740ee61e86b SHA512 d021f1aaacc24581dff5851ba613ce980e437ca8640037acf02a54a4c4e13c7b60df21f94ee93e4402e481ac67c4c94fd57806749393f5719573a9e77110f845 WHIRLPOOL c28e1ce131b3fd3d122450ce8f23c21665282415d0ec9ca81aac48e764462d449691c334e86e42b223a3c0f8ccea32820c5e1b8e47802a305589725fb39a5109
 EBUILD xf86-video-intel-2.99.901.ebuild 1514 SHA256 19a7061468eed286cc7114f19a43d793676eae6ff01daf5094f8ef59344cd5f9 SHA512 9b95a7b7d023e67f47b750e50fab5714851041b391835c0a1238e9158fb106125d6e3179eed534053b4a3eca09095bf18d2a29aec20f45a5eee3f290c0c5ca98 WHIRLPOOL c516752a72a9a2b91234410f46f699f0912409a3c540603ab528319c0897c56b9d28620e5135e53d6414b158e22fdfcca0b6e7a9853870ca282f1e6a9e9cb4cc
 EBUILD xf86-video-intel-2.99.903.ebuild 1514 SHA256 2386e5c920bb6c1cf0ea7480457a9c8681e70760f30b193bcfcaa355ae95c22d SHA512 c44b9c15363ce3c45c65fdf391599bb0c62d24037b253363e2f10039d9465f44c4dd0e06cf7b6076757ce0f16834c0b55f173792571e4dd6d9944c15f155d52b WHIRLPOOL da3e23185c02b3467732098c285258e637836faaef19d9be7719ad71f94f89d00a0a3c8a2a18adb768a32c22c2dcce2a4b0c5cdfef4cf9ea473609e2b6d4c8b1
+EBUILD xf86-video-intel-2.99.905-r1.ebuild 1579 SHA256 ca918b63f0502075ba3843cb4f0d69907002c9e31ef20870ea87fbf69347124c SHA512 35273593482f566c4674436838a886a94aeb3dcc31e618b8868562b5a9f4279062bd51e79aef2bd86ab2ca847a38ecfaba7ae18e6b58ddb20f62fb4dc64d609a WHIRLPOOL b8d5530d80151d982cf2c4ec92e3b73dc234c46cca3da723f2cb2050fddd34e2721d24805c7f80be7169ae65c4ae4c1e30e8adf914962f12b1eacbbaa3131154
 EBUILD xf86-video-intel-2.99.905.ebuild 1527 SHA256 de8ae1a52eb9f9df36e102ae0c87b4278c656bbc6259ced2764366feb96f4f84 SHA512 f022aa8f0dd550a986e8e5dc87ad5826f7f49de93c26e4f5591e5ba2388f7a7257a6583d8543959d6ed085a18b5a792d8daae2535858bd08ad3ea371e90717ba WHIRLPOOL 345208f602c511bcf0baf354a639ab700f7578314218c3f5c5d11f66e6212fbc93ad1957dcc9406666e13961284a123202dc024d837e4a1b7039fb36b19f516f
-MISC ChangeLog 56795 SHA256 5c572e5ef24e88d7e088921acab0391186cbab1faff4cc9ab7fae1ef1ab0e25a SHA512 7d3d80027c418f6c90d87dd4b898f5fac5c32accd452071a26414c7e98eb463581d1d626e0d0a1698a85b1b893708eaa6bc8766fed941ae53f29da80c48218b8 WHIRLPOOL c2d9d5e9c0ad1ca70afa485bc3c8c188b984e5705fc675f67a64b53040834223622f4c1842d3f82e6ed728d03580e0b7a8538cbb2b82cc9bcc10639b00e8cef6
+MISC ChangeLog 57032 SHA256 ff3bf6947fb4e2d92d1bf53d1c4e1eddc4804484da57a6bacd5034211a0bb6ed SHA512 8238d755ce94841255d9f95d8c3ab03e1c5d175c765c2551a26ef3cf7360e3b795623454b5ed033e81c2da2d02751effaab6e673584d36bd10b5b5ef7c15125b WHIRLPOOL fa8cf16ade2a07daa7b471c29d32e6d9b2cb2de8c1bc99a75ddd3e33640de95eac63143e863dd5b9ff95baf91779ab10ab7b17b9fd2a1c393e6e0ace040fbfc2
 MISC metadata.xml 483 SHA256 b96de77e3bad545136bdb56ed473b997b8b1ef7ae8f7137e9fd856e4b64a8aaf SHA512 48ed87bf243bd30ff54717c0c5634660c721ed620dae9c106fda193f937a47200c7e598be118c2ea2d6dfa589d9fc918a5e269d2e583a0326a1b8132c9e243ba WHIRLPOOL 89de9b7128187483a8f44506afdc59453c4ef47ea5c5914da73fe49d651afb48fdded3d23c72e42950cd048d4f509e8aed632d090fec327f0ab5c28e9aeacafc
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.905-fix-randr.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.905-fix-randr.patch
new file mode 100644
index 000000000000..fc5c97ef3f0c
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.99.905-fix-randr.patch
@@ -0,0 +1,56 @@
+From 8e44b1f5543f6d36c33c743f1ba2143514f8afbf Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Thu, 24 Oct 2013 13:05:16 +0100
+Subject: [PATCH] sna: Fix canonical mode name to correctly use asprintf
+
+Whoops. Only the kernel sprintf() accepts NULL as a valid target string,
+not libc's.
+
+Reported-by: Jay Little <jaylittle@jaylittle.com>
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=70835
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+ src/sna/sna_display.c | 23 ++++++-----------------
+ 1 file changed, 6 insertions(+), 17 deletions(-)
+
+diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
+index 7fcade6..3c39305 100644
+--- a/src/sna/sna_display.c
++++ b/src/sna/sna_display.c
+@@ -2095,27 +2095,16 @@ sna_output_panel_edid(xf86OutputPtr output, DisplayModePtr modes)
+ 	return xf86ModesAdd(modes, m);
+ }
+ 
+-static int _canonical_mode_name(DisplayModePtr mode, char *str)
+-{
+-	return sprintf(str, "%dx%d%s",
+-		       mode->HDisplay, mode->VDisplay,
+-		       mode->Flags & V_INTERLACE ? "i" : "");
+-}
+-
+ static char *canonical_mode_name(DisplayModePtr mode)
+ {
+-	 char *str;
+-	 int len;
+-
+-	 len = _canonical_mode_name(mode, NULL);
+-	 if (len < 0)
+-		 return NULL;
++	char *str;
+ 
+-	 str = malloc(len + 1);
+-	 if (str != NULL)
+-		 _canonical_mode_name(mode, str);
++	if (asprintf(&str, "%dx%d%s",
++		     mode->HDisplay, mode->VDisplay,
++		     mode->Flags & V_INTERLACE ? "i" : "") < 0)
++		return NULL;
+ 
+-	 return str;
++	return str;
+ }
+ 
+ static DisplayModePtr
+-- 
+1.8.4.2
+
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.905-r1.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.905-r1.ebuild
new file mode 100644
index 000000000000..8d35ac7e3aeb
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.99.905-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2013 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.905-r1.ebuild,v 1.1 2013/11/04 21:18:00 remi 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="glamor +sna +udev uxa xvmc"
+
+REQUIRED_USE="
+	|| ( sna uxa )
+	glamor? ( uxa )
+"
+
+RDEPEND="x11-libs/libXext
+	x11-libs/libXfixes
+	>=x11-libs/pixman-0.27.1
+	>=x11-libs/libdrm-2.4.29[video_cards_intel]
+	glamor? (
+		x11-libs/glamor
+	)
+	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/resourceproto"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-fix-randr.patch
+)
+
+src_configure() {
+	XORG_CONFIGURE_OPTIONS=(
+		$(use_enable dri)
+		$(use_enable glamor)
+		$(use_enable sna)
+		$(use_enable uxa)
+		$(use_enable udev)
+		$(use_enable xvmc)
+	)
+	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
+}