From e6c7722754fd7c05b0710adaa8aee38cc0a38c94 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Mon, 2 Jul 2012 13:03:13 +0100
Subject: [PATCH] upstream 0.4.3 release

---
 .gitignore              |  1 +
 BGNoneRoot.patch        | 10 +++++-----
 sources                 |  2 +-
 xorg-x11-drv-fbdev.spec |  7 +++++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index af5231d..4e5e490 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xf86-video-fbdev-0.4.1.tar.bz2
 /xf86-video-fbdev-0.4.2.tar.bz2
+/xf86-video-fbdev-0.4.3.tar.bz2
diff --git a/BGNoneRoot.patch b/BGNoneRoot.patch
index 9989869..4f884bc 100644
--- a/BGNoneRoot.patch
+++ b/BGNoneRoot.patch
@@ -1,12 +1,12 @@
-diff -up xf86-video-fbdev-0.4.1/src/fbdev.c.orig xf86-video-fbdev-0.4.1/src/fbdev.c
---- xf86-video-fbdev-0.4.1/src/fbdev.c.orig	2009-07-28 15:20:10.000000000 +1000
-+++ xf86-video-fbdev-0.4.1/src/fbdev.c	2010-12-02 17:09:09.859998634 +1000
-@@ -680,6 +680,8 @@ FBDevScreenInit(int scrnIndex, ScreenPtr
+diff -up xf86-video-fbdev-0.4.3/src/fbdev.c.dma xf86-video-fbdev-0.4.3/src/fbdev.c
+--- xf86-video-fbdev-0.4.3/src/fbdev.c.dma	2012-07-02 12:46:46.000000000 +0100
++++ xf86-video-fbdev-0.4.3/src/fbdev.c	2012-07-02 13:02:40.545956779 +0100
+@@ -673,6 +673,8 @@ FBDevScreenInit(SCREEN_INIT_ARGS_DECL)
  	       pScrn->offset.red,pScrn->offset.green,pScrn->offset.blue);
  #endif
  
 +	pScreen->canDoBGNoneRoot = 1;
 +
  	if (NULL == (fPtr->fbmem = fbdevHWMapVidmem(pScrn))) {
- 	        xf86DrvMsg(scrnIndex,X_ERROR,"mapping of video memory"
+ 	        xf86DrvMsg(pScrn->scrnIndex,X_ERROR,"mapping of video memory"
  			   " failed\n");
diff --git a/sources b/sources
index 5c7a5d9..945eb5a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-53a533d9e0c2da50962282526bace074  xf86-video-fbdev-0.4.2.tar.bz2
+1d99f1dfb3f0fea077b6b61caa3dc85a  xf86-video-fbdev-0.4.3.tar.bz2
diff --git a/xorg-x11-drv-fbdev.spec b/xorg-x11-drv-fbdev.spec
index 5090a43..f1e2216 100644
--- a/xorg-x11-drv-fbdev.spec
+++ b/xorg-x11-drv-fbdev.spec
@@ -4,8 +4,8 @@
 
 Summary:   Xorg X11 fbdev video driver
 Name:      xorg-x11-drv-fbdev
-Version:   0.4.2
-Release:   9%{?dist}
+Version:   0.4.3
+Release:   1%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -50,6 +50,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/fbdev.4*
 
 %changelog
+* Mon Jul 02 2012 Dave Airlie <airlied@redhat.com> 0.4.3-1
+- upstream 0.4.3 release
+
 * Thu Apr 05 2012 Adam Jackson <ajax@redhat.com> - 0.4.2-9
 - RHEL arch exclude updates