rpms/xorg-x11-drv-nv/devel .cvsignore, 1.32, 1.33 import.log, 1.2, 1.3 nv-save-rom.patch, 1.1, 1.2 nv.xinf, 1.11, 1.12 sources, 1.34, 1.35 xorg-x11-drv-nv.spec, 1.84, 1.85 nv-1.1.1-nv34-tweaks.patch, 1.2, NONE nv-2.1.12-eedid.patch, 1.1, NONE
Adam Jackson
ajax at fedoraproject.org
Tue Apr 7 17:58:12 UTC 2009
Author: ajax
Update of /cvs/pkgs/rpms/xorg-x11-drv-nv/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10074/devel
Modified Files:
.cvsignore import.log nv-save-rom.patch nv.xinf sources
xorg-x11-drv-nv.spec
Removed Files:
nv-1.1.1-nv34-tweaks.patch nv-2.1.12-eedid.patch
Log Message:
nv 2.1.13
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore 28 Aug 2008 19:23:10 -0000 1.32
+++ .cvsignore 7 Apr 2009 17:57:42 -0000 1.33
@@ -1 +1 @@
-xf86-video-nv-2.1.12.tar.bz2
+xf86-video-nv-2.1.13.tar.bz2
Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/import.log,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- import.log 28 Aug 2008 19:23:11 -0000 1.2
+++ import.log 7 Apr 2009 17:57:42 -0000 1.3
@@ -1,2 +1,3 @@
xorg-x11-drv-nv-2_1_11-1_fc10:HEAD:xorg-x11-drv-nv-2.1.11-1.fc10.src.rpm:1219853076
xorg-x11-drv-nv-2_1_12-1_fc10:HEAD:xorg-x11-drv-nv-2.1.12-1.fc10.src.rpm:1219951385
+xorg-x11-drv-nv-2_1_13-1_fc11:HEAD:xorg-x11-drv-nv-2.1.13-1.fc11.src.rpm:1239127039
nv-save-rom.patch:
Index: nv-save-rom.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/nv-save-rom.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nv-save-rom.patch 20 May 2008 18:01:54 -0000 1.1
+++ nv-save-rom.patch 7 Apr 2009 17:57:42 -0000 1.2
@@ -1,15 +1,6 @@
-Only in xf86-video-nv-2.1.8: ChangeLog
-Only in xf86-video-nv-2.1.8.new/compat: Makefile
-Only in xf86-video-nv-2.1.8.new/: config.h
-Only in xf86-video-nv-2.1.8.new/: config.log
-Only in xf86-video-nv-2.1.8.new/: config.status
-Only in xf86-video-nv-2.1.8.new/: libtool
-Only in xf86-video-nv-2.1.8.new/: Makefile
-Only in xf86-video-nv-2.1.8.new/man: Makefile
-Only in xf86-video-nv-2.1.8.new/src: .deps
-diff -ur xf86-video-nv-2.1.8/src/g80_driver.c xf86-video-nv-2.1.8.new/src/g80_driver.c
---- xf86-video-nv-2.1.8/src/g80_driver.c 2008-03-06 20:33:15.000000000 +0000
-+++ xf86-video-nv-2.1.8.new/src/g80_driver.c 2008-05-16 18:41:31.000000000 +0100
+diff -up xf86-video-nv-2.1.13/src/g80_driver.c.save-rom xf86-video-nv-2.1.13/src/g80_driver.c
+--- xf86-video-nv-2.1.13/src/g80_driver.c.save-rom 2008-10-27 17:54:04.000000000 -0400
++++ xf86-video-nv-2.1.13/src/g80_driver.c 2009-04-07 13:50:34.000000000 -0400
@@ -28,6 +28,10 @@
#include <string.h>
@@ -21,15 +12,15 @@
#include <xf86_OSproc.h>
#include <xf86Resources.h>
#include <xf86RandR12.h>
-@@ -203,6 +207,7 @@
+@@ -205,6 +209,7 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
char *s;
CARD32 tmp;
memType BAR1sizeKB;
+ int fd;
- if(flags & PROBE_DETECT) {
- xf86DrvMsg(pScrn->scrnIndex, X_ERROR,
-@@ -429,6 +434,14 @@
+ if(flags & PROBE_DETECT)
+ return TRUE;
+@@ -429,6 +434,14 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
else
pNv->table1 -= 0x10000;
@@ -44,7 +35,7 @@
xf86CrtcConfigInit(pScrn, &randr12_screen_funcs);
xf86CrtcSetSizeRange(pScrn, 320, 200, 8192, 8192);
-@@ -984,6 +997,8 @@
+@@ -984,6 +997,8 @@ G80EnterVT(int scrnIndex, int flags)
ScrnInfoPtr pScrn = xf86Screens[scrnIndex];
G80Ptr pNv = G80PTR(pScrn);
@@ -53,6 +44,3 @@
/* Reinit the hardware */
if(pNv->xaa)
G80InitHW(pScrn);
-Only in xf86-video-nv-2.1.8.new/src: g80_driver.c~
-Only in xf86-video-nv-2.1.8.new/src: Makefile
-Only in xf86-video-nv-2.1.8.new/: stamp-h1
Index: nv.xinf
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/nv.xinf,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nv.xinf 22 Feb 2008 18:54:28 -0000 1.11
+++ nv.xinf 7 Apr 2009 17:57:42 -0000 1.12
@@ -363,6 +363,8 @@
alias pcivideo:v000010DEd0000042Esv*sd*bc*sc*i* nv # g80
alias pcivideo:v000010DEd0000042Fsv*sd*bc*sc*i* nv # g80
+alias pcivideo:v000010DEd0000053*sv*sd*bc*sc*i* nv # 7050
+
# additional g80/g90 magic
alias pcivideo:v000010DEd0000061*sv*sd*bc*sc*i* nv # g80
alias pcivideo:v000010DEd0000062*sv*sd*bc*sc*i* nv # g80
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources 28 Aug 2008 19:23:11 -0000 1.34
+++ sources 7 Apr 2009 17:57:42 -0000 1.35
@@ -1 +1 @@
-42f12a36d7afc26c817e8e8f5c8b7274 xf86-video-nv-2.1.12.tar.bz2
+c3231c8808a11eb4ca066e43e0f1a273 xf86-video-nv-2.1.13.tar.bz2
Index: xorg-x11-drv-nv.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nv/devel/xorg-x11-drv-nv.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -r1.84 -r1.85
--- xorg-x11-drv-nv.spec 27 Feb 2009 19:52:47 -0000 1.84
+++ xorg-x11-drv-nv.spec 7 Apr 2009 17:57:42 -0000 1.85
@@ -4,8 +4,8 @@
Summary: Xorg X11 nv video driver
Name: xorg-x11-drv-nv
-Version: 2.1.12
-Release: 11%{?dist}
+Version: 2.1.13
+Release: 1%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -16,22 +16,18 @@
ExcludeArch: s390 s390x
-# XXX these two are temporary, remove soon.
-BuildRequires: pixman-devel libpciaccess-devel
-BuildRequires: xorg-x11-server-sdk >= 1.4.99.1
+BuildRequires: xorg-x11-server-devel >= 1.6.0
BuildRequires: libdrm-devel >= 2.3.0-7
Requires: hwdata
-Requires: xorg-x11-server-Xorg >= 1.3.0.0-6
+Requires: xorg-x11-server-Xorg >= 1.6.0
-Patch0: nv-1.1.1-nv34-tweaks.patch
Patch4: nv-reserve-fbarea.patch
Patch5: nv-2.1.6-starvation.patch
Patch6: nv-2.1.6-panel-fix.patch
Patch7: nv-save-rom.patch
Patch9: nv-2.1.8-g80-no-doublescan.patch
Patch10: nv-2.1.12-gf7025-gf7050.patch
-Patch11: nv-2.1.12-eedid.patch
%description
X.Org X11 nv video driver.
@@ -39,14 +35,12 @@
%prep
%setup -q -n %{tarball}-%{version}
-%patch0 -p1 -b .nv34-tweak
%patch4 -p1 -b .reserve-fbarea
%patch5 -p1 -b .starve
%patch6 -p1 -b .panel
%patch7 -p1 -b .save-rom
%patch9 -p1 -b .doublescan
%patch10 -p1 -b .nv6x
-%patch11 -p1 -b .eedid
%build
%configure --disable-static
@@ -73,6 +67,10 @@
%{_mandir}/man4/nv.4*
%changelog
+* Tue Apr 07 2009 Adam Jackson <ajax at redhat.com> 2.1.13-1
+- nv 2.1.13
+- nv.xinf: Add 7025/7050.
+
* Fri Feb 27 2009 Adam Jackson <ajax at redhat.com> 2.1.12-11
- nv-2.1.12-eedid.patch: Do E-EDID.
--- nv-1.1.1-nv34-tweaks.patch DELETED ---
--- nv-2.1.12-eedid.patch DELETED ---
More information about the scm-commits
mailing list