jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xf86-video-nouveau: rebuild against xorg and add patch

Browse source
This commit is contained in:
dkwo 2021-12-27 19:42:34 +01:00 committed by Leah Neukirchen
parent 52363a5e21
commit 66d8e27be4
2 changed files with 52 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
srcpkgs/xf86-video-nouveau/patches/xorg-server-21.1.patch Normal file
View file

@ -0,0 +1,50 @@
diff --git a/src/compat-api.h b/src/compat-api.h
index fde2f4b1cfde75875c07bfe13524dc6ba2661382..8a1fcf9be1c5d1ceb48a50f2ed533d93ec7ff4c7 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 55df6f8f11c9e14b1891e5c841faef10c17f0a35..db3b112a2db70f8e902e54aa3af99e51e7d0c6f7 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 e72a6b65a81119f12f3608295a4547762a866ad7..f9ab4af19361d99d74f580d1ff3f28d49843e8b0 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);
}

4
srcpkgs/xf86-video-nouveau/template
View file

@ -1,11 +1,11 @@
# Template file for 'xf86-video-nouveau'
pkgname=xf86-video-nouveau
version=1.0.17
revision=1
revision=2
build_style=gnu-configure
hostmakedepends="pkg-config"
makedepends="eudev-libudev-devel libdrm-devel xorg-server-devel"
depends="virtual?xserver-abi-video-24_1 mesa-dri"
depends="virtual?xserver-abi-video-25_1 mesa-dri"
short_desc="Xorg opensource NVIDIA video driver"
maintainer="DragonGhost7 <darkiridiumghost@gmail.com>"
license="MIT"