diff --git a/xf86-video-nouveau.spec b/xf86-video-nouveau.spec index b8fd3c7..806cd8e 100644 --- a/xf86-video-nouveau.spec +++ b/xf86-video-nouveau.spec @@ -1,15 +1,14 @@ %define xorg_ver %(pkg-config xorg-server --modversion|cut -d. -f 1-2) Name: xf86-video-nouveau -Version: 1.0.17 -Release: 4mamba +Version: 1.0.18 +Release: 1mamba Summary: X.Org accelerated Open Source video driver for nVidia cards Group: System/X11 Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://www.x.org/wiki/ -Source: https://ftp.x.org/archive/individual/driver/xf86-video-nouveau-%{version}.tar.bz2 -Patch0: xorg-drv-video-nouveau-1.0.17-xorg-server-21.1.3.patch +Source: https://ftp.x.org/archive/individual/driver/xf86-video-nouveau-%{version}.tar.xz License: MIT ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -30,7 +29,6 @@ X.Org accelerated Open Source video driver for nVidia cards. %prep %setup -q -%patch0 -p1 -b .xorg-server-21.1.3 %build %configure @@ -55,6 +53,9 @@ __EOF %{_mandir}/man4/nouveau.4* %changelog +* Tue Nov 19 2024 Silvan Calarco 1.0.18-1mamba +- update to 1.0.18 + * Sun Feb 26 2023 Silvan Calarco 1.0.17-4mamba - source renamed from xorg-drv-video-nouveau; comment noaccel=1 workaround causing problems seen on dual GPU laptops diff --git a/xorg-drv-video-nouveau-1.0.17-xorg-server-21.1.3.patch b/xorg-drv-video-nouveau-1.0.17-xorg-server-21.1.3.patch deleted file mode 100644 index 03d0b80..0000000 --- a/xorg-drv-video-nouveau-1.0.17-xorg-server-21.1.3.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); - } -