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
-
eb116d18
by Timo Aaltonen at 2022-02-09T12:54:53+02:00
-
2ef67168
by Timo Aaltonen at 2022-02-09T12:55:23+02:00
-
b827ae42
by Timo Aaltonen at 2022-02-09T12:56:44+02:00
-
565aef8a
by Timo Aaltonen at 2022-02-09T12:56:52+02:00
-
76435ccc
by Timo Aaltonen at 2022-02-09T12:58:37+02:00
-
d9e0f5c2
by Timo Aaltonen at 2022-02-09T12:59:00+02:00
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:
| ... | ... | @@ -19,9 +19,9 @@ Guide To The X Strike Force Packages |
| 19 | 19 |
------------------------------------
|
| 20 | 20 |
|
| 21 | 21 |
The X Strike Force team maintains X packages in git repositories on
|
| 22 |
-git.debian.org in the pkg-xorg subdirectory. Most upstream packages
|
|
| 22 |
+salsa.debian.org in the xorg-team subdirectory. Most upstream packages
|
|
| 23 | 23 |
are actually maintained in git repositories as well, so they often
|
| 24 |
-just need to be pulled into git.debian.org in a "upstream-*" branch.
|
|
| 24 |
+just need to be pulled into salsa.debian.org in a "upstream-*" branch.
|
|
| 25 | 25 |
Otherwise, the upstream sources are manually installed in the Debian
|
| 26 | 26 |
git repository.
|
| 27 | 27 |
|
| 1 |
+xserver-xorg-video-nouveau (1:1.0.17-2) unstable; urgency=medium
|
|
| 2 |
+ |
|
| 3 |
+ * Fix build against xserver 21.1.
|
|
| 4 |
+ * Build against new xserver.
|
|
| 5 |
+ * watch: Update upstream git url.
|
|
| 6 |
+ * Update README.source for salsa.
|
|
| 7 |
+ * Bump policy to 4.6.0.
|
|
| 8 |
+ * control: Drop automake, libtool from build-depends.
|
|
| 9 |
+ |
|
| 10 |
+ -- Timo Aaltonen <tjaalton@debian.org> Wed, 09 Feb 2022 12:58:49 +0200
|
|
| 11 |
+ |
|
| 1 | 12 |
xserver-xorg-video-nouveau (1:1.0.17-1) unstable; urgency=medium
|
| 2 | 13 |
|
| 3 | 14 |
* Team upload.
|
| ... | ... | @@ -6,15 +6,13 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org> |
| 6 | 6 |
Build-Depends:
|
| 7 | 7 |
debhelper-compat (= 13),
|
| 8 | 8 |
pkg-config,
|
| 9 |
- xserver-xorg-dev (>= 2:1.9.4),
|
|
| 9 |
+ xserver-xorg-dev (>= 2:21.1),
|
|
| 10 | 10 |
x11proto-dev,
|
| 11 | 11 |
libdrm-dev (>= 2.4.60),
|
| 12 | 12 |
libudev-dev,
|
| 13 |
- automake,
|
|
| 14 |
- libtool,
|
|
| 15 | 13 |
xutils-dev,
|
| 16 | 14 |
quilt (>= 0.63-8.2~),
|
| 17 |
-Standards-Version: 4.5.1
|
|
| 15 |
+Standards-Version: 4.6.0
|
|
| 18 | 16 |
Rules-Requires-Root: no
|
| 19 | 17 |
Homepage: https://nouveau.freedesktop.org/wiki/
|
| 20 | 18 |
Vcs-Git: https://salsa.debian.org/xorg-team/driver/xserver-xorg-video-nouveau.git
|
| 1 |
+From e80e73ced69b15662103d0fd6837db4ce6c6eb5b Mon Sep 17 00:00:00 2001
|
|
| 2 |
+From: Dave Airlie <airlied@redhat.com>
|
|
| 3 |
+Date: Mon, 13 Jul 2020 09:20:15 +1000
|
|
| 4 |
+Subject: [PATCH] nouveau: fixup driver for new X server ABI
|
|
| 5 |
+ |
|
| 6 |
+---
|
|
| 7 |
+ src/compat-api.h | 4 ++++
|
|
| 8 |
+ src/nouveau_exa.c | 2 +-
|
|
| 9 |
+ src/nv_driver.c | 6 +++---
|
|
| 10 |
+ 3 files changed, 8 insertions(+), 4 deletions(-)
|
|
| 11 |
+ |
|
| 12 |
+diff --git a/src/compat-api.h b/src/compat-api.h
|
|
| 13 |
+index fde2f4b1..8a1fcf9b 100644
|
|
| 14 |
+--- a/src/compat-api.h
|
|
| 15 |
++++ b/src/compat-api.h
|
|
| 16 |
+@@ -102,4 +102,8 @@
|
|
| 17 |
+
|
|
| 18 |
+ #endif
|
|
| 19 |
+
|
|
| 20 |
++#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2)
|
|
| 21 |
++#define secondary_dst slave_dst
|
|
| 22 |
++#endif
|
|
| 23 |
++
|
|
| 24 |
+ #endif
|
|
| 25 |
+diff --git a/src/nouveau_exa.c b/src/nouveau_exa.c
|
|
| 26 |
+index 55df6f8f..db3b112a 100644
|
|
| 27 |
+--- a/src/nouveau_exa.c
|
|
| 28 |
++++ b/src/nouveau_exa.c
|
|
| 29 |
+@@ -157,7 +157,7 @@ nouveau_exa_destroy_pixmap(ScreenPtr pScreen, void *priv)
|
|
| 30 |
+
|
|
| 31 |
+ #ifdef NOUVEAU_PIXMAP_SHARING
|
|
| 32 |
+ static Bool
|
|
| 33 |
+-nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr slave, void **handle_p)
|
|
| 34 |
++nouveau_exa_share_pixmap_backing(PixmapPtr ppix, ScreenPtr secondary, void **handle_p)
|
|
| 35 |
+ {
|
|
| 36 |
+ struct nouveau_bo *bo = nouveau_pixmap_bo(ppix);
|
|
| 37 |
+ struct nouveau_pixmap *nvpix = nouveau_pixmap(ppix);
|
|
| 38 |
+diff --git a/src/nv_driver.c b/src/nv_driver.c
|
|
| 39 |
+index e72a6b65..f9ab4af1 100644
|
|
| 40 |
+--- a/src/nv_driver.c
|
|
| 41 |
++++ b/src/nv_driver.c
|
|
| 42 |
+@@ -559,16 +559,16 @@ redisplay_dirty(ScreenPtr screen, PixmapDirtyUpdatePtr dirty)
|
|
| 43 |
+ {
|
|
| 44 |
+ RegionRec pixregion;
|
|
| 45 |
+
|
|
| 46 |
+- PixmapRegionInit(&pixregion, dirty->slave_dst);
|
|
| 47 |
++ PixmapRegionInit(&pixregion, dirty->secondary_dst);
|
|
| 48 |
+
|
|
| 49 |
+- DamageRegionAppend(&dirty->slave_dst->drawable, &pixregion);
|
|
| 50 |
++ DamageRegionAppend(&dirty->secondary_dst->drawable, &pixregion);
|
|
| 51 |
+ #ifdef HAS_DIRTYTRACKING_ROTATION
|
|
| 52 |
+ PixmapSyncDirtyHelper(dirty);
|
|
| 53 |
+ #else
|
|
| 54 |
+ PixmapSyncDirtyHelper(dirty, &pixregion);
|
|
| 55 |
+ #endif
|
|
| 56 |
+
|
|
| 57 |
+- DamageRegionProcessPending(&dirty->slave_dst->drawable);
|
|
| 58 |
++ DamageRegionProcessPending(&dirty->secondary_dst->drawable);
|
|
| 59 |
+ RegionUninit(&pixregion);
|
|
| 60 |
+ }
|
|
| 61 |
+
|
|
| 62 |
+--
|
|
| 63 |
+2.34.1
|
|
| 64 |
+ |
| 1 | 1 |
01-set-NV_DRIVER_DATE-from-ChangeLog.diff
|
| 2 |
+nouveau-fixup-driver-for-new-X-server-ABI.patch
|
| 1 |
-#git=git://anongit.freedesktop.org/nouveau/xf86-video-nouveau
|
|
| 1 |
+#git=https://gitlab.freedesktop.org/nouveau/xf86-video-nouveau
|
|
| 2 | 2 |
version=3
|
| 3 | 3 |
opts=pgpsigurlmangle=s/$/.sig/ \
|
| 4 | 4 |
https://xorg.freedesktop.org/releases/individual/driver/ xf86-video-nouveau-(.+)\.tar\.gz
|