rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.33, 1.34 sources, 1.34, 1.35 xorg-x11-drv-nouveau.spec, 1.40, 1.41

[Ben Skeggs]

Author: bskeggs

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

Modified Files:
	.cvsignore sources xorg-x11-drv-nouveau.spec 
Log Message:
* Fri Jun 26 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.14-0.20090625gitc0bf670
- rebase onto latest upstream.  missing some features that were patched into
  F11, they'll come back soon.




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	17 Apr 2009 02:29:59 -0000	1.33
+++ .cvsignore	29 Jun 2009 00:11:59 -0000	1.34
@@ -1 +1 @@
-xf86-video-nouveau-0.0.12-20090417gitfa2f111.tar.bz2
+xf86-video-nouveau-0.0.14-20090625gitc0bf670.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	17 Apr 2009 02:30:00 -0000	1.34
+++ sources	29 Jun 2009 00:11:59 -0000	1.35
@@ -1 +1 @@
-8cc45d924825a949300c873769093ae0  xf86-video-nouveau-0.0.12-20090417gitfa2f111.tar.bz2
+b08879f18187c12d52101b3be964ce52  xf86-video-nouveau-0.0.14-20090625gitc0bf670.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.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- xorg-x11-drv-nouveau.spec	17 Apr 2009 02:30:00 -0000	1.40
+++ xorg-x11-drv-nouveau.spec	29 Jun 2009 00:11:59 -0000	1.41
@@ -1,14 +1,14 @@
 %define tarball xf86-video-nouveau
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir %{moduledir}/drivers
-%define nouveau_version 0.0.12
+%define nouveau_version 0.0.14
 
 # Tarfile created using git
 # 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 20090417
-%define git_version fa2f111
+%define gitdate 20090625
+%define git_version c0bf670
 
 %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:   29.%{snapshot}%{?dist}
+Release:   0.%{snapshot}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -31,23 +31,18 @@ Source0:   %{tarfile}
 ExcludeArch: s390 s390x
 
 BuildRequires: libtool automake autoconf
-BuildRequires: xorg-x11-server-sdk >= 1.3.0.0-6
-BuildRequires: libdrm-devel >= 2.4.4-4
+BuildRequires: xorg-x11-server-devel >= 1.6.99
+BuildRequires: libdrm-devel >= 2.4.12-0.1
 BuildRequires: mesa-libGL-devel
-BuildRequires: kernel-headers >= 2.6.27-0.296
+BuildRequires: kernel-headers >= 2.6.31
 
 Requires:  hwdata
-Requires:  xorg-x11-server-Xorg >= 1.3.0.0-6
-Requires:  libdrm >= 2.4.4-4
-Requires:  kernel-drm-nouveau = 12
-
-Patch0: nouveau-transition-hack.patch
-Patch1: nouveau-store-vbios.patch
-Patch2: nouveau-multiple-xserver.patch
-Patch3: nouveau-nv50-fb-accel.patch
-Patch4: nouveau-nv50-nva0-noaccel.patch
-Patch5: dcbconf_7_4_ignore.diff
-Patch6: nouveau-fb-resize.patch
+Requires:  xorg-x11-server-Xorg >= 1.6.99
+Requires:  libdrm >= 2.4.12-0.1
+Requires:  kernel-drm-nouveau = 14
+
+Patch0: nouveau-store-vbios.patch
+Patch1: dcbconf_7_4_ignore.diff
 
 %description 
 X.Org X11 nouveau video driver.
@@ -55,13 +50,8 @@ X.Org X11 nouveau video driver.
 %prep
 %setup -q -n %{tarball}-%{version}
 
-%patch0 -p1 -b .transition
-%patch1 -p1 -b .vbios
-%patch2 -p1 -b .userswitch
-%patch3 -p1 -b .nv50_fb_render
-%patch4 -p1 -b .nva0_noaccel
-%patch5 -p1 -b .dcbconf
-%patch6 -p1 -b .fbresize
+%patch0 -p1 -b .vbios
+%patch1 -p1 -b .dcbconf
 
 %build
 autoreconf -v --install
@@ -85,6 +75,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man4/nouveau.4*
 
 %changelog
+* Fri Jun 26 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.14-0.20090625gitc0bf670
+- rebase onto latest upstream.  missing some features that were patched into
+  F11, they'll come back soon.
+
 * Fri Apr 17 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.12-29.20090417gitfa2f111
 - avoid post-beta hangs experienced by many people (rh#495764, rh#493222).
   - the bug here was relatively harmless, but exposed a more serious issue