Add patch for bug #454412. Remove old.

(Portage version: 2.1.11.31/cvs/Linux x86_64, unsigned Manifest commit)

7 files changed, 47 insertions, 262 deletions

diff --git a/x11-drivers/xf86-video-intel/ChangeLog b/x11-drivers/xf86-video-intel/ChangeLog
index 2a8966e3abce..f3926f03e45d 100644
--- a/x11-drivers/xf86-video-intel/ChangeLog
+++ b/x11-drivers/xf86-video-intel/ChangeLog
@@ -1,6 +1,16 @@
 # 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.123 2013/01/23 17:06:34 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/ChangeLog,v 1.124 2013/01/31 14:54:31 chithanh Exp $
+
+*xf86-video-intel-2.20.19-r1 (31 Jan 2013)
+
+  31 Jan 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-intel-2.20.19-discard-mappings.patch,
+  +xf86-video-intel-2.20.19-r1.ebuild, -xf86-video-intel-2.20.15.ebuild,
+  -xf86-video-intel-2.20.16.ebuild, -xf86-video-intel-2.20.17.ebuild,
+  -xf86-video-intel-2.20.18.ebuild, -xf86-video-intel-2.20.19.ebuild,
+  xf86-video-intel-2.20.13.ebuild:
+  Add patch for bug #454412. Remove old.
 
 *xf86-video-intel-2.20.19 (23 Jan 2013)
 
diff --git a/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.20.19-discard-mappings.patch b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.20.19-discard-mappings.patch
new file mode 100644
index 000000000000..a37b2e1ffb42
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/xf86-video-intel-2.20.19-discard-mappings.patch
@@ -0,0 +1,31 @@
+From de28027ffc649920268ae6fdd64146f08310e8a4 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Wed, 30 Jan 2013 08:42:48 +0000
+Subject: sna/dri: Make sure we discard the existing mappings when swapping GPU bo
+
+If the GPU bo is currently mapped to the Pixmap, we need to be sure to
+invalidate that mapping if we swap the GPU bo (for SwapBuffers). If we
+forget, we leave a dangling pointer to chase.
+
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=60042
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
+index 15b87dd..e33cd78 100644
+--- a/src/sna/sna_dri.c
++++ b/src/sna/sna_dri.c
+@@ -498,6 +498,12 @@ static void set_bo(PixmapPtr pixmap, struct kgem_bo *bo)
+ 	if (priv->gpu_bo != bo) {
+ 		kgem_bo_destroy(&sna->kgem, priv->gpu_bo);
+ 		priv->gpu_bo = ref(bo);
++		if (priv->mapped) {
++			assert(!priv->shm && priv->stride);
++			pixmap->devPrivate.ptr = PTR(priv->ptr);
++			pixmap->devKind = priv->stride;
++			priv->mapped = false;
++		}
+ 	}
+ 	if (bo->domain != DOMAIN_GPU)
+ 		bo->domain = DOMAIN_NONE;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.15.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.15.ebuild
deleted file mode 100644
index 979c19ed5730..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.15.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.20.15.ebuild,v 1.3 2013/01/02 21:37:45 mattst88 Exp $
-
-EAPI=4
-
-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="|| ( glamor sna 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"
-
-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
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.16.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.16.ebuild
deleted file mode 100644
index 8e068bcc65e5..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.16.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.20.16.ebuild,v 1.3 2013/01/02 21:37:45 mattst88 Exp $
-
-EAPI=4
-
-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="|| ( glamor sna 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"
-
-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
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.17.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.17.ebuild
deleted file mode 100644
index 999ce201960e..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.17.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.20.17.ebuild,v 1.1 2013/01/10 00:26:28 chithanh Exp $
-
-EAPI=4
-
-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="|| ( glamor sna 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"
-
-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
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.18.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.18.ebuild
deleted file mode 100644
index c6a1a6aba8c1..000000000000
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.18.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# 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.20.18.ebuild,v 1.1 2013/01/17 20:08:09 remi Exp $
-
-EAPI=4
-
-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="|| ( glamor sna 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"
-
-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
-}
diff --git a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.19.ebuild b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.19-r1.ebuild
index 7c76e0ec5495..cd90543fe602 100644
--- a/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.19.ebuild
+++ b/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.19-r1.ebuild
@@ -1,6 +1,6 @@
 # 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.20.19.ebuild,v 1.1 2013/01/23 17:06:34 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-intel/xf86-video-intel-2.20.19-r1.ebuild,v 1.1 2013/01/31 14:54:31 chithanh Exp $
 
 EAPI=5
 
@@ -37,6 +37,10 @@ DEPEND="${RDEPEND}
 	>=x11-proto/dri2proto-2.6
 	x11-proto/resourceproto"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-discard-mappings.patch
+)
+
 src_configure() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable dri)