[xorg-x11-drv-nouveau] pull upstream, dri2 fixes

[Ben Skeggs]

commit b560ca50dba7e6ee216cf23aebbb383c7bd56a30
Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Mon Nov 29 09:27:48 2010 +1000

    pull upstream, dri2 fixes

 .gitignore                      |    1 +
 nouveau-bgnr.patch              |    2 +-
 nouveau-nva3-noaccel-info.patch |    2 +-
 nouveau-zfill-fallback.patch    |    2 +-
 sources                         |    2 +-
 xorg-x11-drv-nouveau.spec       |    9 ++++++---
 6 files changed, 11 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d29c1e8..53325c4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 xf86-video-nouveau-0.0.16-20100615gitdb98ad2.tar.bz2
 /xf86-video-nouveau-0.0.16-20101026git1143e7a.tar.bz2
+/xf86-video-nouveau-0.0.16-20101129gitf29afe6.tar.bz2
diff --git a/nouveau-bgnr.patch b/nouveau-bgnr.patch
index bfd4ab0..3a4574f 100644
--- a/nouveau-bgnr.patch
+++ b/nouveau-bgnr.patch
@@ -1,4 +1,4 @@
-From 6ae64358d0fc2626f7954bd822cce07826f20842 Mon Sep 17 00:00:00 2001
+From aaecead1b3cf067a9f68aed3358fa267f1d9da3c Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Mon, 8 Feb 2010 12:51:47 +1000
 Subject: [PATCH 1/3] set canDoBGNoneRoot
diff --git a/nouveau-nva3-noaccel-info.patch b/nouveau-nva3-noaccel-info.patch
index 31d48fd..dbeb1bd 100644
--- a/nouveau-nva3-noaccel-info.patch
+++ b/nouveau-nva3-noaccel-info.patch
@@ -1,4 +1,4 @@
-From 0dec0303383c76f9f61345af88a81201ec75b41d Mon Sep 17 00:00:00 2001
+From 41cab8bfef181d52ed835438f6b7896d944abf34 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Mon, 11 Oct 2010 10:35:43 +1000
 Subject: [PATCH 3/3] nva3-noaccel-info
diff --git a/nouveau-zfill-fallback.patch b/nouveau-zfill-fallback.patch
index 682420d..c8b8dd4 100644
--- a/nouveau-zfill-fallback.patch
+++ b/nouveau-zfill-fallback.patch
@@ -1,4 +1,4 @@
-From 6858f731fa624004c50bbc9c728a1c127f481d88 Mon Sep 17 00:00:00 2001
+From 4dc97594cf6853fe6949f6644e3a62397e950d13 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Mon, 5 Jul 2010 09:15:25 +1000
 Subject: [PATCH 2/3] zfill framebuffer as fallback if fbcon copy fails
diff --git a/sources b/sources
index bb96228..50ad4a6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4be35d07733be55edd90583bbe15b5ce  xf86-video-nouveau-0.0.16-20101026git1143e7a.tar.bz2
+ff2da7494e4cfca7d831f222f608bb3c  xf86-video-nouveau-0.0.16-20101129gitf29afe6.tar.bz2
diff --git a/xorg-x11-drv-nouveau.spec b/xorg-x11-drv-nouveau.spec
index b57aada..2273821 100644
--- a/xorg-x11-drv-nouveau.spec
+++ b/xorg-x11-drv-nouveau.spec
@@ -7,8 +7,8 @@
 # git clone git://git.freedesktop.org/git/nouveau/xf86-video-nouveau
 # git-archive --format=tar --prefix=xf86-video-nouveau-0.0.10/ %{git_version} | bzip2 > xf86-video-nouveau-0.0.10-%{gitdate}.tar.bz2
 
-%define gitdate 20101026
-%define git_version 1143e7a
+%define gitdate 20101129
+%define git_version f29afe6
 
 %define snapshot %{gitdate}git%{git_version}
 
@@ -19,7 +19,7 @@ Name:      xorg-x11-drv-nouveau
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   11.%{snapshot}%{?dist}
+Release:   12.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -78,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Mon Nov 29 2010 Ben Skeggs <bskeggs at redhat.com> 0.0.16-12
+- fix dri2 issues
+
 * Tue Nov 09 2010 Ben Skeggs <bskeggs at redhat.com> 0.0.16-11
 - pull upstream git snapshot, require newer libdrm