Received: by mail.netbsd.org (Postfix, from userid 605) id 9CCAF84E05; Tue, 10 Dec 2019 17:27:06 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 21F0884E00 for ; Tue, 10 Dec 2019 17:27:06 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id ctN_eY130trd for ; Tue, 10 Dec 2019 17:27:05 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 71F3284CE7 for ; Tue, 10 Dec 2019 17:27:05 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 63BEDFA97; Tue, 10 Dec 2019 17:27:05 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_157599882576100" MIME-Version: 1.0 Date: Tue, 10 Dec 2019 17:27:05 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/x11/modular-xorg-server To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20191210172705.63BEDFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_157599882576100 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue Dec 10 17:27:05 UTC 2019 Modified Files: pkgsrc/x11/modular-xorg-server: Makefile distinfo pkgsrc/x11/modular-xorg-server/patches: patch-hw_xfree86_common_xf86AutoConfig.c Log Message: modular-xorg-server: Sync with current NetBSD xsrc Match the modesetting driver on x86 and ARM NetBSD. from maya Bump PKGREVISION To generate a diff of this commit: cvs rdiff -u -r1.123 -r1.124 pkgsrc/x11/modular-xorg-server/Makefile cvs rdiff -u -r1.97 -r1.98 pkgsrc/x11/modular-xorg-server/distinfo cvs rdiff -u -r1.3 -r1.4 \ pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86AutoConfig.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_157599882576100 Content-Disposition: inline Content-Length: 3662 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/modular-xorg-server/Makefile diff -u pkgsrc/x11/modular-xorg-server/Makefile:1.123 pkgsrc/x11/modular-xorg-server/Makefile:1.124 --- pkgsrc/x11/modular-xorg-server/Makefile:1.123 Tue Nov 26 10:02:42 2019 +++ pkgsrc/x11/modular-xorg-server/Makefile Tue Dec 10 17:27:05 2019 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.123 2019/11/26 10:02:42 wiz Exp $ +# $NetBSD: Makefile,v 1.124 2019/12/10 17:27:05 nia Exp $ DISTNAME= xorg-server-${XORG_VERSION} PKGNAME= modular-${DISTNAME} +PKGREVISION= 1 MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Modular X11 server from modular X.org Index: pkgsrc/x11/modular-xorg-server/distinfo diff -u pkgsrc/x11/modular-xorg-server/distinfo:1.97 pkgsrc/x11/modular-xorg-server/distinfo:1.98 --- pkgsrc/x11/modular-xorg-server/distinfo:1.97 Tue Nov 26 10:02:42 2019 +++ pkgsrc/x11/modular-xorg-server/distinfo Tue Dec 10 17:27:05 2019 @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.97 2019/11/26 10:02:42 wiz Exp $ +$NetBSD: distinfo,v 1.98 2019/12/10 17:27:05 nia Exp $ SHA1 (xorg-server-1.20.6.tar.bz2) = 59473e72136113f3a35b1ab5a5cfcbcad955b660 RMD160 (xorg-server-1.20.6.tar.bz2) = bd0910e7ac3a346df13ef1957effea037c42d98f SHA512 (xorg-server-1.20.6.tar.bz2) = 9aa0ba4aee92fe628f2b8c41e4fe0134dc86154bb8787f907884ef2fd970e18e68e72ea8a1beb706d11ecf155b2abc9731f1abadff251ed592f8cca3b1240dd6 Size (xorg-server-1.20.6.tar.bz2) = 6298697 bytes SHA1 (patch-configure) = 9e9f497f14d563ef66f25c637a14b0bea2243c3f -SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 0fa57d41ca2de306009f7f6256dfab34a11ea7a2 +SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = 70adf85be9fc6222a335686e7e9e9f385aca02f9 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92 SHA1 (patch-hw_xfree86_dri2_dri2.c) = 0bf58305059321e10f6f58186301dbb7cb858c2a SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3 Index: pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86AutoConfig.c diff -u pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86AutoConfig.c:1.3 pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86AutoConfig.c:1.4 --- pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86AutoConfig.c:1.3 Fri Oct 26 10:20:12 2018 +++ pkgsrc/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86AutoConfig.c Tue Dec 10 17:27:05 2019 @@ -1,10 +1,23 @@ -$NetBSD: patch-hw_xfree86_common_xf86AutoConfig.c,v 1.3 2018/10/26 10:20:12 maya Exp $ +$NetBSD: patch-hw_xfree86_common_xf86AutoConfig.c,v 1.4 2019/12/10 17:27:05 nia Exp $ -Look for wsfb on netbsd (needed by genfb) +https://github.com/NetBSD/xsrc/commit/38ac2ddeea11ea3a612c616447d191f685781f88.patch +https://github.com/NetBSD/xsrc/commit/38ac2ddeea11ea3a612c616447d191f685781f88.patch ---- hw/xfree86/common/xf86AutoConfig.c.orig 2018-10-25 14:13:21.000000000 +0000 +--- hw/xfree86/common/xf86AutoConfig.c.orig 2019-11-22 23:44:19.000000000 +0000 +++ hw/xfree86/common/xf86AutoConfig.c -@@ -313,6 +313,10 @@ listPossibleVideoDrivers(XF86MatchedDriv +@@ -307,12 +307,22 @@ listPossibleVideoDrivers(XF86MatchedDriv + #endif + #endif /* !__sun */ + ++#if defined(__NetBSD__) && \ ++ (defined(__aarch64__) || defined(__arm__) || \ ++ defined(__i386__) || defined(__amd64__)) ++ xf86AddMatchedDriver(md, "modesetting"); ++#endif ++ + /* Fallback to platform default hardware */ + #if defined(__i386__) || defined(__amd64__) || defined(__hurd__) + xf86AddMatchedDriver(md, "vesa"); #elif defined(__sparc__) && !defined(__sun) xf86AddMatchedDriver(md, "sunffb"); #endif --_----------=_157599882576100--