Timo Aaltonen pushed to branch debian-unstable at X Strike Force / driver / xserver-xorg-video-nouveau
Commits: 3a9c7802 by Timo Aaltonen at 2022-02-09T12:54:20+02:00 Fix build against xserver 21.1. - - - - - eb116d18 by Timo Aaltonen at 2022-02-09T12:54:53+02:00 Build against new xserver. - - - - - 2ef67168 by Timo Aaltonen at 2022-02-09T12:55:23+02:00 watch: Update upstream git url. - - - - - b827ae42 by Timo Aaltonen at 2022-02-09T12:56:44+02:00 Update README.source for salsa. - - - - - 565aef8a by Timo Aaltonen at 2022-02-09T12:56:52+02:00 Bump policy to 4.6.0. - - - - - 76435ccc by Timo Aaltonen at 2022-02-09T12:58:37+02:00 control: Drop automake, libtool from build-depends. - - - - - d9e0f5c2 by Timo Aaltonen at 2022-02-09T12:59:00+02:00 release to sid - - - - - 6 changed files: - debian/README.source - debian/changelog - debian/control - + debian/patches/nouveau-fixup-driver-for-new-X-server-ABI.patch - debian/patches/series - debian/watch Changes: ===================================== debian/README.source ===================================== @@ -19,9 +19,9 @@ Guide To The X Strike Force Packages ------------------------------------ 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. ===================================== debian/changelog ===================================== @@ -1,3 +1,14 @@ +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 <[email protected]> Wed, 09 Feb 2022 12:58:49 +0200 + xserver-xorg-video-nouveau (1:1.0.17-1) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -6,15 +6,13 @@ Maintainer: Debian X Strike Force <[email protected]> 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 ===================================== 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 <[email protected]> +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 + ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ 01-set-NV_DRIVER_DATE-from-ChangeLog.diff +nouveau-fixup-driver-for-new-X-server-ABI.patch ===================================== 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 View it on GitLab: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-nouveau/-/compare/4799d4d8bbc987cd0321b6ce088b11262019bbd3...d9e0f5c2fe0e64687165efe08c9c1b3d6a131086 -- View it on GitLab: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-nouveau/-/compare/4799d4d8bbc987cd0321b6ce088b11262019bbd3...d9e0f5c2fe0e64687165efe08c9c1b3d6a131086 You're receiving this email because of your account on salsa.debian.org.
