diff options
| author | nia <nia@pkgsrc.org> | 2019-12-10 17:27:05 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2019-12-10 17:27:05 +0000 |
| commit | 4e221f6141e5d85063f293a52c0e93842e599de3 (patch) | |
| tree | 9375e73a9a8c5f3defdc5f5d39a0bef7fa3f120d /x11 | |
| parent | 0a846312d2286f995532774c363f61c7765761d6 (diff) | |
| download | pkgsrc-4e221f6141e5d85063f293a52c0e93842e599de3.tar.gz | |
modular-xorg-server: Sync with current NetBSD xsrc
Match the modesetting driver on x86 and ARM NetBSD.
from maya
Bump PKGREVISION
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/modular-xorg-server/Makefile | 3 | ||||
| -rw-r--r-- | x11/modular-xorg-server/distinfo | 4 | ||||
| -rw-r--r-- | x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86AutoConfig.c | 21 |
3 files changed, 21 insertions, 7 deletions
diff --git a/x11/modular-xorg-server/Makefile b/x11/modular-xorg-server/Makefile index 2603a7d5840..724e888993c 100644 --- a/x11/modular-xorg-server/Makefile +++ b/x11/modular-xorg-server/Makefile @@ -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 diff --git a/x11/modular-xorg-server/distinfo b/x11/modular-xorg-server/distinfo index 467a7b81f19..31de1c9e696 100644 --- a/x11/modular-xorg-server/distinfo +++ b/x11/modular-xorg-server/distinfo @@ -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 diff --git a/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86AutoConfig.c b/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86AutoConfig.c index 185c5b44c79..753e9cc7fa0 100644 --- a/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86AutoConfig.c +++ b/x11/modular-xorg-server/patches/patch-hw_xfree86_common_xf86AutoConfig.c @@ -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 |