debian/changelog | 7 +++++++ debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff | 15 +++++++++++++++ debian/patches/series | 1 + 3 files changed, 23 insertions(+)
New commits: commit 70a3a37650293fed3bced8cf4882ffb1f9b14d9b Author: Sven Joachim <[email protected]> Date: Tue Aug 24 22:17:31 2010 +0200 Restore 04_fix_nouveau_bo_new_tile_segfault.diff There is another code path which does no longer exist upstream, but is restored by 03_revert_abi_change.diff. diff --git a/debian/changelog b/debian/changelog index 9ad2c05..1043796 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libdrm (2.4.21-1~squeeze2) UNRELEASED; urgency=low + + * Restore 04_fix_nouveau_bo_new_tile_segfault.diff, actually only half + applied upstream. + + -- Sven Joachim <[email protected]> Tue, 24 Aug 2010 22:16:07 +0200 + libdrm (2.4.21-1~squeeze1) unstable; urgency=low * Revert nouveau ABI update. diff --git a/debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff b/debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff new file mode 100644 index 0000000..3761552 --- /dev/null +++ b/debian/patches/04_fix_nouveau_bo_new_tile_segfault.diff @@ -0,0 +1,15 @@ +--- + nouveau/nouveau_bo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/nouveau/nouveau_bo.c ++++ b/nouveau/nouveau_bo.c +@@ -205,7 +205,7 @@ + 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; + } + } diff --git a/debian/patches/series b/debian/patches/series index 419cc8b..512df25 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 01_default_perms.diff 02_build_libkms_against_in_tree_drm.diff 03_revert_abi_change.diff +04_fix_nouveau_bo_new_tile_segfault.diff -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
