From 7f32dd28b5c13c2747b27221480db694c99ac838 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Sun, 7 Dec 2025 15:42:38 +0100 Subject: [PATCH] package/x11r7/xdriver_xf86-video-nouveau: bump version to 1.0.18 Release notes: https://lists.x.org/archives/xorg-announce/2024-November/003552.html Removed patch which is included in this release. Switched tarball to xz. Signed-off-by: Bernd Kuhls Signed-off-by: Julien Olivain --- .checkpackageignore | 1 - ...au-fixup-driver-for-new-X-server-ABI.patch | 68 ------------------- .../xdriver_xf86-video-nouveau.hash | 6 +- .../xdriver_xf86-video-nouveau.mk | 4 +- 4 files changed, 5 insertions(+), 74 deletions(-) delete mode 100644 package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch diff --git a/.checkpackageignore b/.checkpackageignore index bb8d5b152f..cae06b629c 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1117,7 +1117,6 @@ package/x11r7/xdriver_xf86-video-imx/0004-Make-video-API-forward-and-backward-co package/x11r7/xdriver_xf86-video-imx/0005-xf86-video-imxfb-fix-m4-hardcodded-paths.patch lib_patch.Upstream package/x11r7/xdriver_xf86-video-imx/0006-xserver-1.14-compat.patch lib_patch.Upstream package/x11r7/xdriver_xf86-video-mach64/0001-cross-compile.patch lib_patch.Upstream -package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch lib_patch.Upstream package/x11r7/xdriver_xf86-video-tdfx/0001-cross.patch lib_patch.Upstream package/x11r7/xserver_xorg-server/0001-include-misc.h-fix-uClibc-build.patch lib_patch.Upstream package/x11r7/xserver_xorg-server/S40xorg Shellcheck lib_sysv.Variables diff --git a/package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch b/package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch deleted file mode 100644 index 96be4909e7..0000000000 --- a/package/x11r7/xdriver_xf86-video-nouveau/0001-nouveau-fixup-driver-for-new-X-server-ABI.patch +++ /dev/null @@ -1,68 +0,0 @@ -From e80e73ced69b15662103d0fd6837db4ce6c6eb5b Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Mon, 13 Jul 2020 09:20:15 +1000 -Subject: [PATCH] nouveau: fixup driver for new X server ABI - -Downloaded from upstream commit -https://gitlab.freedesktop.org/xorg/driver/xf86-video-nouveau/-/commit/e80e73ced69b15662103d0fd6837db4ce6c6eb5b - -Signed-off-by: Bernd Kuhls ---- - src/compat-api.h | 4 ++++ - src/nouveau_exa.c | 2 +- - src/nv_driver.c | 6 +++--- - 3 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/src/compat-api.h b/src/compat-api.h -index fde2f4b..8a1fcf9 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 55df6f8..db3b112 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 e72a6b6..f9ab4af 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); - } - --- -GitLab - diff --git a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash index 336f29be46..0888eaa3a5 100644 --- a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash +++ b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.hash @@ -1,6 +1,6 @@ -# From https://lists.freedesktop.org/archives/nouveau/2021-January/037766.html -sha256 499322e27a55c8183166bf2dd1e47d085eb834143e0d7036baba8427b90c156b xf86-video-nouveau-1.0.17.tar.bz2 -sha512 adba58ba5298d1a5b3f9f8540f9ef2cb2e10e47bba8e374103ec2e1f92e915f5f4393ed0021168cd649646e12315135a1efcdf77e8fb1648e1295914d87279b2 xf86-video-nouveau-1.0.17.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2024-November/003552.html +sha256 e82ad38e64326b733cc5b892d56f6eb63b07e8920f5ebf05864af080b2c32bfd xf86-video-nouveau-1.0.18.tar.xz +sha512 1330fa72f76a6fdc13e7bfa932627091d2735ddb277f6a24d4fefa79fad5f354c6bb661093f26b33770275deca435c3b018f451a6e6254fe35892c59c13e28dc xf86-video-nouveau-1.0.18.tar.xz # Locally computed sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING diff --git a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk index e63bc611bf..47bf682176 100644 --- a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk +++ b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk @@ -4,8 +4,8 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_NOUVEAU_VERSION = 1.0.17 -XDRIVER_XF86_VIDEO_NOUVEAU_SOURCE = xf86-video-nouveau-$(XDRIVER_XF86_VIDEO_NOUVEAU_VERSION).tar.bz2 +XDRIVER_XF86_VIDEO_NOUVEAU_VERSION = 1.0.18 +XDRIVER_XF86_VIDEO_NOUVEAU_SOURCE = xf86-video-nouveau-$(XDRIVER_XF86_VIDEO_NOUVEAU_VERSION).tar.xz XDRIVER_XF86_VIDEO_NOUVEAU_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_NOUVEAU_LICENSE = MIT XDRIVER_XF86_VIDEO_NOUVEAU_LICENSE_FILES = COPYING