Add patch to build against recent xorg-server. Drop old.

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

6 files changed, 38 insertions, 38 deletions

diff --git a/x11-drivers/xf86-video-modesetting/ChangeLog b/x11-drivers/xf86-video-modesetting/ChangeLog
index 48ddb6a7b2c8..1f95985d8fb8 100644
--- a/x11-drivers/xf86-video-modesetting/ChangeLog
+++ b/x11-drivers/xf86-video-modesetting/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-modesetting
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-modesetting/ChangeLog,v 1.41 2013/10/08 05:06:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-modesetting/ChangeLog,v 1.42 2013/11/28 18:43:14 chithanh Exp $
+
+  28 Nov 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-modesetting-0.8.0-damageunregister.patch,
+  -xf86-video-modesetting-0.5.0.ebuild, -xf86-video-modesetting-0.6.0.ebuild,
+  -xf86-video-modesetting-0.7.0.ebuild, xf86-video-modesetting-0.8.0.ebuild:
+  Add patch to build against recent xorg-server. Drop old.
 
   08 Oct 2013; Agostino Sarubbo <ago@gentoo.org>
   xf86-video-modesetting-0.8.0.ebuild:
diff --git a/x11-drivers/xf86-video-modesetting/files/xf86-video-modesetting-0.8.0-damageunregister.patch b/x11-drivers/xf86-video-modesetting/files/xf86-video-modesetting-0.8.0-damageunregister.patch
new file mode 100644
index 000000000000..b45d9b60f6a0
--- /dev/null
+++ b/x11-drivers/xf86-video-modesetting/files/xf86-video-modesetting-0.8.0-damageunregister.patch
@@ -0,0 +1,26 @@
+From beca4dfb0e4d11d3729214967a1fe56ee5669831 Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp@keithp.com>
+Date: Fri, 15 Nov 2013 04:39:52 +0000
+Subject: Handle new DamageUnregister API which has only one argument
+
+API change in 1.15
+
+Signed-off-by: Keith Packard <keithp@keithp.com>
+---
+diff --git a/src/drmmode_display.h b/src/drmmode_display.h
+index adf4b99..745c484 100644
+--- a/src/drmmode_display.h
++++ b/src/drmmode_display.h
+@@ -37,6 +37,10 @@
+ #define MODESETTING_OUTPUT_SLAVE_SUPPORT 1
+ #endif
+ 
++#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0)
++#define DamageUnregister(d, dd) DamageUnregister(dd)
++#endif
++
+ struct dumb_bo {
+     uint32_t handle;
+     uint32_t size;
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.5.0.ebuild b/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.5.0.ebuild
deleted file mode 100644
index 2e9e379c3c2b..000000000000
--- a/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.5.0.ebuild
+++ /dev/null
@@ -1,12 +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-modesetting/xf86-video-modesetting-0.5.0.ebuild,v 1.11 2013/01/04 17:56:35 jer Exp $
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="Unaccelerated generic driver for kernel modesetting"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.6.0.ebuild b/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.6.0.ebuild
deleted file mode 100644
index 76d840eb4d6c..000000000000
--- a/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.6.0.ebuild
+++ /dev/null
@@ -1,12 +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-modesetting/xf86-video-modesetting-0.6.0.ebuild,v 1.1 2013/01/09 11:14:48 chithanh Exp $
-
-EAPI=4
-
-inherit xorg-2
-
-DESCRIPTION="Unaccelerated generic driver for kernel modesetting"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.7.0.ebuild b/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.7.0.ebuild
deleted file mode 100644
index d1f142bade13..000000000000
--- a/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.7.0.ebuild
+++ /dev/null
@@ -1,12 +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-modesetting/xf86-video-modesetting-0.7.0.ebuild,v 1.1 2013/03/28 13:08:13 chithanh Exp $
-
-EAPI=5
-
-inherit xorg-2
-
-DESCRIPTION="Unaccelerated generic driver for kernel modesetting"
-
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE=""
diff --git a/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.8.0.ebuild b/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.8.0.ebuild
index 364cbc50d179..ed7f1e5837f3 100644
--- a/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.8.0.ebuild
+++ b/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.8.0.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-modesetting/xf86-video-modesetting-0.8.0.ebuild,v 1.10 2013/10/08 05:06:19 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-modesetting/xf86-video-modesetting-0.8.0.ebuild,v 1.11 2013/11/28 18:43:14 chithanh Exp $
 
 EAPI=5
 
@@ -10,3 +10,7 @@ DESCRIPTION="Unaccelerated generic driver for kernel modesetting"
 
 KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
 IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${P}-damageunregister.patch
+)