From owner-svn-ports-all@freebsd.org Mon Jan 23 00:21:13 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3ECD2CBA549; Mon, 23 Jan 2017 00:21:13 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 18643D90; Mon, 23 Jan 2017 00:21:13 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v0N0LCuX007637; Mon, 23 Jan 2017 00:21:12 GMT (envelope-from bapt@FreeBSD.org) Received: (from bapt@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v0N0LB6X007633; Mon, 23 Jan 2017 00:21:11 GMT (envelope-from bapt@FreeBSD.org) Message-Id: <201701230021.v0N0LB6X007633@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: bapt set sender to bapt@FreeBSD.org using -f From: Baptiste Daroussin Date: Mon, 23 Jan 2017 00:21:11 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r432175 - in head/x11-drivers/xf86-video-nv: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 23 Jan 2017 00:21:13 -0000 Author: bapt Date: Mon Jan 23 00:21:11 2017 New Revision: 432175 URL: https://svnweb.freebsd.org/changeset/ports/432175 Log: Update to 2.1.21 (wich is compatible with newer xorg) PR: 216285 Submitted by: matthew@reztek.cz Added: head/x11-drivers/xf86-video-nv/files/patch-src_riva__xaa.c (contents, props changed) Deleted: head/x11-drivers/xf86-video-nv/files/patch-src_g80__driver.c head/x11-drivers/xf86-video-nv/files/patch-src_nv__include.h head/x11-drivers/xf86-video-nv/files/patch-src_riva__driver.c head/x11-drivers/xf86-video-nv/files/patch-src_riva__include.h Modified: head/x11-drivers/xf86-video-nv/Makefile head/x11-drivers/xf86-video-nv/distinfo head/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c Modified: head/x11-drivers/xf86-video-nv/Makefile ============================================================================== --- head/x11-drivers/xf86-video-nv/Makefile Mon Jan 23 00:15:48 2017 (r432174) +++ head/x11-drivers/xf86-video-nv/Makefile Mon Jan 23 00:21:11 2017 (r432175) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME= xf86-video-nv -PORTVERSION= 2.1.20 -PORTREVISION= 7 +PORTVERSION= 2.1.21 CATEGORIES= x11-drivers MAINTAINER= x11@FreeBSD.org Modified: head/x11-drivers/xf86-video-nv/distinfo ============================================================================== --- head/x11-drivers/xf86-video-nv/distinfo Mon Jan 23 00:15:48 2017 (r432174) +++ head/x11-drivers/xf86-video-nv/distinfo Mon Jan 23 00:21:11 2017 (r432175) @@ -1,2 +1,3 @@ -SHA256 (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 8395f65501f16f9cbaae8f598b02c6f18e78f4d3d30a08cb8d547dc2e00c10bf -SIZE (xorg/driver/xf86-video-nv-2.1.20.tar.bz2) = 396982 +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 Modified: head/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c ============================================================================== --- head/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c Mon Jan 23 00:15:48 2017 (r432174) +++ head/x11-drivers/xf86-video-nv/files/patch-src-nv_driver.c Mon Jan 23 00:21:11 2017 (r432175) @@ -1,4 +1,4 @@ ---- src/nv_driver.c.orig 2012-07-17 06:47:02 UTC +--- 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) xf86FreeInt10(pNv->pInt); @@ -12,11 +12,3 @@ /* We use a programmable clock */ pScrn->progClock = TRUE; -@@ -2550,7 +2554,6 @@ NVScreenInit(SCREEN_INIT_ARGS_DECL) - if (!pNv->NoAccel) - NVAccelInit(pScreen); - -- miInitializeBackingStore(pScreen); - xf86SetBackingStore(pScreen); - xf86SetSilkenMouse(pScreen); - Added: head/x11-drivers/xf86-video-nv/files/patch-src_riva__xaa.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11-drivers/xf86-video-nv/files/patch-src_riva__xaa.c Mon Jan 23 00:21:11 2017 (r432175) @@ -0,0 +1,14 @@ +# 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