[xorg-x11-drv-nouveau] upstream snapshot

[Ben Skeggs]

commit 0901019a184ab857e31b5fa7c50ce54ad30d93fc
Author: Ben Skeggs <bskeggs at redhat.com>
Date:   Thu Jan 6 08:38:16 2011 +1000

    upstream snapshot

 .gitignore                      |    1 +
 nouveau-bgnr.patch              |   32 ------------
 nouveau-dri2-fix.patch          |   29 -----------
 nouveau-nva3-noaccel-info.patch |   10 ++--
 nouveau-zfill-fallback.patch    |  102 ---------------------------------------
 sources                         |    2 +-
 xorg-x11-drv-nouveau.spec       |   17 +++----
 7 files changed, 14 insertions(+), 179 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 53325c4..b01217c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 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
+/xf86-video-nouveau-0.0.16-20101219gitdc89dac.tar.bz2
diff --git a/nouveau-nva3-noaccel-info.patch b/nouveau-nva3-noaccel-info.patch
index dbeb1bd..7bd861b 100644
--- a/nouveau-nva3-noaccel-info.patch
+++ b/nouveau-nva3-noaccel-info.patch
@@ -1,7 +1,7 @@
-From 41cab8bfef181d52ed835438f6b7896d944abf34 Mon Sep 17 00:00:00 2001
+From bcb152a44c19c550315f1253a274d14c177036bb 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
+Subject: [PATCH] nva3-noaccel-info
 
 Add info to logs as to likely reason why acceleration isn't available
 on NVA3+ chipsets.
@@ -10,10 +10,10 @@ on NVA3+ chipsets.
  1 files changed, 15 insertions(+), 0 deletions(-)
 
 diff --git a/src/nv_dma.c b/src/nv_dma.c
-index 409f42c..6585b54 100644
+index 49ed40a..2d837ea 100644
 --- a/src/nv_dma.c
 +++ b/src/nv_dma.c
-@@ -77,6 +77,21 @@ NVInitDma(ScrnInfoPtr pScrn)
+@@ -56,6 +56,21 @@ NVInitDma(ScrnInfoPtr pScrn)
  	if (ret) {
  		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
  			   "Error creating GPU channel: %d\n", ret);
@@ -36,5 +36,5 @@ index 409f42c..6585b54 100644
  	}
  	pNv->chan->user_private = pScrn;
 -- 
-1.7.3.2
+1.7.3.4
 
diff --git a/sources b/sources
index 50ad4a6..15e347c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ff2da7494e4cfca7d831f222f608bb3c  xf86-video-nouveau-0.0.16-20101129gitf29afe6.tar.bz2
+928b153b4dd8d3ac3806f2760dec82d8  xf86-video-nouveau-0.0.16-20101219gitdc89dac.tar.bz2
diff --git a/xorg-x11-drv-nouveau.spec b/xorg-x11-drv-nouveau.spec
index 9f747e3..1ad0a9d 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 20101129
-%define git_version f29afe6
+%define gitdate 20101219
+%define git_version dc89dac
 
 %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:   14.%{snapshot}%{?dist}
+Release:   15.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -31,7 +31,7 @@ ExcludeArch: s390 s390x
 
 BuildRequires: libtool automake autoconf
 BuildRequires: xorg-x11-server-devel > 1.7.99.3-3
-BuildRequires: libdrm-devel >= 2.4.23-0.1.20101108
+BuildRequires: libdrm-devel >= 2.4.24-0.1.20110106
 BuildRequires: mesa-libGL-devel
 BuildRequires: libudev-devel
 
@@ -42,10 +42,7 @@ Requires:  libdrm >= 2.4.23-0.1.20101108
 Requires:  kernel-drm-nouveau = 16
 Requires:  libudev
 
-Patch0: nouveau-bgnr.patch
-Patch1: nouveau-zfill-fallback.patch
 Patch2: nouveau-nva3-noaccel-info.patch
-Patch3: nouveau-dri2-fix.patch
 
 %description 
 X.Org X11 nouveau video driver.
@@ -53,10 +50,7 @@ X.Org X11 nouveau video driver.
 %prep
 %setup -q -n %{tarball}-%{version}
 
-%patch0 -p1 -b .bgnr
-%patch1 -p1 -b .zfill
 %patch2 -p1 -b .nva3info
-%patch3 -p1 -b .bandaid
 
 %build
 autoreconf -v --install
@@ -80,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Thu Jan 06 2011 Ben Skeggs <bskeggs at redhat.com> 0.0.16-15
+- pull upstream git snapshot, drop upstreamed patches
+
 * Wed Dec 01 2010 Peter Hutterer <peter.hutterer at redhat.com>  0.0.16-14
 - Rebuild for X Server 1.10