Fix building against xorg-server-1.14, bug #460754.

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

5 files changed, 49 insertions, 79 deletions

diff --git a/x11-drivers/xf86-video-dummy/ChangeLog b/x11-drivers/xf86-video-dummy/ChangeLog
index 948486e1e840..3f3a38ec314d 100644
--- a/x11-drivers/xf86-video-dummy/ChangeLog
+++ b/x11-drivers/xf86-video-dummy/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-drivers/xf86-video-dummy
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/ChangeLog,v 1.99 2013/02/27 05:41:20 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/ChangeLog,v 1.100 2013/03/08 20:56:28 chithanh Exp $
+
+*xf86-video-dummy-0.3.6-r1 (08 Mar 2013)
+
+  08 Mar 2013; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-dummy-0.3.6-remove-mibstore_h.patch,
+  +xf86-video-dummy-0.3.6-r1.ebuild,
+  -files/xf86-video-dummy-0.3.5-dga-support.patch,
+  -xf86-video-dummy-0.3.4.ebuild, -xf86-video-dummy-0.3.5-r1.ebuild:
+  Fix building against xorg-server-1.14, bug #460754.
 
   27 Feb 2013; Zac Medico <zmedico@gentoo.org> xf86-video-dummy-0.3.6.ebuild:
   Add ~arm-linux keyword.
diff --git a/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.5-dga-support.patch b/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.5-dga-support.patch
deleted file mode 100644
index e4a848e69a95..000000000000
--- a/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.5-dga-support.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 02918fd53434a23a72fe878a90f4ec48ef0e0416 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston <jeremyhu@apple.com>
-Date: Mon, 09 Jan 2012 09:00:40 +0000
-Subject: Don't use XFreeXDGA to determine DGA support
-
-If our server supports DGA and we want to build the dummy driver without it,
-XFreeXDGA will be defined by the server and will be picked up rather than
-our configuration option.  This change forces us to honor our configuration
-hoice.
-
-Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
----
-diff --git a/configure.ac b/configure.ac
-index d92e22a..6861485 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -61,7 +61,7 @@ XORG_DRIVER_CHECK_EXT(XV, videoproto)
- 
- if test "x$DGA" = xyes; then
- 	XORG_DRIVER_CHECK_EXT(XFreeXDGA, xf86dgaproto)
--	AC_DEFINE(XFreeXDGA, 1, [Support DGA extension])
-+	AC_DEFINE(USE_DGA, 1, [Support DGA extension])
- fi
- AC_SUBST([DGA])
- AM_CONDITIONAL([DGA], [test "x$DGA" = xyes])
-diff --git a/src/dummy_driver.c b/src/dummy_driver.c
-index 041ca96..6533b27 100644
---- a/src/dummy_driver.c
-+++ b/src/dummy_driver.c
-@@ -45,7 +45,7 @@
- #include <X11/Xproto.h>
- #include "scrnintstr.h"
- #include "servermd.h"
--#ifdef XFreeXDGA
-+#ifdef USE_DGA
- #define _XF86DGA_SERVER_
- #include <X11/extensions/xf86dgaproto.h>
- #endif
-@@ -592,7 +592,7 @@ DUMMYScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
- 
-     xf86SetBlackWhitePixels(pScreen);
- 
--#ifdef XFreeXDGA
-+#ifdef USE_DGA
-     DUMMYDGAInit(pScreen);
- #endif
-     
---
-cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.6-remove-mibstore_h.patch b/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.6-remove-mibstore_h.patch
new file mode 100644
index 000000000000..4b0b46ef3000
--- /dev/null
+++ b/x11-drivers/xf86-video-dummy/files/xf86-video-dummy-0.3.6-remove-mibstore_h.patch
@@ -0,0 +1,31 @@
+From 44f04fd3046043ed31369025f34353c4e0e5c1cd Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Tue, 25 Sep 2012 12:54:36 +0000
+Subject: Remove mibstore.h
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+---
+diff --git a/src/dummy_driver.c b/src/dummy_driver.c
+index 62066d6..6062c39 100644
+--- a/src/dummy_driver.c
++++ b/src/dummy_driver.c
+@@ -14,9 +14,6 @@
+ /* All drivers initialising the SW cursor need this */
+ #include "mipointer.h"
+ 
+-/* All drivers implementing backing store need this */
+-#include "mibstore.h"
+-
+ /* All drivers using the mi colormap manipulation need this */
+ #include "micmap.h"
+ 
+@@ -617,7 +614,6 @@ DUMMYScreenInit(SCREEN_INIT_ARGS_DECL)
+ 		   , lines - pScrn->virtualY);
+     }
+ 
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+     xf86SetSilkenMouse(pScreen);
+ 	
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.4.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.4.ebuild
deleted file mode 100644
index 8432b014b5dd..000000000000
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.4.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.4.ebuild,v 1.8 2011/02/14 23:56:24 xarthisius Exp $
-
-EAPI=3
-
-inherit xorg-2
-
-DESCRIPTION="X.Org driver for dummy cards"
-
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND=">=x11-base/xorg-server-1.0.99"
-DEPEND="${RDEPEND}
-	x11-proto/fontsproto
-	x11-proto/randrproto
-	x11-proto/renderproto
-	x11-proto/videoproto
-	x11-proto/xf86dgaproto
-	x11-proto/xproto"
diff --git a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5-r1.ebuild b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6-r1.ebuild
index d69b88d05e91..453d952c3220 100644
--- a/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.5-r1.ebuild
+++ b/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# 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-dummy/xf86-video-dummy-0.3.5-r1.ebuild,v 1.8 2012/08/26 19:41:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-dummy/xf86-video-dummy-0.3.6-r1.ebuild,v 1.1 2013/03/08 20:56:28 chithanh Exp $
 
-EAPI=4
+EAPI=5
 inherit xorg-2
 
 DESCRIPTION="X.Org driver for dummy cards"
 
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 IUSE="dga"
 
 RDEPEND=">=x11-base/xorg-server-1.0.99"
@@ -16,13 +16,13 @@ DEPEND="${RDEPEND}
 		x11-proto/xf86dgaproto
 	)"
 
+PATCHES=(
+	"${FILESDIR}"/${P}-remove-mibstore_h.patch
+)
+
 pkg_setup() {
 	XORG_CONFIGURE_OPTIONS=(
 		$(use_enable dga)
 	)
 	xorg-2_pkg_setup
 }
-
-PATCHES=(
-	"${FILESDIR}"/${P}-dga-support.patch
-)