update to 1.0.18 [release 1.0.18-1mamba;Tue Nov 19 2024]

This commit is contained in:
Silvan Calarco 2024-11-20 08:52:27 +01:00
parent f1b85db796
commit 5d430c1382
2 changed files with 6 additions and 55 deletions

View File

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

View File

@ -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);
}