rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.15, 1.16 nouveau-fedora.patch, 1.5, 1.6 sources, 1.16, 1.17 xorg-x11-drv-nouveau.spec, 1.21, 1.22

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	.cvsignore nouveau-fedora.patch sources 
	xorg-x11-drv-nouveau.spec 
Log Message:
* Tue Mar 10 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-10.20090310git8f9a580
- upstream update, should fix #455194




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore	9 Mar 2009 04:40:32 -0000	1.15
+++ .cvsignore	10 Mar 2009 04:14:27 -0000	1.16
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090309gited9bd88.tar.bz2
+xf86-video-nouveau-0.0.12-20090310git8f9a580.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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- nouveau-fedora.patch	9 Mar 2009 04:40:33 -0000	1.5
+++ nouveau-fedora.patch	10 Mar 2009 04:14:28 -0000	1.6
@@ -458,7 +458,7 @@
 +	return true;
 +}
 diff --git a/src/nv_bios.c b/src/nv_bios.c
-index 9f4b665..68bc296 100644
+index a290996..22d5c47 100644
 --- a/src/nv_bios.c
 +++ b/src/nv_bios.c
 @@ -22,6 +22,9 @@
@@ -471,7 +471,7 @@
  #include "nv_include.h"
  
  #if defined(__FreeBSD__) || defined(__NetBSD__)
-@@ -4855,7 +4858,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
+@@ -4857,7 +4860,10 @@ uint8_t * nouveau_bios_embedded_edid(ScrnInfoPtr pScrn)
  
  bool NVInitVBIOS(ScrnInfoPtr pScrn)
  {
@@ -482,7 +482,7 @@
  
  	memset(bios, 0, sizeof(struct nvbios));
  
-@@ -4866,6 +4872,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
+@@ -4868,6 +4874,13 @@ bool NVInitVBIOS(ScrnInfoPtr pScrn)
  	if (bios->length > NV_PROM_SIZE)
  		bios->length = NV_PROM_SIZE;
  
@@ -609,10 +609,10 @@
  		return vgaHWSaveScreen(pScreen, mode);
  
 diff --git a/src/nv_proto.h b/src/nv_proto.h
-index 69ef280..e70b256 100644
+index dac8fdb..289c8a2 100644
 --- a/src/nv_proto.h
 +++ b/src/nv_proto.h
-@@ -279,6 +279,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool);
+@@ -281,6 +281,10 @@ void nv50_xv_video_stop(ScrnInfoPtr, pointer, Bool);
  int nv50_xv_port_attribute_set(ScrnInfoPtr, Atom, INT32, pointer);
  int nv50_xv_port_attribute_get(ScrnInfoPtr, Atom, INT32 *, pointer);
  
@@ -624,10 +624,10 @@
  #ifndef exaMoveInPixmap
  extern void exaMoveInPixmap(PixmapPtr pPixmap);
 diff --git a/src/nv_type.h b/src/nv_type.h
-index b8031e3..e67c75a 100644
+index 3130f9e..1c4fd10 100644
 --- a/src/nv_type.h
 +++ b/src/nv_type.h
-@@ -270,6 +270,7 @@ typedef struct _NVRec {
+@@ -272,6 +272,7 @@ typedef struct _NVRec {
      /* Various pinned memory regions */
      struct nouveau_bo * FB;
      void *              FBMap;
@@ -635,7 +635,7 @@
      //struct nouveau_bo * FB_old; /* for KMS */
      struct nouveau_bo * shadow[2]; /* for easy acces by exa */
      struct nouveau_bo * Cursor;
-@@ -278,6 +279,9 @@ typedef struct _NVRec {
+@@ -280,6 +281,9 @@ typedef struct _NVRec {
  
      struct nvbios	VBIOS;
      struct nouveau_bios_info	*vbios;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources	9 Mar 2009 04:40:33 -0000	1.16
+++ sources	10 Mar 2009 04:14:28 -0000	1.17
@@ -1 +1 @@
-d593198e6802afaff49fb1619f949d72  xf86-video-nouveau-0.0.12-20090309gited9bd88.tar.bz2
+f2046675f98da002dd324451fd976863  xf86-video-nouveau-0.0.12-20090310git8f9a580.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.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- xorg-x11-drv-nouveau.spec	9 Mar 2009 04:40:33 -0000	1.21
+++ xorg-x11-drv-nouveau.spec	10 Mar 2009 04:14:28 -0000	1.22
@@ -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 20090309
-%define git_version ed9bd88
+%define gitdate 20090310
+%define git_version 8f9a580
 
 %define snapshot %{gitdate}git%{git_version}
 
@@ -19,7 +19,7 @@
 # need to set an epoch to get version number in sync with upstream
 Epoch:     1
 Version:   %{nouveau_version}
-Release:   9.%{snapshot}%{?dist}
+Release:   10.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -75,6 +75,9 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Tue Mar 10 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-10.20090310git8f9a580
+- upstream update, should fix #455194
+
 * Mon Mar 09 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-9.20090309gited9bd88
 - upstream update, fixes
 - store used vbios image in /var/run, will potentially help debugging later