diff options
author | Rémi Cardona <remi@gentoo.org> | 2013-11-04 21:18:00 +0000 |
---|---|---|
committer | Rémi Cardona <remi@gentoo.org> | 2013-11-04 21:18:00 +0000 |
commit | 15513a5d39b9aa2795c48dc36d25913e264ee53a (patch) | |
tree | 35f0066ef85c9ff5246bbab57c3229b8eb474eba /x11-drivers/xf86-video-intel | |
parent | Fix libpng dependency (diff) | |
download | gentoo-2-15513a5d39b9aa2795c48dc36d25913e264ee53a.tar.gz gentoo-2-15513a5d39b9aa2795c48dc36d25913e264ee53a.tar.bz2 gentoo-2-15513a5d39b9aa2795c48dc36d25913e264ee53a.zip |
x11-drivers/xf86-video-intel: Add patch to fix RandR segfault, see bug #490414
(Portage version: 2.2.7/cvs/Linux x86_64, unsigned Manifest commit)
Diffstat (limited to 'x11-drivers/xf86-video-intel')
3 files changed, 136 insertions, 1 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/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 +} |