debian/changelog | 3 ++ debian/control | 2 - debian/patches/03_work-around-exa-hangs.patch | 33 -------------------------- debian/patches/series | 1 4 files changed, 4 insertions(+), 35 deletions(-)
New commits: commit 58d1938a1b89050bf96321f80feecb2dc5dce743 Author: Sven Joachim <[email protected]> Date: Wed Mar 16 20:19:20 2011 +0100 Build against Xserver 1.9 by default This makes it easier for sid users to install and test the package. Users of Xserver 1.10 need to build from source for now. diff --git a/debian/changelog b/debian/changelog index fdbda37..6dc3d6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ xserver-xorg-video-nouveau (1:0.0.16+git20110305+92db2bc-1) UNRELEASED; urgency= - Don't mention nv anymore, it has been removed from Debian. * Drop unnecessary leading asterisk from NEWS.Debian. * Drop the sample xorg.conf, no longer needed. + * Build against Xserver 1.9. -- Sven Joachim <[email protected]> Sat, 05 Mar 2011 10:13:42 +0100 diff --git a/debian/control b/debian/control index 9f7bc86..b157e80 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 8), dh-autoreconf, pkg-config, - xserver-xorg-dev (>= 2:1.9.99.903), + xserver-xorg-dev (>= 2:1.9.4), x11proto-video-dev, x11proto-core-dev, x11proto-fonts-dev, commit 4eb679ab856add39e24b8dbf41426d90af56ad8b Author: Sven Joachim <[email protected]> Date: Wed Mar 16 20:18:48 2011 +0100 Drop 03_work-around-exa-hangs.patch It is only needed for some older cards and on Linux kernels before 2.6.36. The latter are not really supported anyway. diff --git a/debian/changelog b/debian/changelog index b7fc431..fdbda37 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ xserver-xorg-video-nouveau (1:0.0.16+git20110305+92db2bc-1) UNRELEASED; urgency= available firmware is required for acceleration, see README.Debian. - Bump build-dependency on libdrm-dev to (>= 2.4.24) due to libdrm-nouveau API changes. + * Drop patch 03_work-around-exa-hangs.patch. Affected users should upgrade + their kernel to 2.6.36 or newer. * Update README.Debian: - Former nvidia-glx users should remove the libgl{1,x}-nvidia-alternatives packages which divert the Mesa/Xorg files in Squeeze and later. diff --git a/debian/patches/03_work-around-exa-hangs.patch b/debian/patches/03_work-around-exa-hangs.patch deleted file mode 100644 index 0c5e7fd..0000000 --- a/debian/patches/03_work-around-exa-hangs.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: Re-add exa hang workaround. - . - This reverts commit 321eb2df5c8b1da4d6469037dd1d8888b508fabd: - . - Revert "nv04-nv40/exa: Match the blob behavior more closely on PrepareCopy." - . - This reverts commit 9de0d97bd2fc2ee8800d48b5340a3d495525ad3e. Unnecessary - after kernel commit "drm/nouveau: Ack the context switch interrupt before - switching contexts.". - . - We do not yet have the named commit in our kernel tree. - - -Index: xserver-xorg-video-nouveau/src/nv04_exa.c -=================================================================== ---- xserver-xorg-video-nouveau.orig/src/nv04_exa.c 2010-08-05 15:03:35.247880586 +1000 -+++ xserver-xorg-video-nouveau/src/nv04_exa.c 2010-08-05 15:04:17.969451030 +1000 -@@ -207,11 +207,15 @@ - return FALSE; - } - -+ BEGIN_RING(chan, blit, NV04_IMAGE_BLIT_SURFACE, 1); -+ OUT_RING (chan, pNv->NvContextSurfaces->handle); - BEGIN_RING(chan, blit, NV01_IMAGE_BLIT_OPERATION, 1); - OUT_RING (chan, 1); /* ROP_AND */ - - NV04EXASetROP(pScrn, alu, planemask); - } else { -+ BEGIN_RING(chan, blit, NV04_IMAGE_BLIT_SURFACE, 1); -+ OUT_RING (chan, pNv->NvContextSurfaces->handle); - BEGIN_RING(chan, blit, NV01_IMAGE_BLIT_OPERATION, 1); - OUT_RING (chan, 3); /* SRCCOPY */ - } diff --git a/debian/patches/series b/debian/patches/series index cc5a97a..d6892cf 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 01-set-NV_DRIVER_DATE-from-ChangeLog.diff -03_work-around-exa-hangs.patch -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
