From nobody Sun Apr 16 08:34:40 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pzk4z1hcNz44v4b; Sun, 16 Apr 2023 08:34:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pzk4w6r6nz4Dw6; Sun, 16 Apr 2023 08:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681634081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZxBy4pEmsDVHi45EOnnbljWde2C/aIFaDLTUOroCAnk=; b=E1+RynhH//wvUkUKGX4OWEUlrYrmNj0EBT7adR21epv08gZ10pRlTHIoof0cKpGDLCVaZw 57iZ4kK+4krX5K6BcNg3oYaSvjk2UFmZ/wzGm5SqhRCkdZHLWd599awG/poYtCEwHWaiRU eT3nbiRwxKipm/S4FG6vADhjPMOBNK9oJ9Uu5x0K4FoFUCDscb+m4Az/+nx08q/UFYNIx0 4dzauygZ0qmmKSOWB9YM38wNYtcRUaXDJulTzoxYDthRXbLAOq5+R7S7ETmfbdwV3JMAbR tgbfTmS7dZ3NIm4OiJUH5apz0uUqIELiwgEZkLsuPDeJNs4V1QPSIp6wK699ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681634081; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZxBy4pEmsDVHi45EOnnbljWde2C/aIFaDLTUOroCAnk=; b=fagdeVYV3OgEWZaOgVQPNeOK6AAD1k48uLmbu06Y1YzhMSef0jDW1djDCOnPHTdKAsc8ym mJVjxnT91+16oGmwTP9NTcv1jy1Ti9mvrNTfTH+PgAKlqb2ccNF/DiU88hNPyPJJrR7apQ MGjaq2tlra6cB7z3pkM55m7AXfAZuNOvbXbUBu+wBDYyLx15+OlforK97AUrS8OwsIQb1E e3RitHsvJrtG4M0iFf8dSzUdrf+BWx8a+KqAcYe8UQSv7BbdB/3E8hvTAHKpuE4fT0faRr lByQAN2A7N0to5E42CvR8rcq15kfI4WIp3PX1cXfLEry5QkVSTpKZgrT8zd65g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681634081; a=rsa-sha256; cv=none; b=rjWuKLSPjoWvdHzS+QnQrsg8oLvhnS03syByBVfDyND7VV7XgMZgi6u7rJbujLQwd6hsZ/ a5XbOC+ujL0MaVP2vcdC8UsqKPcO/XTmH9NnUBQ3RsDZBjN4+D/9f2XCncFVcQOFIUIKe6 IdbRl1G52Eq7CEk+2JTaRfEXZWFQiwfnARVN7qrodZnnzwfTBaoBXU6NCb94bNdEedjo47 /0CxJbxVwOHLDTliUjul4A/trHZE7Gk9E6elV//WwckEHJWtkDPM1E1+xjvicyri6t0CCD 2FR32Qa+HeJYq1qghHaSXvSiMLh21M9/rQ1v1HNylK90I0qZjScE6AUuBYBUtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pzk4w5sX9zgq4; Sun, 16 Apr 2023 08:34:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33G8Yetu090705; Sun, 16 Apr 2023 08:34:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33G8YeLQ090704; Sun, 16 Apr 2023 08:34:40 GMT (envelope-from git) Date: Sun, 16 Apr 2023 08:34:40 GMT Message-Id: <202304160834.33G8YeLQ090704@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Tijl Coosemans Subject: git: 9fa263c21fb2 - main - x11-drivers/xf86-video-nv: Update to 2.1.22 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tijl X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fa263c21fb287ab1edc085498d8ecb36b494614 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tijl: URL: https://cgit.FreeBSD.org/ports/commit/?id=9fa263c21fb287ab1edc085498d8ecb36b494614 commit 9fa263c21fb287ab1edc085498d8ecb36b494614 Author: Tijl Coosemans AuthorDate: 2023-04-15 15:31:17 +0000 Commit: Tijl Coosemans CommitDate: 2023-04-16 08:34:17 +0000 x11-drivers/xf86-video-nv: Update to 2.1.22 Also fix regression from df10dcefa427 [1] PR: 270869, 270509 [1] Approved by: x11 (manu) --- x11-drivers/xf86-video-nv/Makefile | 5 ++--- x11-drivers/xf86-video-nv/distinfo | 6 +++--- x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c | 19 ++++++++++++++++++- x11-drivers/xf86-video-nv/files/patch-src_riva__xaa.c | 14 -------------- 4 files changed, 23 insertions(+), 21 deletions(-) diff --git a/x11-drivers/xf86-video-nv/Makefile b/x11-drivers/xf86-video-nv/Makefile index cca4ae0547ff..416ef212a414 100644 --- a/x11-drivers/xf86-video-nv/Makefile +++ b/x11-drivers/xf86-video-nv/Makefile @@ -1,12 +1,11 @@ PORTNAME= xf86-video-nv -PORTVERSION= 2.1.21 -PORTREVISION= 5 +PORTVERSION= 2.1.22 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org COMMENT= X.Org nv display driver WWW= https://www.x.org/ -USES= xorg-cat:driver +USES= tar:xz xorg-cat:driver .include diff --git a/x11-drivers/xf86-video-nv/distinfo b/x11-drivers/xf86-video-nv/distinfo index 5bb804dd4d62..87ee797de56c 100644 --- a/x11-drivers/xf86-video-nv/distinfo +++ b/x11-drivers/xf86-video-nv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1484715801 -SHA256 (xorg/driver/xf86-video-nv-2.1.21.tar.bz2) = 1f98649e6ff0e8214b9d5dcac661f1d004be8e73823d8247b9c7025fd81db32d -SIZE (xorg/driver/xf86-video-nv-2.1.21.tar.bz2) = 424091 +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 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 index 6715bf67b3c5..c0155d99bb5a 100644 --- a/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c +++ b/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c @@ -1,6 +1,23 @@ --- src/nv_driver.c.orig 2017-01-17 22:41:33 UTC +++ src/nv_driver.c -@@ -1543,7 +1543,11 @@ NVPreInit(ScrnInfoPtr pScrn, int flags) +@@ -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; } diff --git a/x11-drivers/xf86-video-nv/files/patch-src_riva__xaa.c b/x11-drivers/xf86-video-nv/files/patch-src_riva__xaa.c deleted file mode 100644 index 9430febbe30c..000000000000 --- a/x11-drivers/xf86-video-nv/files/patch-src_riva__xaa.c +++ /dev/null @@ -1,14 +0,0 @@ -# ifdef away this XAA function call as done above -# ---- src/riva_xaa.c.orig 2013-02-07 07:56:01 UTC -+++ src/riva_xaa.c -@@ -91,7 +91,9 @@ RivaSetRopPattern(RivaPtr pRiva, int rop - if (pRiva->currentRop != (rop + 16)) { - pRiva->currentRop = rop + 16; /* +16 is important */ - RIVA_FIFO_FREE(pRiva->riva, Rop, 1); -+#ifdef HAVE_XAA_H - pRiva->riva.Rop->Rop3 = XAAGetPatternROP(rop); -+#endif - } - } - #ifdef HAVE_XAA_H