diff --git a/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch b/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch deleted file mode 100644 index 38ca9afebf..0000000000 --- a/package/x11r7/xdriver_xf86-video-trident/0001-Remove-ramdac.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 07a5c4732f1c28ffcb873ee04500e3cb813c50b4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 7 Dec 2021 22:28:04 +0100 -Subject: [PATCH] Remove ramdac - -ramdac drivers have been removed from xserver since version 21.0.99.1 -and -https://gitlab.freedesktop.org/xorg/xserver/-/commit/f0385fb420158ac3bc1c4c325431ffc5c62344bb -resulting in the following build failure: - -In file included from trident_bank.c:37: -trident.h:41:10: fatal error: xf86RamDac.h: No such file or directory - 41 | #include "xf86RamDac.h" - | ^~~~~~~~~~~~~~ - -Fixes: - - http://autobuild.buildroot.org/results/c81ac8075af257e8626d9d097270be7a7b4a1496 - -Signed-off-by: Fabrice Fontaine -[Upstream status: -https://gitlab.freedesktop.org/xorg/driver/xf86-video-trident/-/merge_requests/1] ---- - src/trident.h | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/trident.h b/src/trident.h -index 5cadf52..c82de4c 100644 ---- a/src/trident.h -+++ b/src/trident.h -@@ -38,7 +38,6 @@ - #include "xaa.h" - #endif - #include "xf86fbman.h" --#include "xf86RamDac.h" - #include "compiler.h" - #include "vgaHW.h" - #include "xf86i2c.h" -@@ -103,7 +102,6 @@ typedef struct { - int useEXA; - int Chipset; - int DACtype; -- int RamDac; - int ChipRev; - int HwBpp; - int BppShift; -@@ -169,7 +167,6 @@ typedef struct { - CARD32 BltScanDirection; - CARD32 DrawFlag; - CARD16 LinePattern; -- RamDacRecPtr RamDacRec; - int CursorOffset; - xf86CursorInfoPtr CursorInfoRec; - xf86Int10InfoPtr Int10; --- -2.33.0 - diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash index 321f35d4f0..2ef664487c 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.hash @@ -1,4 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2017-January/002762.html -sha256 9e5119d974c3e2221994542d35e3a0b3426a441869ddd6dd08a84f324856ac3f xf86-video-trident-1.3.8.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2023-February/003326.html +sha256 7f76219ca7d7dc6061aa3c2aa59bc2a63895b8e6217e413ce315949f57b0189b xf86-video-trident-1.4.0.tar.xz +sha512 86f349ccfcf7c704e77a95882f63ac92f55819a3a00388f294777762fed04dde2197dd6124cded9e787af1982fecc43ad4d0af34307845e616a73d5a2ba750b9 xf86-video-trident-1.4.0.tar.xz # Locally calculated sha256 4f065198c49eac1513b915bc4478152c21119f31a97919a6ea8f3e1d10133d15 COPYING diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk index 20ec4bbc24..53fe150420 100644 --- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk +++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk @@ -4,9 +4,9 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.3.8 -XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver +XDRIVER_XF86_VIDEO_TRIDENT_VERSION = 1.4.0 +XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRIDENT_VERSION).tar.xz +XDRIVER_XF86_VIDEO_TRIDENT_SITE = https://xorg.freedesktop.org/archive/individual/driver XDRIVER_XF86_VIDEO_TRIDENT_LICENSE = MIT XDRIVER_XF86_VIDEO_TRIDENT_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xorgproto