rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.28, 1.29 nouveau-fedora.patch, 1.17, 1.18 sources, 1.29, 1.30 xorg-x11-drv-nouveau.spec, 1.34, 1.35

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	.cvsignore nouveau-fedora.patch sources 
	xorg-x11-drv-nouveau.spec 
Log Message:
* Tue Apr 07 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-23.20090407git11451ca
- upstream update: rh#492399, nv50 PROM fixes





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore	3 Apr 2009 16:17:59 -0000	1.28
+++ .cvsignore	7 Apr 2009 08:51:35 -0000	1.29
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090404git836d985.tar.bz2
+xf86-video-nouveau-0.0.12-20090407git11451ca.tar.bz2

nouveau-fedora.patch:

Index: nouveau-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-fedora.patch,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nouveau-fedora.patch	3 Apr 2009 16:17:59 -0000	1.17
+++ nouveau-fedora.patch	7 Apr 2009 08:51:35 -0000	1.18
@@ -485,7 +485,7 @@
 +	return true;
 +}
 diff --git a/src/nv_bios.c b/src/nv_bios.c
-index e5ef11a..735fee0 100644
+index 0679289..1369863 100644
 --- a/src/nv_bios.c
 +++ b/src/nv_bios.c
 @@ -22,6 +22,9 @@
@@ -498,7 +498,7 @@
  #include "nv_include.h"
  
  #if defined(__FreeBSD__) || defined(__NetBSD__)
-@@ -4486,7 +4489,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
+@@ -4492,7 +4495,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
  
  bool NVInitVBIOS(ScrnInfoPtr pScrn)
  {
@@ -509,7 +509,7 @@
  
  	memset(bios, 0, sizeof(struct nvbios));
  
-@@ -4497,6 +4503,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
+@@ -4503,6 +4509,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
  	if (bios->length > NV_PROM_SIZE)
  		bios->length = NV_PROM_SIZE;
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources	3 Apr 2009 16:17:59 -0000	1.29
+++ sources	7 Apr 2009 08:51:35 -0000	1.30
@@ -1 +1 @@
-2b3bc53449226e0f3028afc78c578602  xf86-video-nouveau-0.0.12-20090404git836d985.tar.bz2
+8eab4ec072c5ab7f779e18604a9f0008  xf86-video-nouveau-0.0.12-20090407git11451ca.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.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xorg-x11-drv-nouveau.spec	3 Apr 2009 16:17:59 -0000	1.34
+++ xorg-x11-drv-nouveau.spec	7 Apr 2009 08:51:35 -0000	1.35
@@ -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 20090404
-%define git_version 836d985
+%define gitdate 20090407
+%define git_version 11451ca
 
 %define snapshot %{gitdate}git%{git_version}
 
@@ -77,6 +77,9 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Tue Apr 07 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-23.20090407git11451ca
+- upstream update: rh#492399, nv50 PROM fixes
+
 * Sat Apr 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-22.20090404git836d985
 - use consistent connector names across all modesetting paths
 - rh#493981