commit 59be9a301298c6733a72047d332cfbd4b0fd117b Author: Danny Rawlins <contact@romster.me> Date: Tue Nov 2 00:17:20 2021 +1100 [notify] xorg-xf86-video-nouveau: fix ABI for new xorg-server diff --git a/xorg-xf86-video-nouveau/.signature b/xorg-xf86-video-nouveau/.signature index 24a907d2..ec6dfd50 100644 --- a/xorg-xf86-video-nouveau/.signature +++ b/xorg-xf86-video-nouveau/.signature @@ -1,5 +1,6 @@ untrusted comment: verify with /etc/ports/xorg.pub -RWTSGWF5Q7TndMHR0Ljz/2/fcrOGs5hcuD9QoHM9CTrcnEALc+ELY2sr49olrwZfx3Dhr5EI+s+nW3e+KCKMiZCxdrSlR4PIQA0= -SHA256 (Pkgfile) = 91740bab84d0db98146c1b2762450f201a2ff9b13a61ea9405b748cec12737ab +RWTSGWF5Q7TndOfg0arvNhnbZnPn1essUTmmtGKwgDKW7I6+CIPDPKTa4A3ASAkvLAne9zF2sgb2zMPqRCVY1L4a+6vl3QBlnAY= +SHA256 (Pkgfile) = 4a2d36bfd3d90cc2053c4b8e18736b7aeee694ab30706a28f80d150059928fe7 SHA256 (.footprint) = 6463445c6696528b8e1888331f58c4f490e2fa38b7d6e2fd0a2ff1d38931617f SHA256 (xf86-video-nouveau-1.0.17.tar.bz2) = 499322e27a55c8183166bf2dd1e47d085eb834143e0d7036baba8427b90c156b +SHA256 (xorg-abi.patch) = 1a24074aa7ae3226100e9fc4d58c911e23f64e32109c0516228b91e303d1d658 diff --git a/xorg-xf86-video-nouveau/Pkgfile b/xorg-xf86-video-nouveau/Pkgfile index fbaa8659..735a9e07 100644 --- a/xorg-xf86-video-nouveau/Pkgfile +++ b/xorg-xf86-video-nouveau/Pkgfile @@ -1,16 +1,21 @@ # Description: Nouveau graphics video driver -# URL: https://nouveau.freedesktop.org/wiki/ -# Maintainer: CRUX Xorg Team, xorg-ports at crux dot nu -# Depends on: xorg-server +# URL: https://nouveau.freedesktop.org/wiki/ +# Maintainer: CRUX Xorg Team, xorg-ports at crux dot nu +# Depends on: xorg-server name=xorg-xf86-video-nouveau version=1.0.17 -release=1 -source=(https://www.x.org/archive/individual/driver/xf86-video-nouveau-$version.tar....) +release=2 +source=(https://www.x.org/archive/individual/driver/xf86-video-nouveau-$version.tar.... + xorg-abi.patch) build() { - cd xf86-video-nouveau-$version - ./configure --prefix=/usr - make - make DESTDIR=$PKG install + cd xf86-video-nouveau-$version + + patch -p1 -i $SRC/xorg-abi.patch + + ./configure --prefix=/usr + + make + make DESTDIR=$PKG install } diff --git a/xorg-xf86-video-nouveau/xorg-abi.patch b/xorg-xf86-video-nouveau/xorg-abi.patch new file mode 100644 index 00000000..03d0b80c --- /dev/null +++ b/xorg-xf86-video-nouveau/xorg-abi.patch @@ -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); + } +