rpms/xorg-x11-drv-nouveau/F-13 .cvsignore, 1.53, 1.54 nouveau-bgnr.patch, 1.5, 1.6 sources, 1.54, 1.55 xorg-x11-drv-nouveau.spec, 1.68, 1.69 nouveau-bicubic-2x.patch, 1.21, NONE

[Ben Skeggs]

Author: bskeggs

Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv3974

Modified Files:
	.cvsignore nouveau-bgnr.patch sources 
	xorg-x11-drv-nouveau.spec 
Removed Files:
	nouveau-bicubic-2x.patch 
Log Message:
* Wed Apr 28 2010 Ben Skeggs <bskeggs at redhat.com> 0.0.16-4.20100423git13c1043
- update from upstream, hotplug uevent support + integrates some patches




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-13/.cvsignore,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- .cvsignore	15 Mar 2010 01:05:15 -0000	1.53
+++ .cvsignore	28 Apr 2010 04:33:14 -0000	1.54
@@ -1 +1 @@
-xf86-video-nouveau-0.0.16-20100305git6b8b157.tar.bz2
+xf86-video-nouveau-0.0.16-20100423git13c1043.tar.bz2

nouveau-bgnr.patch:
 nv_driver.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: nouveau-bgnr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-13/nouveau-bgnr.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- nouveau-bgnr.patch	15 Mar 2010 01:05:15 -0000	1.5
+++ nouveau-bgnr.patch	28 Apr 2010 04:33:14 -0000	1.6
@@ -1,17 +1,17 @@
-From 2d05df9a985801a6e7efcfe576a7faa33d49a866 Mon Sep 17 00:00:00 2001
+From e01ff1ac70ad8094cbad61c309c35a51827a80d0 Mon Sep 17 00:00:00 2001
 From: Ben Skeggs <bskeggs at redhat.com>
 Date: Mon, 8 Feb 2010 12:51:47 +1000
-Subject: [PATCH 2/2] set canDoBGNoneRoot
+Subject: [PATCH] set canDoBGNoneRoot
 
 ---
  src/nv_driver.c |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 
 diff --git a/src/nv_driver.c b/src/nv_driver.c
-index 4b00e3d..ef9e902 100644
+index 795859f..ca2c669 100644
 --- a/src/nv_driver.c
 +++ b/src/nv_driver.c
-@@ -652,6 +652,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -654,6 +654,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
  
  	/* Set pScrn->monitor */
  	pScrn->monitor = pScrn->confScreen->monitor;


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-13/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sources	15 Mar 2010 01:05:15 -0000	1.54
+++ sources	28 Apr 2010 04:33:14 -0000	1.55
@@ -1 +1 @@
-d1591c9d6222cfb7b1e6ae5853f4f2c9  xf86-video-nouveau-0.0.16-20100305git6b8b157.tar.bz2
+3ef42f3179895b5bdd89828834d4279a  xf86-video-nouveau-0.0.16-20100423git13c1043.tar.bz2


Index: xorg-x11-drv-nouveau.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/F-13/xorg-x11-drv-nouveau.spec,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -p -r1.68 -r1.69
--- xorg-x11-drv-nouveau.spec	15 Mar 2010 01:05:15 -0000	1.68
+++ xorg-x11-drv-nouveau.spec	28 Apr 2010 04:33:14 -0000	1.69
@@ -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 20100305
-%define git_version 6b8b157
+%define gitdate 20100423
+%define git_version 13c1043
 
 %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
@@ -34,14 +34,15 @@ BuildRequires: libtool automake autoconf
 BuildRequires: xorg-x11-server-devel > 1.7.99.3-3
 BuildRequires: libdrm-devel >= 2.4.18-0.1
 BuildRequires: mesa-libGL-devel
+BuildRequires: libudev-devel
 
 Requires:  hwdata
 Requires:  xorg-x11-server-Xorg > 1.7.99.3-3
 Requires:  libdrm >= 2.4.18-0.1
 Requires:  kernel-drm-nouveau = 16
+Requires:  libudev-devel
 
-Patch0: nouveau-bicubic-2x.patch
-Patch1: nouveau-bgnr.patch
+Patch0: nouveau-bgnr.patch
 
 %description 
 X.Org X11 nouveau video driver.
@@ -49,12 +50,11 @@ X.Org X11 nouveau video driver.
 %prep
 %setup -q -n %{tarball}-%{version}
 
-%patch0 -p1 -b .bicubic
-%patch1 -p1 -b .bgnr
+%patch0 -p1 -b .bgnr
 
 %build
 autoreconf -v --install
-%configure --disable-static --with-kms=yes
+%configure --disable-static
 
 make
 
@@ -74,6 +74,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Wed Apr 28 2010 Ben Skeggs <bskeggs at redhat.com> 0.0.16-4.20100423git13c1043
+- update from upstream, hotplug uevent support + integrates some patches
+
 * Mon Mar 15 2010 Ben Skeggs <bskeggs at redhat.com> 0.0.16-3.20100305git6b8b157
 - bring into line with upstream, minor fixes
 


--- nouveau-bicubic-2x.patch DELETED ---