[xorg-x11-drv-nouveau] pull upstream
Ben Skeggs
bskeggs at fedoraproject.org
Mon Nov 8 22:32:47 UTC 2010
commit c07990a8a2420ca709da4b6a784b6093366dbf6e
Author: Ben Skeggs <bskeggs at redhat.com>
Date: Tue Nov 9 08:32:06 2010 +1000
pull upstream
.gitignore | 1 +
nouveau-bgnr.patch | 10 +++++-----
nouveau-zfill-fallback.patch | 18 +++++++++---------
sources | 2 +-
xorg-x11-drv-nouveau.spec | 23 ++++++++++++-----------
5 files changed, 28 insertions(+), 26 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f128877..d29c1e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
xf86-video-nouveau-0.0.16-20100615gitdb98ad2.tar.bz2
+/xf86-video-nouveau-0.0.16-20101026git1143e7a.tar.bz2
diff --git a/nouveau-bgnr.patch b/nouveau-bgnr.patch
index 5b03a45..bfd4ab0 100644
--- a/nouveau-bgnr.patch
+++ b/nouveau-bgnr.patch
@@ -1,17 +1,17 @@
-From 4be55bf4d858def31a6ed1bea77d7dbcff79845e Mon Sep 17 00:00:00 2001
+From 6ae64358d0fc2626f7954bd822cce07826f20842 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 1/4] set canDoBGNoneRoot
+Subject: [PATCH 1/3] 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 0abe400..dd60b64 100644
+index f351fac..5ddffcb 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
-@@ -658,6 +658,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -689,6 +689,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
/* Set pScrn->monitor */
pScrn->monitor = pScrn->confScreen->monitor;
@@ -20,5 +20,5 @@ index 0abe400..dd60b64 100644
/*
* The first thing we should figure out is the depth, bpp, etc.
--
-1.7.1
+1.7.3.2
diff --git a/nouveau-zfill-fallback.patch b/nouveau-zfill-fallback.patch
index 5d0ae76..682420d 100644
--- a/nouveau-zfill-fallback.patch
+++ b/nouveau-zfill-fallback.patch
@@ -1,17 +1,17 @@
-From 13ddbe287b7383fc8c4ef91d8748b28e72601637 Mon Sep 17 00:00:00 2001
+From 6858f731fa624004c50bbc9c728a1c127f481d88 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs at redhat.com>
Date: Mon, 5 Jul 2010 09:15:25 +1000
-Subject: [PATCH 4/4] zfill framebuffer as fallback if fbcon copy fails
+Subject: [PATCH 2/3] zfill framebuffer as fallback if fbcon copy fails
---
src/drmmode_display.c | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/drmmode_display.c b/src/drmmode_display.c
-index 31912c6..5986a21 100644
+index c5b57eb..6c95436 100644
--- a/src/drmmode_display.c
+++ b/src/drmmode_display.c
-@@ -178,13 +178,8 @@ drmmode_fbcon_copy(ScreenPtr pScreen)
+@@ -196,13 +196,8 @@ drmmode_fbcon_copy(ScreenPtr pScreen)
unsigned w = pScrn->virtualX, h = pScrn->virtualY;
int i, ret, fbcon_id = 0;
@@ -27,7 +27,7 @@ index 31912c6..5986a21 100644
for (i = 0; i < xf86_config->num_crtc; i++) {
drmmode_crtc_private_ptr drmmode_crtc =
-@@ -195,32 +190,27 @@ drmmode_fbcon_copy(ScreenPtr pScreen)
+@@ -213,32 +208,27 @@ drmmode_fbcon_copy(ScreenPtr pScreen)
}
if (!fbcon_id)
@@ -65,7 +65,7 @@ index 31912c6..5986a21 100644
}
pspix = drmmode_pixmap_wrap(pScreen, fb->width, fb->height,
-@@ -230,7 +220,7 @@ drmmode_fbcon_copy(ScreenPtr pScreen)
+@@ -248,7 +238,7 @@ drmmode_fbcon_copy(ScreenPtr pScreen)
if (!pspix) {
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Failed to create pixmap for fbcon contents\n");
@@ -74,7 +74,7 @@ index 31912c6..5986a21 100644
}
pdpix = drmmode_pixmap_wrap(pScreen, pScrn->virtualX,
-@@ -241,7 +231,7 @@ drmmode_fbcon_copy(ScreenPtr pScreen)
+@@ -260,7 +250,7 @@ drmmode_fbcon_copy(ScreenPtr pScreen)
xf86DrvMsg(pScrn->scrnIndex, X_WARNING,
"Failed to init scanout pixmap for fbcon mirror\n");
pScreen->DestroyPixmap(pspix);
@@ -83,7 +83,7 @@ index 31912c6..5986a21 100644
}
exa->PrepareCopy(pspix, pdpix, 0, 0, GXcopy, ~0);
-@@ -257,6 +247,13 @@ drmmode_fbcon_copy(ScreenPtr pScreen)
+@@ -276,6 +266,13 @@ drmmode_fbcon_copy(ScreenPtr pScreen)
pScreen->DestroyPixmap(pdpix);
pScreen->DestroyPixmap(pspix);
@@ -98,5 +98,5 @@ index 31912c6..5986a21 100644
static Bool
--
-1.7.1
+1.7.3.2
diff --git a/sources b/sources
index cb3b746..bb96228 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4a5e81e82d56d511fc8272d0ea79844e xf86-video-nouveau-0.0.16-20100615gitdb98ad2.tar.bz2
+4be35d07733be55edd90583bbe15b5ce xf86-video-nouveau-0.0.16-20101026git1143e7a.tar.bz2
diff --git a/xorg-x11-drv-nouveau.spec b/xorg-x11-drv-nouveau.spec
index 118aece..b57aada 100644
--- a/xorg-x11-drv-nouveau.spec
+++ b/xorg-x11-drv-nouveau.spec
@@ -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 20100615
-%define git_version db98ad2
+%define gitdate 20101026
+%define git_version 1143e7a
%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: 10.%{snapshot}%{?dist}
+Release: 11.%{snapshot}%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X Hardware Support
@@ -31,21 +31,20 @@ ExcludeArch: s390 s390x
BuildRequires: libtool automake autoconf
BuildRequires: xorg-x11-server-devel > 1.7.99.3-3
-BuildRequires: libdrm-devel >= 2.4.18-0.1
+BuildRequires: libdrm-devel >= 2.4.23-0.1.20101108
BuildRequires: mesa-libGL-devel
BuildRequires: libudev-devel
Requires: hwdata
Requires: Xorg %(xserver-sdk-abi-requires ansic)
Requires: Xorg %(xserver-sdk-abi-requires videodrv)
-Requires: libdrm >= 2.4.18-0.1
+Requires: libdrm >= 2.4.23-0.1.20101108
Requires: kernel-drm-nouveau = 16
Requires: libudev
Patch0: nouveau-bgnr.patch
-Patch1: nouveau-nva0-corruption-fix.patch
-Patch2: nouveau-exa-no-pa_fa.patch
-Patch3: nouveau-zfill-fallback.patch
+Patch1: nouveau-zfill-fallback.patch
+Patch2: nouveau-nva3-noaccel-info.patch
%description
X.Org X11 nouveau video driver.
@@ -54,9 +53,8 @@ X.Org X11 nouveau video driver.
%setup -q -n %{tarball}-%{version}
%patch0 -p1 -b .bgnr
-%patch1 -p1 -b .tile7000
-%patch2 -p1 -b .no_wfb
-%patch3 -p1 -b .zfill
+%patch1 -p1 -b .zfill
+%patch2 -p1 -b .nva3info
%build
autoreconf -v --install
@@ -80,6 +78,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man4/nouveau.4*
%changelog
+* Tue Nov 09 2010 Ben Skeggs <bskeggs at redhat.com> 0.0.16-11
+- pull upstream git snapshot, require newer libdrm
+
* Wed Oct 27 2010 Adam Jackson <ajax at redhat.com> 0.0.16-10
- Add ABI requires magic (#542742)
More information about the scm-commits
mailing list