diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile index faa6820042a6..14d8c00f3f40 100644 --- a/x11-drivers/xf86-video-nv/Makefile +++ b/x11-drivers/xf86-video-nv/Makefile @@ -1,14 +1,14 @@ PORTNAME= xf86-video-nv -PORTVERSION= 2.1.22 -PORTREVISION= 1 +DISTVERSION= 2.1.24 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org -COMMENT= X.Org nv display driver -WWW= https://www.x.org/ +COMMENT= Minimal NVIDIA video driver for the Xorg X server +WWW= https://gitlab.freedesktop.org/xorg/driver/xf86-video-nv -USES= tar:xz xorg-cat:driver +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/COPYING -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share +USES= tar:xz xorg-cat:driver .include diff --git a/x11-drivers/xf86-video-nv/distinfo b/x11-drivers/xf86-video-nv/distinfo index 87ee797de56c..d61ca42df9f5 100644 --- a/x11-drivers/xf86-video-nv/distinfo +++ b/x11-drivers/xf86-video-nv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1681571410 -SHA256 (xorg/driver/xf86-video-nv-2.1.22.tar.xz) = 6218932db5c389878d853b11b8fbb667c321b65276f55aa6842a56fb1a30d288 -SIZE (xorg/driver/xf86-video-nv-2.1.22.tar.xz) = 354708 +TIMESTAMP = 1785121247 +SHA256 (xorg/driver/xf86-video-nv-2.1.24.tar.xz) = 2fb667de9d10bfa7ecddbb951f93020a2c0e42757b000a3d6f400bd54845df23 +SIZE (xorg/driver/xf86-video-nv-2.1.24.tar.xz) = 365084 diff --git a/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c b/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c deleted file mode 100644 index c0155d99bb5a..000000000000 --- a/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c +++ /dev/null @@ -1,31 +0,0 @@ ---- src/nv_driver.c.orig 2017-01-17 22:41:33 UTC -+++ src/nv_driver.c -@@ -911,6 +911,8 @@ NVPciProbe(DriverPtr drv, int entity, struct pci_devic - NVGetPCIXpressChip(dev) : dev->vendor_id << 16 | dev->device_id; - const char *name = xf86TokenToString(NVKnownChipsets, id); - -+#ifndef __FreeBSD__ -+ /* FreeBSD always has vgapci driver attached. */ - if (pci_device_has_kernel_driver(dev)) { - xf86DrvMsg(0, X_ERROR, - NV_NAME ": The PCI device 0x%x (%s) at %2.2d@%2.2d:%2.2d:%1.1d has a kernel module claiming it.\n", -@@ -919,6 +921,7 @@ NVPciProbe(DriverPtr drv, int entity, struct pci_devic - NV_NAME ": This driver cannot operate until it has been unloaded.\n"); - return FALSE; - } -+#endif - - if(dev->vendor_id == PCI_VENDOR_NVIDIA && !name && - !NVIsSupported(id) && !NVIsG80(id)) { -@@ -1543,7 +1546,11 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) - xf86FreeInt10(pNv->pInt); - return FALSE; - } -+#ifdef __powerpc__ /* XXX probably MI */ -+ vgaHWSetMmioFuncs(VGAHWPTR(pScrn), pNv->IOAddress, 0); -+#else - vgaHWSetStdFuncs(VGAHWPTR(pScrn)); -+#endif - - /* We use a programmable clock */ - pScrn->progClock = TRUE; diff --git a/x11-drivers/xf86-video-nv/pkg-descr b/x11-drivers/xf86-video-nv/pkg-descr index dc87431e87e1..5ebe0c38a855 100644 --- a/x11-drivers/xf86-video-nv/pkg-descr +++ b/x11-drivers/xf86-video-nv/pkg-descr @@ -1 +1,2 @@ -This package contains the X.Org xf86-video-nv driver. +This is the legacy NVIDIA video driver for the Xorg server, for devices +not supported by a kernel driver.