diff -u xserver-xorg-video-nouveau-1.0.17/debian/README.source xserver-xorg-video-nouveau-1.0.17/debian/README.source --- xserver-xorg-video-nouveau-1.0.17/debian/README.source +++ xserver-xorg-video-nouveau-1.0.17/debian/README.source @@ -19,9 +19,9 @@ ------------------------------------ The X Strike Force team maintains X packages in git repositories on -git.debian.org in the pkg-xorg subdirectory. Most upstream packages +salsa.debian.org in the xorg-team subdirectory. Most upstream packages are actually maintained in git repositories as well, so they often -just need to be pulled into git.debian.org in a "upstream-*" branch. +just need to be pulled into salsa.debian.org in a "upstream-*" branch. Otherwise, the upstream sources are manually installed in the Debian git repository. diff -u xserver-xorg-video-nouveau-1.0.17/debian/changelog xserver-xorg-video-nouveau-1.0.17/debian/changelog --- xserver-xorg-video-nouveau-1.0.17/debian/changelog +++ xserver-xorg-video-nouveau-1.0.17/debian/changelog @@ -1,8 +1,19 @@ -xserver-xorg-video-nouveau (1:1.0.17-1build1) impish; urgency=medium +xserver-xorg-video-nouveau (1:1.0.17-2build1) jammy; urgency=high - * No-change rebuild to build packages with zstd compression. + * No change rebuild for ppc64el baseline bump. - -- Matthias Klose Thu, 07 Oct 2021 12:27:14 +0200 + -- Julian Andres Klode Fri, 25 Mar 2022 10:54:33 +0100 + +xserver-xorg-video-nouveau (1:1.0.17-2) unstable; urgency=medium + + * Fix build against xserver 21.1. + * Build against new xserver. + * watch: Update upstream git url. + * Update README.source for salsa. + * Bump policy to 4.6.0. + * control: Drop automake, libtool from build-depends. + + -- Timo Aaltonen Wed, 09 Feb 2022 12:58:49 +0200 xserver-xorg-video-nouveau (1:1.0.17-1) unstable; urgency=medium diff -u xserver-xorg-video-nouveau-1.0.17/debian/control xserver-xorg-video-nouveau-1.0.17/debian/control --- xserver-xorg-video-nouveau-1.0.17/debian/control +++ xserver-xorg-video-nouveau-1.0.17/debian/control @@ -1,20 +1,19 @@ Source: xserver-xorg-video-nouveau Section: x11 Priority: optional -Maintainer: Debian X Strike Force +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian X Strike Force # Uploaders: nobody, volunteers needed! Build-Depends: debhelper-compat (= 13), pkg-config, - xserver-xorg-dev (>= 2:1.9.4), + xserver-xorg-dev (>= 2:21.1), x11proto-dev, libdrm-dev (>= 2.4.60), libudev-dev, - automake, - libtool, xutils-dev, quilt (>= 0.63-8.2~), -Standards-Version: 4.5.1 +Standards-Version: 4.6.0 Rules-Requires-Root: no Homepage: https://nouveau.freedesktop.org/wiki/ Vcs-Git: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-nouveau.git diff -u xserver-xorg-video-nouveau-1.0.17/debian/patches/series xserver-xorg-video-nouveau-1.0.17/debian/patches/series --- xserver-xorg-video-nouveau-1.0.17/debian/patches/series +++ xserver-xorg-video-nouveau-1.0.17/debian/patches/series @@ -1,0 +2 @@ +nouveau-fixup-driver-for-new-X-server-ABI.patch diff -u xserver-xorg-video-nouveau-1.0.17/debian/watch xserver-xorg-video-nouveau-1.0.17/debian/watch --- xserver-xorg-video-nouveau-1.0.17/debian/watch +++ xserver-xorg-video-nouveau-1.0.17/debian/watch @@ -1,4 +1,4 @@ -#git=git://anongit.freedesktop.org/nouveau/xf86-video-nouveau +#git=https://gitlab.freedesktop.org/nouveau/xf86-video-nouveau version=3 opts=pgpsigurlmangle=s/$/.sig/ \ https://xorg.freedesktop.org/releases/individual/driver/ xf86-video-nouveau-(.+)\.tar\.gz only in patch2: unchanged: --- xserver-xorg-video-nouveau-1.0.17.orig/debian/patches/nouveau-fixup-driver-for-new-X-server-ABI.patch +++ xserver-xorg-video-nouveau-1.0.17/debian/patches/nouveau-fixup-driver-for-new-X-server-ABI.patch @@ -0,0 +1,64 @@ +From e80e73ced69b15662103d0fd6837db4ce6c6eb5b Mon Sep 17 00:00:00 2001 +From: Dave Airlie +Date: Mon, 13 Jul 2020 09:20:15 +1000 +Subject: [PATCH] nouveau: fixup driver for new X server ABI + +--- + src/compat-api.h | 4 ++++ + src/nouveau_exa.c | 2 +- + src/nv_driver.c | 6 +++--- + 3 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/src/compat-api.h b/src/compat-api.h +index fde2f4b1..8a1fcf9b 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -102,4 +102,8 @@ + + #endif + ++#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) ++#define secondary_dst slave_dst ++#endif ++ + #endif +diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c +index 55df6f8f..db3b112a 100644 +--- a/src/nouveau_exa.c ++++ b/src/nouveau_exa.c +@@ -157,7 +157,7 @@ nouveau_exa_destroy_pixmap(ScreenPtr pScreen, void *priv) + + #ifdef NOUVEAU_PIXMAP_SHARING + static Bool +-nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void **handle_p) ++nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void **handle_p) + { + struct nouveau_bo *bo = nouveau_pixmap_bo(ppix); + struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix); +diff --git a/src/nv_driver.c b/src/nv_driver.c +index e72a6b65..f9ab4af1 100644 +--- a/src/nv_driver.c ++++ b/src/nv_driver.c +@@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty) + { + RegionRec pixregion; + +- PixmapRegionInit(&pixregion, dirty->slave_dst); ++ PixmapRegionInit(&pixregion, dirty->secondary_dst); + +- DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion); ++ DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion); + #ifdef HAS_DIRTYTRACKING_ROTATION + PixmapSyncDirtyHelper(dirty); + #else + PixmapSyncDirtyHelper(dirty, &pixregion); + #endif + +- DamageRegionProcessPending(&dirty->slave_dst->drawable); ++ DamageRegionProcessPending(&dirty->secondary_dst->drawable); + RegionUninit(&pixregion); + } + +-- +2.34.1 +