rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.41, 1.42 nouveau-bicubic-2x.patch, 1.8, 1.9 nouveau-multiple-xserver.patch, 1.10, 1.11 nouveau-transition-hack.patch, 1.11, 1.12 sources, 1.42, 1.43 xorg-x11-drv-nouveau.spec, 1.51, 1.52

[Ben Skeggs]

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15017

Modified Files:
	.cvsignore nouveau-bicubic-2x.patch 
	nouveau-multiple-xserver.patch nouveau-transition-hack.patch 
	sources xorg-x11-drv-nouveau.spec 
Log Message:
* Fri Aug 21 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-5.20090820git569a17a
- a couple more minor fixes




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- .cvsignore	20 Aug 2009 05:14:49 -0000	1.41
+++ .cvsignore	21 Aug 2009 04:17:36 -0000	1.42
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090820gitfe2b5e6.tar.bz2
+xf86-video-nouveau-0.0.15-20090820git569a17a.tar.bz2

nouveau-bicubic-2x.patch:
 nv30_xv_tex.c |    2 +-
 nv40_xv_tex.c |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

Index: nouveau-bicubic-2x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-bicubic-2x.patch,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- nouveau-bicubic-2x.patch	20 Aug 2009 05:14:49 -0000	1.8
+++ nouveau-bicubic-2x.patch	21 Aug 2009 04:17:36 -0000	1.9
@@ -1,4 +1,4 @@
-From 6c5e207795dd9039d163ff25e3ac4daf78503de5 Mon Sep 17 00:00:00 2001
+From 5d771a98dfdb77dcfff906342d1bb69c5e95ba62 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <skeggsb at beleth.localdomain>
 Date: Mon, 4 May 2009 17:04:34 +1000
 Subject: [PATCH 3/3] xv: only use bicubic filtering when scaling >=2x

nouveau-multiple-xserver.patch:
 nv_driver.c |   85 ++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 57 insertions(+), 28 deletions(-)

Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nouveau-multiple-xserver.patch	20 Aug 2009 05:14:49 -0000	1.10
+++ nouveau-multiple-xserver.patch	21 Aug 2009 04:17:36 -0000	1.11
@@ -1,4 +1,4 @@
-From 5fe2f30825888a714ba5e68af3182b60c40de1f9 Mon Sep 17 00:00:00 2001
+From 50340ef2c1b24e5c10245b980e77552f4baecd06 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Sun, 28 Jun 2009 20:35:54 +1000
 Subject: [PATCH 1/3] f12: hack to support multiple xserver instances
@@ -8,7 +8,7 @@ Subject: [PATCH 1/3] f12: hack to suppor
  1 files changed, 57 insertions(+), 27 deletions(-)
 
 diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 75ec6ab..92a7e2c 100644
+index b8de860..5838ce7 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
 @@ -21,6 +21,7 @@

nouveau-transition-hack.patch:
 drmmode_display.c |  172 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 169 insertions(+), 3 deletions(-)

Index: nouveau-transition-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-transition-hack.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- nouveau-transition-hack.patch	20 Aug 2009 05:14:49 -0000	1.11
+++ nouveau-transition-hack.patch	21 Aug 2009 04:17:36 -0000	1.12
@@ -1,4 +1,4 @@
-From 740c4ee30f4886dd2af36aa25137ad05862a273c Mon Sep 17 00:00:00 2001
+From 01d6d416943706bf0030724cae4481a916807282 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Tue, 30 Jun 2009 10:52:07 +1000
 Subject: [PATCH 2/3] f12: transitions
@@ -8,7 +8,7 @@ Subject: [PATCH 2/3] f12: transitions
  1 files changed, 169 insertions(+), 2 deletions(-)
 
 diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index e7c20a8..27a2e09 100644
+index 9231d93..cdb7689 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
 @@ -183,6 +183,166 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- sources	20 Aug 2009 05:14:49 -0000	1.42
+++ sources	21 Aug 2009 04:17:36 -0000	1.43
@@ -1 +1 @@
-d4c67bb03a03a3c4adf16f732c258f3a  xf86-video-nouveau-0.0.15-20090820gitfe2b5e6.tar.bz2
+22f93b760e83ecc8fc5eae19cd8a799a  xf86-video-nouveau-0.0.15-20090820git569a17a.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- xorg-x11-drv-nouveau.spec	20 Aug 2009 05:14:49 -0000	1.51
+++ xorg-x11-drv-nouveau.spec	21 Aug 2009 04:17:36 -0000	1.52
@@ -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 20090819
-%define git_version fe2b5e6
+%define gitdate 20090820
+%define git_version 569a17a
 
 %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:   4.%{snapshot}%{?dist}
+Release:   5.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -81,7 +81,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
-* Thu Aug 20 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-4.20090810gitfe2b5e6
+* Fri Aug 21 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-5.20090820git569a17a
+- a couple more minor fixes
+
+* Thu Aug 20 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-4.20090819gitfe2b5e6
 - various fixes from upstream, build pending new xorg-x11-server update
 
 * Tue Aug 11 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-3.20090810git85b1c86