rpms/xorg-x11-drv-nouveau/devel .cvsignore, 1.42, 1.43 nouveau-bicubic-2x.patch, 1.9, 1.10 nouveau-multiple-xserver.patch, 1.11, 1.12 nouveau-transition-hack.patch, 1.12, 1.13 sources, 1.43, 1.44 xorg-x11-drv-nouveau.spec, 1.53, 1.54
Ben Skeggs
bskeggs at fedoraproject.org
Fri Sep 4 00:44:52 UTC 2009
Author: bskeggs
Update of /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv17883
Modified Files:
.cvsignore nouveau-bicubic-2x.patch
nouveau-multiple-xserver.patch nouveau-transition-hack.patch
sources xorg-x11-drv-nouveau.spec
Log Message:
* Fri Sep 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-7.20090904git2b5ec6a
- fix cursor being left enabled on wrong display
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/.cvsignore,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- .cvsignore 21 Aug 2009 04:17:36 -0000 1.42
+++ .cvsignore 4 Sep 2009 00:44:52 -0000 1.43
@@ -1 +1 @@
-xf86-video-nouveau-0.0.15-20090820git569a17a.tar.bz2
+xf86-video-nouveau-0.0.15-20090904git2b5ec6a.tar.bz2
nouveau-bicubic-2x.patch:
nv30_xv_tex.c | 2 +-
nv40_xv_tex.c | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
Index: nouveau-bicubic-2x.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-bicubic-2x.patch,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- nouveau-bicubic-2x.patch 21 Aug 2009 04:17:36 -0000 1.9
+++ nouveau-bicubic-2x.patch 4 Sep 2009 00:44:52 -0000 1.10
@@ -1,4 +1,4 @@
-From 5d771a98dfdb77dcfff906342d1bb69c5e95ba62 Mon Sep 17 00:00:00 2001
+From 669fc0a22b4c2b6b8c9572187e151e426f039227 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <skeggsb at beleth.localdomain>
Date: Mon, 4 May 2009 17:04:34 +1000
Subject: [PATCH 3/3] xv: only use bicubic filtering when scaling >=2x
@@ -35,5 +35,5 @@ index 3d1f146..e0efb41 100644
else
NV40_LoadFragProg(pScrn, &nv30_fp_yv12_bilinear);
--
-1.6.4
+1.6.4.2
nouveau-multiple-xserver.patch:
nv_driver.c | 85 ++++++++++++++++++++++++++++++++++++++++--------------------
1 file changed, 57 insertions(+), 28 deletions(-)
Index: nouveau-multiple-xserver.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-multiple-xserver.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- nouveau-multiple-xserver.patch 21 Aug 2009 04:17:36 -0000 1.11
+++ nouveau-multiple-xserver.patch 4 Sep 2009 00:44:52 -0000 1.12
@@ -1,4 +1,4 @@
-From 50340ef2c1b24e5c10245b980e77552f4baecd06 Mon Sep 17 00:00:00 2001
+From bc70e6309b35633b76c48126bb967d4d85bce4df Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Sun, 28 Jun 2009 20:35:54 +1000
Subject: [PATCH 1/3] f12: hack to support multiple xserver instances
@@ -153,5 +153,5 @@ index b8de860..5838ce7 100644
/* We don't need to allocate cursors / lut here if we're using
* kernel modesetting
--
-1.6.4
+1.6.4.2
nouveau-transition-hack.patch:
drmmode_display.c | 172 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 169 insertions(+), 3 deletions(-)
Index: nouveau-transition-hack.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/nouveau-transition-hack.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- nouveau-transition-hack.patch 21 Aug 2009 04:17:36 -0000 1.12
+++ nouveau-transition-hack.patch 4 Sep 2009 00:44:52 -0000 1.13
@@ -1,4 +1,4 @@
-From 01d6d416943706bf0030724cae4481a916807282 Mon Sep 17 00:00:00 2001
+From bb8bda06e19ac2181fd96a159e6e12ee4f5d108d Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Tue, 30 Jun 2009 10:52:07 +1000
Subject: [PATCH 2/3] f12: transitions
@@ -8,10 +8,10 @@ Subject: [PATCH 2/3] f12: transitions
1 files changed, 169 insertions(+), 2 deletions(-)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 9231d93..cdb7689 100644
+index 55381d3..266d3a6 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
-@@ -183,6 +183,166 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
+@@ -184,6 +184,166 @@ drmmode_fb_pixmap(ScrnInfoPtr pScrn, int id, unsigned *w, unsigned *h)
}
static void
@@ -178,7 +178,7 @@ index 9231d93..cdb7689 100644
drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
int x, int y)
{
-@@ -195,6 +355,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
+@@ -196,6 +356,14 @@ drmmode_fb_copy(ScrnInfoPtr pScrn, drmmode_ptr drmmode, int dst_id, int src_id,
if (!src_id || !dst_id)
return;
@@ -193,7 +193,7 @@ index 9231d93..cdb7689 100644
pspix = drmmode_fb_pixmap(pScrn, src_id, &w, &h);
if (!pspix)
return;
-@@ -296,8 +464,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
+@@ -297,8 +465,7 @@ drmmode_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
x = 0;
y = 0;
} else
@@ -204,5 +204,5 @@ index 9231d93..cdb7689 100644
drmmode_crtc->mode_crtc->buffer_id, x, y);
}
--
-1.6.4
+1.6.4.2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-nouveau/devel/sources,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- sources 21 Aug 2009 04:17:36 -0000 1.43
+++ sources 4 Sep 2009 00:44:52 -0000 1.44
@@ -1 +1 @@
-22f93b760e83ecc8fc5eae19cd8a799a xf86-video-nouveau-0.0.15-20090820git569a17a.tar.bz2
+50b387dd790cf70326dc3f60fd92310e xf86-video-nouveau-0.0.15-20090904git2b5ec6a.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.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- xorg-x11-drv-nouveau.spec 27 Aug 2009 20:58:15 -0000 1.53
+++ xorg-x11-drv-nouveau.spec 4 Sep 2009 00:44:52 -0000 1.54
@@ -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: 6.%{snapshot}%{?dist}
+Release: 7.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -83,6 +83,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/nouveau.4*
%changelog
+* Fri Sep 04 2009 Ben Skeggs <bskeggs at redhat.com> 0.0.15-7.20090904git2b5ec6a
+- fix cursor being left enabled on wrong display
+
* Thu Aug 27 2009 Adam Jackson <ajax at redhat.com> 0.0.15-6.20090820git569a17a
- nouveau-bgnr.patch: Enable seamless plymouth->gdm transition.
More information about the fedora-extras-commits
mailing list