update compat patch

Package-Manager: portage-2.1.13.5
Manifest-Sign-Key: 072AD062

2 files changed, 15 insertions, 368 deletions

diff --git a/x11-drivers/xf86-video-armsoc/Manifest b/x11-drivers/xf86-video-armsoc/Manifest
index f7f58f9..40f8026 100644
--- a/x11-drivers/xf86-video-armsoc/Manifest
+++ b/x11-drivers/xf86-video-armsoc/Manifest
@@ -1,13 +1,13 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX xf86-video-armsoc_compat.patch 12967 SHA256 7c959a226253caca2022bc4dd84ccde6beb5e8dfd21ccc6603d74f10c2b9a817 SHA512 793643a1d91f1a35146e382a20b736a66bad3ed6087e11cf3ee942b62b1444c875d90360622254db8ab981a24cba6d5635b1d55f60888415770b0290c971a5c7 WHIRLPOOL c3158272fdd9dfb8173d9bd5e4a76f1f4112e58ef577d3b87eeff7a904ce3217283c554cd49b0c6472d6ca0a6e21c9e7040d47044f5bdcee1ea97e61bca4200a
+AUX xf86-video-armsoc_compat.patch 1503 SHA256 e4bb1a6389fd886118954854365c239074485fb12c384ac6fd0d91fc5e57a607 SHA512 d5b1148ce69391130a45615e213f3be0db39c5dd8acde90e4374832ce2ed6be927d8dd10d0d70b6ffd30df62d7c56ab484689a91298ef17bf8057b6ff3709330 WHIRLPOOL 50a883674b29e1ef40c5cfeb09f1777014903434918a5cf3d1515e751cb1938dbdef05320248fea2a97233aa3ae990e2472e4d71e574a2d227e276f9481b441a
 EBUILD xf86-video-armsoc-9999.ebuild 657 SHA256 91e0197bb565a928a175697392e09510550616b20b97eebaa8e61f95d4e2d120 SHA512 8e6edeca9ea61405d4bf31f9bf6e8ac633e78d333b6c4dad493bee0238f044a90d6bb60f825d92df5d33f9e1ee6e572436ba2be5d9bf2a00f7526074b5331569 WHIRLPOOL 5d6189e9154cffd0c0e5ba5a7fc8927466c9e8e00e44f2cd0f4c5ca9d0dfe4db0192833d2d6990cd85048402e1073d6348866e4735d6fb94d30316a66423577a
 MISC metadata.xml 272 SHA256 4d007409f67a06f02a0148ea00ef1f0ce92b9025bcce073ec492c6c370476826 SHA512 01e4d83e346f72d1416eacddae22d86446707c2abdc5bd76fd3eca6028891dc43f448844cc4ebfef87bd6a962b8a5e4af7207a0af7927b086dd83021766a4721 WHIRLPOOL f366b39fbe28c1f4c85a4600d6f8d0ddf305a7f58d65c0fddf8be113c1bb9367fdf0f184922b99cd195aab973d42935e38501f907e8daa1b214620022208c874
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlHzpaQACgkQkKaRLQcq0GLMzwCgo/AdJaj+GOlvjhf0F2QyHgfV
-TFQAnRgtRqXTqwxdglNcR9xOD9Xdfgpa
-=a6PF
+iEYEAREIAAYFAlIQ6SUACgkQkKaRLQcq0GJuCwCeJiu/bennGII7uQN6E8L46+9x
+4BUAn1eHuZrhtg6UCuBfhhaqlcVV25pg
+=1NEl
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/xf86-video-armsoc/files/xf86-video-armsoc_compat.patch b/x11-drivers/xf86-video-armsoc/files/xf86-video-armsoc_compat.patch
index 5cdc525..ec294a0 100644
--- a/x11-drivers/xf86-video-armsoc/files/xf86-video-armsoc_compat.patch
+++ b/x11-drivers/xf86-video-armsoc/files/xf86-video-armsoc_compat.patch
@@ -1,111 +1,6 @@
-diff -Nru xf86-video-armsoc-9999.orig/src/compat-api.h xf86-video-armsoc-9999/src/compat-api.h
---- xf86-video-armsoc-9999.orig/src/compat-api.h	1970-01-01 01:00:00.000000000 +0100
-+++ xf86-video-armsoc-9999/src/compat-api.h	2013-03-13 20:24:17.465046225 +0100
-@@ -0,0 +1,101 @@
-+/*
-+ * Copyright 2012 Red Hat, Inc.
-+ *
-+ * Permission is hereby granted, free of charge, to any person obtaining a
-+ * copy of this software and associated documentation files (the "Software"),
-+ * to deal in the Software without restriction, including without limitation
-+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
-+ * and/or sell copies of the Software, and to permit persons to whom the
-+ * Software is furnished to do so, subject to the following conditions:
-+ *
-+ * The above copyright notice and this permission notice (including the next
-+ * paragraph) shall be included in all copies or substantial portions of the
-+ * Software.
-+ *
-+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-+ * DEALINGS IN THE SOFTWARE.
-+ *
-+ * Author: Dave Airlie <airlied@redhat.com>
-+ */
-+
-+/* this file provides API compat between server post 1.13 and pre it,
-+   it should be reused inside as many drivers as possible */
-+#ifndef COMPAT_API_H
-+#define COMPAT_API_H
-+
-+#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
-+#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
-+#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
-+#endif
-+
-+#ifndef XF86_HAS_SCRN_CONV
-+#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
-+#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
-+#endif
-+
-+#ifndef XF86_SCRN_INTERFACE
-+
-+#define SCRN_ARG_TYPE int
-+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
-+
-+#define SCREEN_ARG_TYPE int
-+#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
-+
-+#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
-+
-+#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
-+#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
-+
-+#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
-+#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
-+
-+#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
-+#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
-+
-+#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
-+#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
-+
-+#define FREE_SCREEN_ARGS_DECL int arg, int flags
-+#define FREE_SCREEN_ARGS(x) (x)->scrnIndex, 0
-+
-+#define VT_FUNC_ARGS_DECL int arg, int flags
-+#define VT_FUNC_ARGS(flags) pScrn->scrnIndex, (flags)
-+
-+#define XF86_ENABLEDISABLEFB_ARG(x) ((x)->scrnIndex)
-+#else
-+#define SCRN_ARG_TYPE ScrnInfoPtr
-+#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
-+
-+#define SCREEN_ARG_TYPE ScreenPtr
-+#define SCREEN_PTR(arg1) ScreenPtr pScreen = (arg1)
-+
-+#define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv
-+
-+#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask
-+#define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask
-+
-+#define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen
-+#define CLOSE_SCREEN_ARGS pScreen
-+
-+#define ADJUST_FRAME_ARGS_DECL ScrnInfoPtr arg, int x, int y
-+#define ADJUST_FRAME_ARGS(arg, x, y) arg, x, y
-+
-+#define SWITCH_MODE_ARGS_DECL ScrnInfoPtr arg, DisplayModePtr mode
-+#define SWITCH_MODE_ARGS(arg, m) arg, m
-+
-+#define FREE_SCREEN_ARGS_DECL ScrnInfoPtr arg
-+#define FREE_SCREEN_ARGS(x) (x)
-+
-+#define VT_FUNC_ARGS_DECL ScrnInfoPtr arg
-+#define VT_FUNC_ARGS(flags) pScrn
-+
-+#define XF86_ENABLEDISABLEFB_ARG(x) (x)
-+
-+#endif
-+
-+#endif
-diff -Nru xf86-video-armsoc-9999.orig/src/drmmode_display.c xf86-video-armsoc-9999/src/drmmode_display.c
---- xf86-video-armsoc-9999.orig/src/drmmode_display.c	2013-03-13 20:17:55.875045541 +0100
-+++ xf86-video-armsoc-9999/src/drmmode_display.c	2013-03-13 20:55:19.385046528 +0100
+diff -ru xf86-video-armsoc-9999.orig/src/drmmode_display.c xf86-video-armsoc-9999/src/drmmode_display.c
+--- xf86-video-armsoc-9999.orig/src/drmmode_display.c	2013-08-18 17:14:53.969483312 +0200
++++ xf86-video-armsoc-9999/src/drmmode_display.c	2013-08-18 17:17:55.964483402 +0200
 @@ -59,7 +59,6 @@
  #include "mipointer.h"
  
@@ -114,7 +9,7 @@ diff -Nru xf86-video-armsoc-9999.orig/src/drmmode_display.c xf86-video-armsoc-99
  
  #include "micmap.h"
  
-@@ -1524,7 +1523,6 @@
+@@ -1540,7 +1539,6 @@
  
  	TRACE_ENTER();
  
@@ -122,65 +17,10 @@ diff -Nru xf86-video-armsoc-9999.orig/src/drmmode_display.c xf86-video-armsoc-99
  
  	drmmode = calloc(1, sizeof *drmmode);
  	drmmode->fd = fd;
-@@ -1564,7 +1562,7 @@
- }
- 
- void
--drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y, int flags)
-+drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y)
- {
- 	xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(pScrn);
- 	xf86OutputPtr output = config->output[config->compat_output];
-diff -Nru xf86-video-armsoc-9999.orig/src/omap_driver.c xf86-video-armsoc-9999/src/omap_driver.c
---- xf86-video-armsoc-9999.orig/src/omap_driver.c	2013-03-13 20:17:55.875045541 +0100
-+++ xf86-video-armsoc-9999/src/omap_driver.c	2013-03-13 21:23:07.335047492 +0100
-@@ -37,6 +37,8 @@
- 
- #include "omap_driver.h"
- 
-+#include "compat-api.h"
-+
- 
- Bool omapDebug = 0;
- 
-@@ -47,19 +49,17 @@
- static void OMAPIdentify(int flags);
- static Bool OMAPProbe(DriverPtr drv, int flags);
- static Bool OMAPPreInit(ScrnInfoPtr pScrn, int flags);
--static Bool OMAPScreenInit(int scrnIndex, ScreenPtr pScreen, int argc,
--		char **argv);
-+static Bool OMAPScreenInit(SCREEN_INIT_ARGS_DECL);
- static void OMAPLoadPalette(ScrnInfoPtr pScrn, int numColors, int *indices,
- 		LOCO * colors, VisualPtr pVisual);
--static Bool OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen);
-+static Bool OMAPCloseScreen(CLOSE_SCREEN_ARGS_DECL);
- static Bool OMAPCreateScreenResources(ScreenPtr pScreen);
--static void OMAPBlockHandler(int i, pointer blockData, pointer pTimeout,
--		pointer pReadmask);
--static Bool OMAPSwitchMode(int scrnIndex, DisplayModePtr mode, int flags);
--static void OMAPAdjustFrame(int scrnIndex, int x, int y, int flags);
--static Bool OMAPEnterVT(int scrnIndex, int flags);
--static void OMAPLeaveVT(int scrnIndex, int flags);
--static void OMAPFreeScreen(int scrnIndex, int flags);
-+static void OMAPBlockHandler(BLOCKHANDLER_ARGS_DECL);
-+static Bool OMAPSwitchMode(SWITCH_MODE_ARGS_DECL);
-+static void OMAPAdjustFrame(ADJUST_FRAME_ARGS_DECL);
-+static Bool OMAPEnterVT(VT_FUNC_ARGS_DECL);
-+static void OMAPLeaveVT(VT_FUNC_ARGS_DECL);
-+static void OMAPFreeScreen(FREE_SCREEN_ARGS_DECL);
- 
- 
- 
-@@ -668,7 +668,7 @@
-  * save state, initialize the mode, etc.
-  */
- static Bool
--OMAPScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
-+OMAPScreenInit(SCREEN_INIT_ARGS_DECL)
- {
- 	ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum];
- 	OMAPPtr pOMAP = OMAPPTR(pScrn);
-@@ -762,7 +762,6 @@
+diff -ru xf86-video-armsoc-9999.orig/src/omap_driver.c xf86-video-armsoc-9999/src/omap_driver.c
+--- xf86-video-armsoc-9999.orig/src/omap_driver.c	2013-08-18 17:14:53.969483312 +0200
++++ xf86-video-armsoc-9999/src/omap_driver.c	2013-08-18 17:19:09.919483437 +0200
+@@ -760,7 +760,6 @@
  	OMAPAccelInit(pScreen);
  
  	/* Initialize backing store: */
@@ -188,144 +28,9 @@ diff -Nru xf86-video-armsoc-9999.orig/src/omap_driver.c xf86-video-armsoc-9999/s
  	xf86SetBackingStore(pScreen);
  
  	/* Cause the cursor position to be updated by the mouse signal handler: */
-@@ -786,7 +785,7 @@
- 	/* Take over the virtual terminal from the console, set the desired mode,
- 	 * etc.:
- 	 */
--	if (!OMAPEnterVT(scrnIndex, 0)) {
-+	if (!OMAPEnterVT(VT_FUNC_ARGS(0))) {
- 		ERROR_MSG("OMAPEnterVT() failed!");
- 		goto fail;
- 	}
-@@ -856,9 +855,9 @@
-  * held by pScrn).
-  */
- static Bool
--OMAPCloseScreen(int scrnIndex, ScreenPtr pScreen)
-+OMAPCloseScreen(CLOSE_SCREEN_ARGS_DECL)
- {
--	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- 	OMAPPtr pOMAP = OMAPPTR(pScrn);
- 
- 	TRACE_ENTER();
-@@ -866,12 +865,12 @@
- 	drmmode_screen_fini(pScrn);
- 
- 	if (pScrn->vtSema == TRUE) {
--		OMAPLeaveVT(scrnIndex, 0);
-+		OMAPLeaveVT(VT_FUNC_ARGS(0));
- 	}
- 
- 	if (pOMAP->pOMAPEXA) {
- 		if (pOMAP->pOMAPEXA->CloseScreen) {
--			pOMAP->pOMAPEXA->CloseScreen(scrnIndex, pScreen);
-+			pOMAP->pOMAPEXA->CloseScreen(CLOSE_SCREEN_ARGS);
- 		}
- 	}
- 
-@@ -893,7 +892,7 @@
- 
- 	TRACE_EXIT();
- 
--	return (*pScreen->CloseScreen)(scrnIndex, pScreen);
-+	return (*pScreen->CloseScreen)(CLOSE_SCREEN_ARGS);
- }
- 
- 
-@@ -920,14 +919,14 @@
- 
- 
- static void
--OMAPBlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
-+OMAPBlockHandler(BLOCKHANDLER_ARGS_DECL)
- {
--	ScreenPtr pScreen = screenInfo.screens[i];
--	ScrnInfoPtr pScrn = xf86Screens[i];
-+	SCREEN_PTR(arg);
-+	ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- 	OMAPPtr pOMAP = OMAPPTR(pScrn);
- 
- 	swap(pOMAP, pScreen, BlockHandler);
--	(*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
-+	(*pScreen->BlockHandler) (BLOCKHANDLER_ARGS);
- 	swap(pOMAP, pScreen, BlockHandler);
- 
- 	/* TODO OMAPVideoBlockHandler(), etc.. */
-@@ -940,9 +939,9 @@
-  * Screen.
-  */
- static Bool
--OMAPSwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
-+OMAPSwitchMode(SWITCH_MODE_ARGS_DECL)
- {
--	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+	SCRN_INFO_PTR(arg);
- 	return xf86SetSingleMode(pScrn, mode, RR_Rotate_0);
- }
- 
-@@ -954,10 +953,10 @@
-  * buffer within the "viewport" of the monitor.
-  */
- static void
--OMAPAdjustFrame(int scrnIndex, int x, int y, int flags)
-+OMAPAdjustFrame(ADJUST_FRAME_ARGS_DECL)
- {
--	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
--	drmmode_adjust_frame(pScrn, x, y, flags);
-+	SCRN_INFO_PTR(arg);
-+	drmmode_adjust_frame(pScrn, x, y);
- }
- 
- 
-@@ -969,9 +968,9 @@
-  * HW state as needed by the X server.
-  */
- static Bool
--OMAPEnterVT(int scrnIndex, int flags)
-+OMAPEnterVT(VT_FUNC_ARGS_DECL)
- {
--	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+	SCRN_INFO_PTR(arg);
- 	OMAPPtr pOMAP = OMAPPTR(pScrn);
- 	int i, ret;
- 
-@@ -1005,9 +1004,9 @@
-  * need to restore the console's HW state.
-  */
- static void
--OMAPLeaveVT(int scrnIndex, int flags)
-+OMAPLeaveVT(VT_FUNC_ARGS_DECL)
- {
--	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+	SCRN_INFO_PTR(arg);
- 	OMAPPtr pOMAP = OMAPPTR(pScrn);
- 	int i, ret;
- 
-@@ -1034,9 +1033,9 @@
-  * up-to-and-including an unsuccessful ScreenInit() call.
-  */
- static void
--OMAPFreeScreen(int scrnIndex, int flags)
-+OMAPFreeScreen(FREE_SCREEN_ARGS_DECL)
- {
--	ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
-+	SCRN_INFO_PTR(arg);
- 	OMAPPtr pOMAP = OMAPPTR(pScrn);
- 
- 	TRACE_ENTER();
-@@ -1048,7 +1047,7 @@
- 
- 	if (pOMAP->pOMAPEXA) {
- 		if (pOMAP->pOMAPEXA->FreeScreen) {
--			pOMAP->pOMAPEXA->FreeScreen(scrnIndex, flags);
-+			pOMAP->pOMAPEXA->FreeScreen(FREE_SCREEN_ARGS(pScrn));
- 		}
- 		free(pOMAP->pOMAPEXA);
- 	}
-diff -Nru xf86-video-armsoc-9999.orig/src/omap_driver.h xf86-video-armsoc-9999/src/omap_driver.h
---- xf86-video-armsoc-9999.orig/src/omap_driver.h	2013-03-13 20:17:55.875045541 +0100
-+++ xf86-video-armsoc-9999/src/omap_driver.h	2013-03-13 21:03:22.575046705 +0100
+diff -ru xf86-video-armsoc-9999.orig/src/omap_driver.h xf86-video-armsoc-9999/src/omap_driver.h
+--- xf86-video-armsoc-9999.orig/src/omap_driver.h	2013-08-18 17:14:53.969483312 +0200
++++ xf86-video-armsoc-9999/src/omap_driver.h	2013-08-18 17:16:03.169483346 +0200
 @@ -40,7 +40,6 @@
   * XXX - figure out what can be removed..
   */
@@ -334,61 +39,3 @@ diff -Nru xf86-video-armsoc-9999.orig/src/omap_driver.h xf86-video-armsoc-9999/s
  #include "micmap.h"
  #include "colormapst.h"
  #include "xf86cmap.h"
-@@ -240,7 +239,7 @@
- Bool drmmode_pre_init(ScrnInfoPtr pScrn, int fd, int cpp);
- void drmmode_screen_init(ScrnInfoPtr pScrn);
- void drmmode_screen_fini(ScrnInfoPtr pScrn);
--void drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y, int flags);
-+void drmmode_adjust_frame(ScrnInfoPtr pScrn, int x, int y);
- int drmmode_page_flip(DrawablePtr draw, uint32_t fb_id, void *priv,
- 		int* num_flipped);
- void drmmode_wait_for_event(ScrnInfoPtr pScrn);
-diff -Nru xf86-video-armsoc-9999.orig/src/omap_exa.h xf86-video-armsoc-9999/src/omap_exa.h
---- xf86-video-armsoc-9999.orig/src/omap_exa.h	2013-03-13 20:17:55.875045541 +0100
-+++ xf86-video-armsoc-9999/src/omap_exa.h	2013-03-13 20:41:08.060045938 +0100
-@@ -36,6 +36,7 @@
- #include "omap_drmif_fb.h"
- #include "omap_util.h"
- #include "exa.h"
-+#include "compat-api.h"
- 
- /**
-  * A per-Screen structure used to communicate and coordinate between the OMAP X
-@@ -50,14 +51,14 @@
- 	 * generation to free per-Screen data structures (except those held by
- 	 * pScrn).
- 	 */
--	Bool (*CloseScreen)(int scrnIndex, ScreenPtr pScreen);
-+	Bool (*CloseScreen)(CLOSE_SCREEN_ARGS_DECL);
- 
- 	/**
- 	 * Called by X driver's FreeScreen() function at the end of each server
- 	 * lifetime to free per-ScrnInfoRec data structures, to close any external
- 	 * connections (e.g. with PVR2D, DRM), etc.
- 	 */
--	void (*FreeScreen)(int scrnIndex, int flags);
-+	void (*FreeScreen)(FREE_SCREEN_ARGS_DECL);
- 
- 	/** get formats supported by PutTextureImage() (for dri2 video..) */
- #define MAX_FORMATS 16
-diff -Nru xf86-video-armsoc-9999.orig/src/omap_exa_null.c xf86-video-armsoc-9999/src/omap_exa_null.c
---- xf86-video-armsoc-9999.orig/src/omap_exa_null.c	2013-03-13 20:17:55.875045541 +0100
-+++ xf86-video-armsoc-9999/src/omap_exa_null.c	2013-03-13 20:41:57.880046345 +0100
-@@ -77,7 +77,7 @@
- }
- 
- static Bool
--CloseScreen(int scrnIndex, ScreenPtr pScreen)
-+CloseScreen(CLOSE_SCREEN_ARGS_DECL)
- {
- #if 0 // TODO need to change CloseScreen/FreeScreen ..
- 	exaDriverFini(pScreen);
-@@ -87,7 +87,7 @@
- }
- 
- static void
--FreeScreen(int scrnIndex, int flags)
-+FreeScreen(FREE_SCREEN_ARGS_DECL)
- {
- }
-