From bfa690e4c9270dc0469ad47256447584ca7e1814 Mon Sep 17 00:00:00 2001
From: Juergen Daubert <jue@jue.li>
Date: Wed, 26 Jun 2024 14:58:45 +0200
Subject: [PATCH] xorg-xf86-video-nouveau: updated to version 1.0.17-7

---
 xorg-xf86-video-nouveau/.signature     |  7 ++--
 xorg-xf86-video-nouveau/Pkgfile        |  9 ++---
 xorg-xf86-video-nouveau/xorg-abi.patch | 50 --------------------------
 3 files changed, 6 insertions(+), 60 deletions(-)
 delete mode 100644 xorg-xf86-video-nouveau/xorg-abi.patch

diff --git a/xorg-xf86-video-nouveau/.signature b/xorg-xf86-video-nouveau/.signature
index ec6dfd50..19412d1a 100644
--- a/xorg-xf86-video-nouveau/.signature
+++ b/xorg-xf86-video-nouveau/.signature
@@ -1,6 +1,5 @@
 untrusted comment: verify with /etc/ports/xorg.pub
-RWTSGWF5Q7TndOfg0arvNhnbZnPn1essUTmmtGKwgDKW7I6+CIPDPKTa4A3ASAkvLAne9zF2sgb2zMPqRCVY1L4a+6vl3QBlnAY=
-SHA256 (Pkgfile) = 4a2d36bfd3d90cc2053c4b8e18736b7aeee694ab30706a28f80d150059928fe7
+RWTSGWF5Q7TndA0fQBs3/nuLLklVKJgHqMA1HQEbaGYDmvhJagz52Fjf8xBJWoDmYsHYPUjOPcv/hcOqOeSmU2/CbeTCFK+aqAY=
+SHA256 (Pkgfile) = 2d9dcf75c871a03bad63a230fd7353633ce302c65e85e717152a45f48d979d15
 SHA256 (.footprint) = 6463445c6696528b8e1888331f58c4f490e2fa38b7d6e2fd0a2ff1d38931617f
-SHA256 (xf86-video-nouveau-1.0.17.tar.bz2) = 499322e27a55c8183166bf2dd1e47d085eb834143e0d7036baba8427b90c156b
-SHA256 (xorg-abi.patch) = 1a24074aa7ae3226100e9fc4d58c911e23f64e32109c0516228b91e303d1d658
+SHA256 (xf86-video-nouveau-1.0.17-7.tar.xz) = b7ae1b2b45b7db37b8cd43b4875ebdbf5742d164500766914519aa93bb429d4a
diff --git a/xorg-xf86-video-nouveau/Pkgfile b/xorg-xf86-video-nouveau/Pkgfile
index 735a9e07..397bd3e9 100644
--- a/xorg-xf86-video-nouveau/Pkgfile
+++ b/xorg-xf86-video-nouveau/Pkgfile
@@ -4,16 +4,13 @@
 # Depends on: xorg-server
 
 name=xorg-xf86-video-nouveau
-version=1.0.17
-release=2
-source=(https://www.x.org/archive/individual/driver/xf86-video-nouveau-$version.tar.bz2
-	xorg-abi.patch)
+version=1.0.17-7
+release=1
+source=(https://crux.nu/files/distfiles/xf86-video-nouveau-$version.tar.xz)
 
 build() {
 	cd xf86-video-nouveau-$version
 
-	patch -p1 -i $SRC/xorg-abi.patch
-
 	./configure --prefix=/usr
 
 	make
diff --git a/xorg-xf86-video-nouveau/xorg-abi.patch b/xorg-xf86-video-nouveau/xorg-abi.patch
deleted file mode 100644
index 03d0b80c..00000000
--- a/xorg-xf86-video-nouveau/xorg-abi.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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);
- }
-