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

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	.cvsignore nouveau-bicubic-2x.patch 
	nouveau-multiple-xserver.patch nouveau-transition-hack.patch 
	sources xorg-x11-drv-nouveau.spec 
Log Message:
* Thu Aug 20 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-4.20090810gitfe2b5e6
- various fixes from upstream, build pending new xorg-x11-server update




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- .cvsignore	11 Aug 2009 05:56:20 -0000	1.40
+++ .cvsignore	20 Aug 2009 05:14:49 -0000	1.41
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090810git85b1c86.tar.bz2
+xf86-video-nouveau-0.0.15-20090820gitfe2b5e6.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.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- nouveau-bicubic-2x.patch	11 Aug 2009 05:56:20 -0000	1.7
+++ nouveau-bicubic-2x.patch	20 Aug 2009 05:14:49 -0000	1.8
@@ -1,4 +1,4 @@
-From 58dffb9cb3dc7a59de6f75d585eade46379fe3f0 Mon Sep 17 00:00:00 2001
+From 6c5e207795dd9039d163ff25e3ac4daf78503de5 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.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nouveau-multiple-xserver.patch	11 Aug 2009 05:56:20 -0000	1.9
+++ nouveau-multiple-xserver.patch	20 Aug 2009 05:14:49 -0000	1.10
@@ -1,4 +1,4 @@
-From c0f1f35be5e2060793a2f63bd2da8ffce5300842 Mon Sep 17 00:00:00 2001
+From 5fe2f30825888a714ba5e68af3182b60c40de1f9 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

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.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- nouveau-transition-hack.patch	11 Aug 2009 05:56:21 -0000	1.10
+++ nouveau-transition-hack.patch	20 Aug 2009 05:14:49 -0000	1.11
@@ -1,4 +1,4 @@
-From b6008818340b477344f5e4420c6e95e21ce8c8bd Mon Sep 17 00:00:00 2001
+From 740c4ee30f4886dd2af36aa25137ad05862a273c 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,10 +8,10 @@ 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 3f04be1..2220d04 100644
+index e7c20a8..27a2e09 100644
 --- a/src/drmmode_display.c
 +++ b/src/drmmode_display.c
-@@ -172,6 +172,166 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
+@@ -183,6 +183,166 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
  }
  
  static void
@@ -178,7 +178,7 @@ index 3f04be1..2220d04 100644
  drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
  		int x, int y)
  {
-@@ -184,6 +344,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
+@@ -195,6 +355,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
  	if (!src_id || !dst_id)
  		return;
  
@@ -193,7 +193,7 @@ index 3f04be1..2220d04 100644
  	pspix = drmmode_fb_pixmap(pScrn, src_id, &w, &h);
  	if (!pspix)
  		return;
-@@ -285,8 +453,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -296,8 +464,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
  		x = 0;
  		y = 0;
  	} else


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- sources	11 Aug 2009 05:56:21 -0000	1.41
+++ sources	20 Aug 2009 05:14:49 -0000	1.42
@@ -1 +1 @@
-fb94b12b8909f306d12244cddcd814ac  xf86-video-nouveau-0.0.15-20090810git85b1c86.tar.bz2
+d4c67bb03a03a3c4adf16f732c258f3a  xf86-video-nouveau-0.0.15-20090820gitfe2b5e6.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.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- xorg-x11-drv-nouveau.spec	11 Aug 2009 05:56:21 -0000	1.50
+++ xorg-x11-drv-nouveau.spec	20 Aug 2009 05:14:49 -0000	1.51
@@ -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 20090810
-%define git_version 85b1c86
+%define gitdate 20090819
+%define git_version fe2b5e6
 
 %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:   3.%{snapshot}%{?dist}
+Release:   4.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -31,13 +31,13 @@ Source0:   %{tarfile}
 ExcludeArch: s390 s390x
 
 BuildRequires: libtool automake autoconf
-BuildRequires: xorg-x11-server-devel >= 1.6.99-29
+BuildRequires: xorg-x11-server-devel > 1.6.99-36
 BuildRequires: libdrm-devel >= 2.4.12-0.4
 BuildRequires: mesa-libGL-devel
 BuildRequires: kernel-headers >= 2.6.31
 
 Requires:  hwdata
-Requires:  xorg-x11-server-Xorg >= 1.6.99-29
+Requires:  xorg-x11-server-Xorg > 1.6.99-36
 Requires:  libdrm >= 2.4.12-0.4
 Requires:  kernel-drm-nouveau = 15
 
@@ -81,6 +81,9 @@ 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
+- 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
 - wfb fixes, driver pixmaps enabled by default