[xorg-x11-drv-qxl/f18] fix uxa_xorg_enable_disable_fb_acvess (#844463)

[Alon Levy]

commit 7b91ebd2c5c5199bc9ee213cf6f4c2fc963e02a8
Author: Alon Levy <alevy at redhat.com>
Date:   Sun Aug 26 13:58:41 2012 +0200

    fix uxa_xorg_enable_disable_fb_acvess (#844463)

 ...-argument-type-from-removed-index-API-cha.patch |   44 ++++++++++++++++++++
 xorg-x11-drv-qxl.spec                              |    7 +++-
 2 files changed, 50 insertions(+), 1 deletions(-)
---
diff --git a/0011-uxa-fix-bad-argument-type-from-removed-index-API-cha.patch b/0011-uxa-fix-bad-argument-type-from-removed-index-API-cha.patch
new file mode 100644
index 0000000..701b851
--- /dev/null
+++ b/0011-uxa-fix-bad-argument-type-from-removed-index-API-cha.patch
@@ -0,0 +1,44 @@
+From 5706a3765bead75999f6d0ca0b17fed6c30ad7ef Mon Sep 17 00:00:00 2001
+From: Alon Levy <alevy at redhat.com>
+Date: Wed, 27 Jun 2012 11:06:17 +0300
+Subject: [PATCH] uxa: fix bad argument type from removed index API change
+ (s/SCREEN_ARG_TYPE/SCRN_ARG_TYPE/)
+
+---
+ src/uxa/uxa-priv.h | 2 +-
+ src/uxa/uxa.c      | 5 +++--
+ 2 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/uxa/uxa-priv.h b/src/uxa/uxa-priv.h
+index 7a3c85e..ad83963 100644
+--- a/src/uxa/uxa-priv.h
++++ b/src/uxa/uxa-priv.h
+@@ -111,7 +111,7 @@ typedef struct {
+ 
+ #define UXA_NUM_SOLID_CACHE 16
+ 
+-typedef void (*EnableDisableFBAccessProcPtr) (SCREEN_ARG_TYPE, Bool);
++typedef void (*EnableDisableFBAccessProcPtr) (SCRN_ARG_TYPE, Bool);
+ typedef struct {
+ 	uxa_driver_t *info;
+ 	CreateGCProcPtr SavedCreateGC;
+diff --git a/src/uxa/uxa.c b/src/uxa/uxa.c
+index 8b165a8..5570078 100644
+--- a/src/uxa/uxa.c
++++ b/src/uxa/uxa.c
+@@ -359,9 +359,10 @@ static RegionPtr uxa_bitmap_to_region(PixmapPtr pPix)
+ 	return ret;
+ }
+ 
+-static void uxa_xorg_enable_disable_fb_access(SCREEN_ARG_TYPE arg, Bool enable)
++static void uxa_xorg_enable_disable_fb_access(SCRN_ARG_TYPE arg, Bool enable)
+ {
+-	SCREEN_PTR(arg);
++	SCRN_INFO_PTR(arg);
++	ScreenPtr pScreen = pScrn->pScreen;
+ 	uxa_screen_t *uxa_screen = uxa_get_screen(pScreen);
+ 
+ 	if (!enable && uxa_screen->disableFbCount++ == 0)
+-- 
+1.7.12
+
diff --git a/xorg-x11-drv-qxl.spec b/xorg-x11-drv-qxl.spec
index b86c008..be2e4cd 100644
--- a/xorg-x11-drv-qxl.spec
+++ b/xorg-x11-drv-qxl.spec
@@ -15,7 +15,7 @@ Name:      xorg-x11-drv-qxl
 Version:   0.0.22
 %define tarversion 0.0.17
 
-Release:   4%{?gver}%{?dist}
+Release:   5%{?gver}%{?dist}
 URL:       http://www.x.org
 #Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{tarversion}.tar.bz2
 Source0: %{tarball}-%{gitdate}.tar.bz2
@@ -24,6 +24,7 @@ Patch8:    0008-Add-old-driver-in-as-a-compatibility-layer.patch
 Patch9:    0009-Link-in-the-compat-driver-various-renamings.patch
 Patch10:   0001-compat-bump-to-new-server-API-changes.patch
 Patch11:   0010-screen-specific-dix-privates.patch
+Patch12:   0011-uxa-fix-bad-argument-type-from-removed-index-API-cha.patch
 License:   MIT
 Group:     User Interface/X Hardware Support
 
@@ -62,6 +63,7 @@ XSpice is both an X and a Spice server.a
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
 autoreconf -f -i
 
 
@@ -111,6 +113,9 @@ rm $RPM_BUILD_ROOT/usr/share/doc/xf86-video-qxl/spiceqxl.xorg.conf.example
 
 
 %changelog
+* Thu Aug 26 2012 Alon Levy <alevy at redhat.com>
+- fix uxa_xorg_enable_disable_fb_access - 0.0.22-5.20120718gitde6620788 (#844463)
+
 * Thu Aug 23 2012 Alon Levy <alevy at redhat.com>
 - fix break from introduction of screen privates - 0.0.22-4.20120718gitde6620788 (#844463)