On 2010-08-24 21:03 +0200, Julien Cristau wrote:
> New commits:
> commit 752295ba101d84b8e3e695621fa41ce9406104e1
> Author: Julien Cristau <jcristau@debian.org>
> Date: Tue Aug 24 19:32:36 2010 +0200
>
> Drop 04_fix_nouveau_bo_new_tile_segfault.diff, applied upstream.
This is actually only half correct.
> diff --git a/debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff b/debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff
> deleted file mode 100644
> index c8cc948..0000000
> --- a/debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff
> +++ /dev/null
> @@ -1,21 +0,0 @@
> -Index: b/nouveau/nouveau_bo.c
> -===================================================================
> ---- a/nouveau/nouveau_bo.c
> -+++ b/nouveau/nouveau_bo.c
> -@@ -198,14 +198,14 @@
> - if (flags & (NOUVEAU_BO_VRAM | NOUVEAU_BO_GART)) {
> - ret = nouveau_bo_kalloc(nvbo, NULL);
> - if (ret) {
> -- nouveau_bo_ref(NULL, (void *)nvbo);
> -+ nouveau_bo_ref(NULL, (void *)&nvbo);
> - return ret;
This hunk has been superseded by the updated 03_revert_abi_change.diff.
> - if (flags & NOUVEAU_BO_PIN) {
> - ret = nouveau_bo_pin((void *)nvbo, nvbo->flags);
> - if (ret) {
> -- nouveau_bo_ref(NULL, (void *)nvbo);
> -+ nouveau_bo_ref(NULL, (void *)&nvbo);
> - return ret;
But that one needs to be restored (this path does not exist upstream
anymore).
BTW, it is now possible to install the experimental
xserver-xorg-video-nouveau together with sid's libdrm-nouveau1. :-/
Cheers,
Sven