rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.22, 1.23 nouveau-fedora.patch, 1.12, 1.13 sources, 1.23, 1.24 xorg-x11-drv-nouveau.spec, 1.28, 1.29

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	.cvsignore nouveau-fedora.patch sources 
	xorg-x11-drv-nouveau.spec 
Log Message:
* Fri Mar 27 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-17.20090327gitf431e20
- fix partially obscured xv rendering without compmgr (rh#492227,rh#492229,rh#492428)
- fix crash when rotation requested (fdo#20848)
- additional sanity checks for kernel modesetting enabled





Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore	26 Mar 2009 02:00:46 -0000	1.22
+++ .cvsignore	27 Mar 2009 01:59:39 -0000	1.23
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090326git01cee29.tar.bz2
+xf86-video-nouveau-0.0.12-20090327gitf431e20.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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nouveau-fedora.patch	26 Mar 2009 02:00:46 -0000	1.12
+++ nouveau-fedora.patch	27 Mar 2009 01:59:39 -0000	1.13
@@ -536,7 +536,7 @@
  		xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
  			   "[dri] unable to reference front buffer: %d\n", ret);
 diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 220a88e..50c67b9 100644
+index 4f07836..2f6e4a6 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
 @@ -21,6 +21,7 @@
@@ -604,7 +604,7 @@
  	if (!pNv->kms_enable) {
  		if (pNv->Architecture < NV_ARCH_50)
  			NVRestore(pScrn);
-@@ -1582,6 +1603,8 @@ NVMapMemSW(ScrnInfoPtr pScrn)
+@@ -1586,6 +1607,8 @@ NVMapMemSW(ScrnInfoPtr pScrn)
  		return FALSE;
  	pNv->GART = NULL;
  
@@ -613,7 +613,7 @@
  	ret = nouveau_bo_fake(&dev, Cursor0Offset,
  			      NOUVEAU_BO_VRAM | NOUVEAU_BO_PIN,
  			      64 * 64 * 4, pNv->VRAMMap + Cursor0Offset,
-@@ -1622,11 +1645,81 @@ NVMapMemSW(ScrnInfoPtr pScrn)
+@@ -1626,11 +1649,81 @@ NVMapMemSW(ScrnInfoPtr pScrn)
  }
  
  static Bool
@@ -695,7 +695,7 @@
  
  	if (!pNv->dev)
  		return NVMapMemSW(pScrn);
-@@ -1643,45 +1736,42 @@ NVMapMem(ScrnInfoPtr pScrn)
+@@ -1647,45 +1740,42 @@ NVMapMem(ScrnInfoPtr pScrn)
  		size = size * (pScrn->bitsPerPixel >> 3);
  		size = size * pScrn->virtualY;
  	} else {
@@ -764,7 +764,7 @@
  	}
  
  	/* We don't need to allocate cursors / lut here if we're using
-@@ -1755,6 +1845,7 @@ NVUnmapMem(ScrnInfoPtr pScrn)
+@@ -1759,6 +1849,7 @@ NVUnmapMem(ScrnInfoPtr pScrn)
  	}
  
  	nouveau_bo_ref(NULL, &pNv->FB);
@@ -772,7 +772,7 @@
  	nouveau_bo_ref(NULL, &pNv->GART);
  	nouveau_bo_ref(NULL, &pNv->Cursor);
  	nouveau_bo_ref(NULL, &pNv->Cursor2);
-@@ -2270,6 +2361,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode)
+@@ -2274,6 +2365,15 @@ NVSaveScreen(ScreenPtr pScreen, int mode)
  	bool on = xf86IsUnblank(mode);
  	int i;
  


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources	26 Mar 2009 02:00:46 -0000	1.23
+++ sources	27 Mar 2009 01:59:39 -0000	1.24
@@ -1 +1 @@
-f5a3ba21259ea5d436cdfc0acce0c6ee  xf86-video-nouveau-0.0.12-20090326git01cee29.tar.bz2
+449ebd1de8ba71a7a93483e3398fbf9d  xf86-video-nouveau-0.0.12-20090327gitf431e20.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.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- xorg-x11-drv-nouveau.spec	26 Mar 2009 02:00:47 -0000	1.28
+++ xorg-x11-drv-nouveau.spec	27 Mar 2009 01:59:39 -0000	1.29
@@ -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 20090326
-%define git_version 01cee29
+%define gitdate 20090327
+%define git_version f431e20
 
 %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:   16.%{snapshot}%{?dist}
+Release:   17.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License: MIT
 Group:     User Interface/X Hardware Support
@@ -77,6 +77,11 @@
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Fri Mar 27 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-17.20090327gitf431e20
+- fix partially obscured xv rendering without compmgr (rh#492227,rh#492229,rh#492428)
+- fix crash when rotation requested (fdo#20848)
+- additional sanity checks for kernel modesetting enabled
+
 * Thu Mar 26 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-16.20090326git01cee29
 - update, should fix rh#497173