pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

modular-xorg-server-dfbsd-meson: Update wip/modular-xorg-server-dfbsd-meson to 2019-03-20 git

Module Name:	pkgsrc-wip
Committed By:	David Shao <davshao%gmail.com@localhost>
Pushed By:	dshao
Date:		Tue Mar 26 19:31:05 2019 -0700
Changeset:	c3673fa128c5d7144cbe3694c2de99e084fe5b9d

Modified Files:
	modular-xorg-server-dfbsd-meson/Makefile.common
	modular-xorg-server-dfbsd-meson/distinfo
	modular-xorg-server-dfbsd-meson/options.mk
	modular-xorg-server-dfbsd-meson/patches/patch-Xext_xf86bigfont.c
	modular-xorg-server-dfbsd-meson/patches/patch-config_meson.build
	modular-xorg-server-dfbsd-meson/patches/patch-config_wscons.c
	modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_common_xf86Configure.c
	modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_common_xf86Helper.c
	modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_drivers_modesetting_drmmode__display.c
	modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_int10_helper__exec.c
	modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_os-support_bsd_bsd__init.c
	modular-xorg-server-dfbsd-meson/patches/patch-include_meson.build
	modular-xorg-server-dfbsd-meson/patches/patch-os_utils.c

Log Message:
modular-xorg-server-dfbsd-meson: Update wip/modular-xorg-server-dfbsd-meson to 2019-03-20 git

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c3673fa128c5d7144cbe3694c2de99e084fe5b9d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 modular-xorg-server-dfbsd-meson/Makefile.common    |  5 +++-
 modular-xorg-server-dfbsd-meson/distinfo           | 28 +++++++++++-----------
 modular-xorg-server-dfbsd-meson/options.mk         | 27 ++++++++++++++-------
 .../patches/patch-Xext_xf86bigfont.c               |  2 +-
 .../patches/patch-config_meson.build               | 12 ++++++++--
 .../patches/patch-config_wscons.c                  | 10 ++++----
 .../patch-hw_xfree86_common_xf86Configure.c        | 17 +++++++++++--
 .../patches/patch-hw_xfree86_common_xf86Helper.c   |  2 +-
 ..._xfree86_drivers_modesetting_drmmode__display.c |  6 ++---
 .../patches/patch-hw_xfree86_int10_helper__exec.c  |  4 ++--
 .../patch-hw_xfree86_os-support_bsd_bsd__init.c    | 14 +++++------
 .../patches/patch-include_meson.build              |  2 +-
 .../patches/patch-os_utils.c                       |  4 ++--
 13 files changed, 84 insertions(+), 49 deletions(-)

diffs:
diff --git a/modular-xorg-server-dfbsd-meson/Makefile.common b/modular-xorg-server-dfbsd-meson/Makefile.common
index 7653c30f1d..73f4f6ad19 100644
--- a/modular-xorg-server-dfbsd-meson/Makefile.common
+++ b/modular-xorg-server-dfbsd-meson/Makefile.common
@@ -2,8 +2,11 @@
 # used by x11/modular-xorg-server/Makefile
 # used by x11/modular-xorg-xephyr/Makefile
 
+# 2019-03-20	Revert "systemd-logind: Monitor systemd-logind going away"
+COMMIT_ID=	5a549c957a873bd44ab351e627828905ee7dbf18
+
 # 2019-03-13	Add xf86OSInputThreadInit to stub os-support as well
-COMMIT_ID=	c020769dbfb965740c8441d8242b738ef572a7c9
+# COMMIT_ID=	c020769dbfb965740c8441d8242b738ef572a7c9
 
 # 2019-03-11	mi: Shortcut miDoCopy/miCopyArea based on clipList
 # COMMIT_ID=	f665a9c9e6c8643f3050378249db3088ae3057be
diff --git a/modular-xorg-server-dfbsd-meson/distinfo b/modular-xorg-server-dfbsd-meson/distinfo
index 9c2eee5e5e..33fb4aa078 100644
--- a/modular-xorg-server-dfbsd-meson/distinfo
+++ b/modular-xorg-server-dfbsd-meson/distinfo
@@ -1,32 +1,32 @@
 $NetBSD: distinfo,v 1.94 2019/02/28 12:32:39 tnn Exp $
 
-SHA1 (xserver-c020769dbfb965740c8441d8242b738ef572a7c9.tar.xz) = a4438a7965d01b1b8aa05f78c325cfdb010d5a52
-RMD160 (xserver-c020769dbfb965740c8441d8242b738ef572a7c9.tar.xz) = baa1cb52e64c1d9f56ed15083927758a801ca65d
-SHA512 (xserver-c020769dbfb965740c8441d8242b738ef572a7c9.tar.xz) = acb7c883bff1ecd8d2c1f8a606a4fcc9b852f764b2f79c037234673ef4794a3b0fe53e2d9660c4c53fc1933f7ef68334322d83f231d749849bdc8ec7a3ffefe3
-Size (xserver-c020769dbfb965740c8441d8242b738ef572a7c9.tar.xz) = 3097140 bytes
-SHA1 (patch-Xext_xf86bigfont.c) = f79803c6c120f96aefddd665c42b9d83769c9071
+SHA1 (xserver-5a549c957a873bd44ab351e627828905ee7dbf18.tar.xz) = fb17c31b9b80c9e9900bbe3ee1e71d7d64671f5a
+RMD160 (xserver-5a549c957a873bd44ab351e627828905ee7dbf18.tar.xz) = 9ecab9b533b8a77f0beb7e6c591bc13fac3d2b07
+SHA512 (xserver-5a549c957a873bd44ab351e627828905ee7dbf18.tar.xz) = 2f21afc9d17586fc294fe377c72e5ff929256719c6d11a30fd64f517c4535a0af9121f0d02134eda8d22bb3430fe390b2459304eb84a48bf9d269c0df2316efe
+Size (xserver-5a549c957a873bd44ab351e627828905ee7dbf18.tar.xz) = 3097464 bytes
+SHA1 (patch-Xext_xf86bigfont.c) = 0d8b9f84f3441764d990c0d7ee41dc34e5430cde
 SHA1 (patch-config_config-backends.h) = f44868caa51e972a76949f73ac6083640af2c351
 SHA1 (patch-config_config.c) = 5a3fe4cb6c2170335ab547f438386cff77a9c152
 SHA1 (patch-config_devd.c) = d8c534837b1c448563c363465570b9dc403f19fa
-SHA1 (patch-config_meson.build) = 865a422bc018e9778b3d8d52ee1bdbe042814550
-SHA1 (patch-config_wscons.c) = 6fe39b02fa6a9e98dd82321152afe33c55b9d272
+SHA1 (patch-config_meson.build) = 3d70b7c70994245a4527a51d0a0e00bcb0476422
+SHA1 (patch-config_wscons.c) = 2259af3a83576336d75e655d0ef4268435a8a5eb
 SHA1 (patch-glamor_glamor__egl.c) = 8057778a5f0fd03c3ecd1191cff9123310396a1f
 SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = ec02893276a3f4360f27fd8648d846f3074057db
 SHA1 (patch-hw_xfree86_common_xf86Config.c) = 904e192e3abf80e78e2afba0f589e51c25ccc3a2
-SHA1 (patch-hw_xfree86_common_xf86Configure.c) = 519bbe4b0edbd08b4eac85feaab5c7d4590283f9
+SHA1 (patch-hw_xfree86_common_xf86Configure.c) = 787d2de8fac99fa74c4d7460d286d545abf5d401
 SHA1 (patch-hw_xfree86_common_xf86Globals.c) = da35eb1c437eaffce0b8f8a3964e3a75631d8a73
-SHA1 (patch-hw_xfree86_common_xf86Helper.c) = 658ba1e2f987468f7ceabb4ec5b209ca4080db7e
+SHA1 (patch-hw_xfree86_common_xf86Helper.c) = 52a30f00fb95ee433ed6ba3b72073f3fc32259bd
 SHA1 (patch-hw_xfree86_common_xf86Xinput.c) = 5ad0c36fe68f87c853ac084640269e3b8f9370c9
 SHA1 (patch-hw_xfree86_common_xf86pciBus.c) = 6d112060b0ebb2be8c93bf567d4a4904829af44b
 SHA1 (patch-hw_xfree86_common_xf86sbusBus.h) = f56f87336b2f669413ebb1005a2b64568a111f92
 SHA1 (patch-hw_xfree86_dri2_dri2.c) = 475ea1956f2e71d684cf1e5a8a68b30279959a04
-SHA1 (patch-hw_xfree86_drivers_modesetting_drmmode__display.c) = 6fd5822ecef0dbb55adf55173e213215fab7f26e
-SHA1 (patch-hw_xfree86_int10_helper__exec.c) = 06a35862bccbcf9c7496b44ee7762c393ca418ff
+SHA1 (patch-hw_xfree86_drivers_modesetting_drmmode__display.c) = 97ad4ce8e67d85ea775c657de39c4e46dd247b9c
+SHA1 (patch-hw_xfree86_int10_helper__exec.c) = cad89a98a29ab2a97b6ed81f65a9deb71db94455
 SHA1 (patch-hw_xfree86_modes_xf86Cursors.c) = bd9870edb1196a4d2eab49b2d13fbe6eefbe4c09
 SHA1 (patch-hw_xfree86_modes_xf86RandR12.c) = 6a55dc74cae9897c73e77edda5b677afeb70d60f
 SHA1 (patch-hw_xfree86_os-support_bsd_arm__video.c) = 9c03b24f44eafc5fabe27e9d6cc6c54b607e47c3
 SHA1 (patch-hw_xfree86_os-support_bsd_bsd__VTsw.c) = f5e7c510d35a1adfb9aae8dfc05a2ab3503ef904
-SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = fe6f69af9435f9fdb4c8e7e4bccc20c131ae219c
+SHA1 (patch-hw_xfree86_os-support_bsd_bsd__init.c) = f4ccd1d54f141b1ede94c088e629a1e4c0167f3f
 SHA1 (patch-hw_xfree86_os-support_bsd_i386__video.c) = 68889e3ae80b9536d82909855ec7156caa928374
 SHA1 (patch-hw_xfree86_os-support_bsd_ppc__video.c) = 2f5126ee47cbd66c0241e8fbf66c8af363e01fd7
 SHA1 (patch-hw_xfree86_os-support_bus_Sbus.c) = 0035b970bdae1bab51b8ca6bfeed060ec4df3a60
@@ -36,8 +36,8 @@ SHA1 (patch-hw_xfree86_os-support_solaris_solaris-amd64.S) = 088a3118deb7567194e
 SHA1 (patch-hw_xfree86_os-support_xf86_OSproc.h) = e1c049857893d2f050d5fb297a3e8ef86f0b1d7e
 SHA1 (patch-hw_xfree86_os_support_bus_xf86Sbus.h) = 0e0a243b737f8f762c9f8f24a2265d1b6aefb544
 SHA1 (patch-hw_xfree86_xorg-wrapper.c) = d1178c088307cd3781f8989522bab570b551ff55
-SHA1 (patch-include_meson.build) = 8e7cfb8140e325279fbd8fcebc165b9ddcf4c32d
-SHA1 (patch-os_utils.c) = ce6d474deb9b04701ac16c4bdb3131e41a98bfa2
+SHA1 (patch-include_meson.build) = 915fd4b45297d05dd70c3bb89895bd23b9647acf
+SHA1 (patch-os_utils.c) = c6c8975fae3d16224fc1182a747437e4136a309a
 SHA1 (patch-randr_randr.c) = eb44a07770ca7308d706aa2324408bb8c6c6b7ba
 SHA1 (patch-randr_rrlease.c) = 82ace923fe7b65f4cf1be2ff243eabd886f3109e
 SHA1 (patch-test_xtest.c) = 77622ef481e91e64b3a6dd64b8579404f33ec88f
diff --git a/modular-xorg-server-dfbsd-meson/options.mk b/modular-xorg-server-dfbsd-meson/options.mk
index 87b215425f..405e5a2288 100644
--- a/modular-xorg-server-dfbsd-meson/options.mk
+++ b/modular-xorg-server-dfbsd-meson/options.mk
@@ -16,7 +16,7 @@ PKG_SUPPORTED_OPTIONS+= xkb_evdev
 PKG_SUPPORTED_OPTIONS+= add_modesetting_driver
 PKG_SUPPORTED_OPTIONS+= add_scfb_driver
 
-PKG_SUPPORTED_OPTIONS+= strict_netbsd
+PKG_SUPPORTED_OPTIONS+= strict_xsrc_netbsd
 
 PKG_SUPPORTED_OPTIONS+= modesetting_on_intel
 PKG_SUPPORTED_OPTIONS+= fallback_not_wsdisplay
@@ -25,6 +25,7 @@ PKG_SUPPORTED_OPTIONS+= usl_vt_switching
 PKG_SUPPORTED_OPTIONS+= openbsd_more_calls
 PKG_SUPPORTED_OPTIONS+= randr_backlight
 PKG_SUPPORTED_OPTIONS+= ws_drivers_openbsd
+PKG_SUPPORTED_OPTIONS+= try_dev_wskbd
 
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
 PKG_SUGGESTED_OPTIONS+= devd
@@ -50,13 +51,13 @@ PKG_SUGGESTED_OPTIONS+= add_scfb_driver
 .endif
 
 .if ${OPSYS} == "NetBSD"
-PKG_SUGGESTED_OPTIONS+= strict_netbsd
+PKG_SUGGESTED_OPTIONS+= strict_xsrc_netbsd
 .endif
 
 # Patch from OpenBSD to aggressively use the modesetting driver on intel integrated graphics
-# .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD" || ${OPSYS} == "OpenBSD"
-# PKG_SUGGESTED_OPTIONS+= modesetting_on_intel
-# .endif
+.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD"
+PKG_SUGGESTED_OPTIONS+= modesetting_on_intel
+.endif
 
 # From OpenBSD 6.5 xenocara xserver 1.19.6
 .if ${OPSYS} == "OpenBSD"
@@ -82,10 +83,15 @@ PKG_SUGGESTED_OPTIONS+= randr_backlight
 .endif
 
 # From OpenBSD 6.5 xenocara xserver 1.19.6
-.if ${OPSYS} == "OpenBSD"
+.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD"
 PKG_SUGGESTED_OPTIONS+= ws_drivers_openbsd
 .endif
 
+# From NetBSD 1.20.4 but extended to amd64 and i386
+.if ${OPSYS} == "NetBSD"
+PKG_SUGGESTED_OPTIONS+= try_dev_wskbd
+.endif
+
 .include "../../mk/bsd.options.mk"
 
 PLIST_VARS+=		dri dtrace
@@ -201,8 +207,8 @@ CPPFLAGS+=	-DADD_MODESETTING_DRIVER
 CPPFLAGS+=	-DADD_SCFB_DRIVER
 .endif
 
-.if !empty(PKG_OPTIONS:Mstrict_netbsd)
-CPPFLAGS+=	-DSTRICT_NETBSD
+.if !empty(PKG_OPTIONS:Mstrict_xsrc_netbsd)
+CPPFLAGS+=	-DSTRICT_XSRC_NETBSD
 .endif
 
 .if !empty(PKG_OPTIONS:Mmodesetting_on_intel)
@@ -229,6 +235,11 @@ CPPFLAGS+=	-DOPENBSD_MORE_CALLS
 CPPFLAGS+=	-DWS_DRIVERS_OPENBSD
 .endif
 
+.if !empty(PKG_OPTIONS:Mtry_dev_wskbd)
+CPPFLAGS+=	-DTRY_DEV_WSKBD
+CPPFLAGS+=	-DCONFIG_WSCONS
+.endif
+
 .if !empty(PKG_OPTIONS:Mrandr_backlight)
 CPPFLAGS+=	-DRANDR_BACKLIGHT
 .endif
diff --git a/modular-xorg-server-dfbsd-meson/patches/patch-Xext_xf86bigfont.c b/modular-xorg-server-dfbsd-meson/patches/patch-Xext_xf86bigfont.c
index f61126f1af..280f544a0b 100644
--- a/modular-xorg-server-dfbsd-meson/patches/patch-Xext_xf86bigfont.c
+++ b/modular-xorg-server-dfbsd-meson/patches/patch-Xext_xf86bigfont.c
@@ -6,7 +6,7 @@ $NetBSD$
  #ifdef HAS_SHM
          if (!badSysCall)
              pDesc = (ShmDescPtr) FontGetPrivate(pFont, FontShmdescIndex);
-+#if defined(STRICT_NETBSD)
++#if defined(STRICT_XSRC_NETBSD)
 +        if (pDesc && pDesc->attach_addr) {
 +#else
          if (pDesc) {
diff --git a/modular-xorg-server-dfbsd-meson/patches/patch-config_meson.build b/modular-xorg-server-dfbsd-meson/patches/patch-config_meson.build
index 9bd7faeeb1..170ba8fb84 100644
--- a/modular-xorg-server-dfbsd-meson/patches/patch-config_meson.build
+++ b/modular-xorg-server-dfbsd-meson/patches/patch-config_meson.build
@@ -1,8 +1,16 @@
 $NetBSD$
 
---- config/meson.build.orig	2019-01-30 21:08:48.000000000 +0000
+--- config/meson.build.orig	2019-03-13 16:07:36.000000000 +0000
 +++ config/meson.build
-@@ -23,6 +23,14 @@ if host_machine.system() == 'openbsd'
+@@ -19,10 +19,22 @@ if build_udev
+     config_dep += udev_dep
+ endif
+ 
++if host_machine.system() == 'netbsd'
++    srcs_config += 'wscons.c'
++endif
++
+ if host_machine.system() == 'openbsd'
      srcs_config += 'wscons.c'
  endif
  
diff --git a/modular-xorg-server-dfbsd-meson/patches/patch-config_wscons.c b/modular-xorg-server-dfbsd-meson/patches/patch-config_wscons.c
index 8efc93b5e8..7af8b423c9 100644
--- a/modular-xorg-server-dfbsd-meson/patches/patch-config_wscons.c
+++ b/modular-xorg-server-dfbsd-meson/patches/patch-config_wscons.c
@@ -52,14 +52,14 @@ Option for masking bits to compare kbd value from OpenBSD xenocara.
      char *name;
  } kbdenc[] = {
      KB_OVRENC,
-+#if defined(STRICT_NETBSD)
++#if defined(STRICT_XSRC_NETBSD)
 +    KB_ENCTAB
 +#ifndef __NetBSD__
 +             ,
 +#endif
-+#else /* !STRICT_NETBSD */
++#else /* !STRICT_XSRC_NETBSD */
      KB_ENCTAB,
-+#endif /* STRICT_NETBSD */
++#endif /* STRICT_XSRC_NETBSD */
      {0}
  };
  
@@ -82,7 +82,7 @@ Option for masking bits to compare kbd value from OpenBSD xenocara.
      input_options = input_option_new(input_options, "name", WSCONS_KBD_DEVICE);
      input_options = input_option_new(input_options, "driver", "kbd");
  
-+#if defined(STRICT_NETBSD)
++#if defined(STRICT_XSRC_NETBSD)
 +    if (asprintf(&config_info, "wscons:%s", WSCONS_KBD_DEVICE) != -1)
 +#else
      config_info = Xprintf("wscons:%s", WSCONS_KBD_DEVICE);
@@ -119,7 +119,7 @@ Option for masking bits to compare kbd value from OpenBSD xenocara.
      char *config_info = NULL;
      int rc;
  
-+#if defined(STRICT_NETBSD)
++#if defined(STRICT_XSRC_NETBSD)
 +    if (asprintf(&config_info, "wscons:%s", path) == -1)
 +#else
      config_info = Xprintf("wscons:%s", path);
diff --git a/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_common_xf86Configure.c b/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_common_xf86Configure.c
index 993500391d..d5c67072be 100644
--- a/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_common_xf86Configure.c
+++ b/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_common_xf86Configure.c
@@ -1,8 +1,21 @@
 $NetBSD$
 
---- hw/xfree86/common/xf86Configure.c.orig	2019-03-05 16:34:21.000000000 +0000
+--- hw/xfree86/common/xf86Configure.c.orig	2019-03-20 23:09:22.000000000 +0000
 +++ hw/xfree86/common/xf86Configure.c
-@@ -821,6 +821,9 @@ DoConfigure(void)
+@@ -163,6 +163,12 @@ configureInputSection(void)
+     ptr->inp_identifier = xnfstrdup("Keyboard0");
+     ptr->inp_driver = xnfstrdup("kbd");
+     ptr->list.next = NULL;
++#if defined(WSCONS_SUPPORT) && defined(TRY_DEV_WSKBD)
++    ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
++        xstrdup("Protocol"), "wskbd");
++    ptr->inp_option_lst = xf86addNewOption(ptr->inp_option_lst,
++        xstrdup("Device"), "/dev/wskbd");
++#endif
+ 
+     /* Crude mechanism to auto-detect mouse (os dependent) */
+     {
+@@ -821,6 +827,9 @@ DoConfigure(void)
      ErrorF("To test the server, run 'X -config %s'\n\n", filename);
  
   bail:
diff --git a/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_common_xf86Helper.c b/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_common_xf86Helper.c
index fb93a53d11..83b92b297f 100644
--- a/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_common_xf86Helper.c
+++ b/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_common_xf86Helper.c
@@ -6,7 +6,7 @@ $NetBSD$
      if (sectlist)
          *sectlist = NULL;
  
-+#if defined(STRICT_NETBSD)
++#if defined(STRICT_XSRC_NETBSD)
 +    /*
 +     * 20111009 jmcneill: This line was removed with the following commit upstream:
 +     *  http://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/common/xf86Helper.c?id=0ceac6f64f5ad9bc2ac4b19be2dd245ffba78b05
diff --git a/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_drivers_modesetting_drmmode__display.c b/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_drivers_modesetting_drmmode__display.c
index 74a077ce6c..79c10d68ab 100644
--- a/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_drivers_modesetting_drmmode__display.c
+++ b/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_drivers_modesetting_drmmode__display.c
@@ -14,7 +14,7 @@ Option from OpenBSD xenocara for randr backlight setting
      DamageRegister(&ppix->drawable, ppriv->slave_damage);
  
      if (ppriv->fb_id == 0) {
-+#if defined(STRICT_NETBSD)
++#if defined(STRICT_XSRC_NETBSD)
 +        int ret = drmModeAddFB(drmmode->fd, ppix->drawable.width,
 +#else
          drmModeAddFB(drmmode->fd, ppix->drawable.width,
@@ -23,7 +23,7 @@ Option from OpenBSD xenocara for randr backlight setting
                       ppix->drawable.depth,
                       ppix->drawable.bitsPerPixel,
                       ppix->devKind, ppriv->backing_bo->handle, &ppriv->fb_id);
-+#if defined(STRICT_NETBSD)
++#if defined(STRICT_XSRC_NETBSD)
 +        if (ret) {
 +            ErrorF("failed to set scanout pixmap cpu\n");
 +            return FALSE;
@@ -100,7 +100,7 @@ Option from OpenBSD xenocara for randr backlight setting
      if (!conn)
          return -1;
      len = conn - (blob_data + 4);
-+#if defined(STRICT_NETBSD)
++#if defined(STRICT_XSRC_NETBSD)
 +    if (len + 1 >= sizeof(conn_id))
 +#else
      if (len + 1> 5)
diff --git a/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_int10_helper__exec.c b/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_int10_helper__exec.c
index 8709a7ca6d..cd9430132f 100644
--- a/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_int10_helper__exec.c
+++ b/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_int10_helper__exec.c
@@ -6,7 +6,7 @@ $NetBSD$
  void
  LockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga)
  {
-+#if !defined(NO_LEGACY_VGA) || !defined(STRICT_NETBSD)
++#if !defined(NO_LEGACY_VGA) || !defined(STRICT_XSRC_NETBSD)
      vga->save_msr = pci_io_read8(pInt->io, 0x03CC);
      vga->save_vse = pci_io_read8(pInt->io, 0x03C3);
  #ifndef __ia64__
@@ -20,7 +20,7 @@ $NetBSD$
  void
  UnlockLegacyVGA(xf86Int10InfoPtr pInt, legacyVGAPtr vga)
  {
-+#if !defined(NO_LEGACY_VGA) || !defined(STRICT_NETBSD)
++#if !defined(NO_LEGACY_VGA) || !defined(STRICT_XSRC_NETBSD)
      pci_io_write8(pInt->io, 0x0102, vga->save_pos102);
  #ifndef __ia64__
      pci_io_write8(pInt->io, 0x46E8, vga->save_46e8);
diff --git a/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_os-support_bsd_bsd__init.c b/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_os-support_bsd_bsd__init.c
index b9a4fa5ab3..9b40229842 100644
--- a/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_os-support_bsd_bsd__init.c
+++ b/modular-xorg-server-dfbsd-meson/patches/patch-hw_xfree86_os-support_bsd_bsd__init.c
@@ -16,7 +16,7 @@ for bug #196678
 
 https://bugs.freebsd.org/bugzilla/attachment.cgi?id=191592&action=diff
 
---- hw/xfree86/os-support/bsd/bsd_init.c.orig	2019-03-05 16:34:21.000000000 +0000
+--- hw/xfree86/os-support/bsd/bsd_init.c.orig	2019-03-20 23:09:22.000000000 +0000
 +++ hw/xfree86/os-support/bsd/bsd_init.c
 @@ -37,6 +37,9 @@
  
@@ -70,11 +70,11 @@ https://bugs.freebsd.org/bugzilla/attachment.cgi?id=191592&action=diff
   * pcvt or syscons might succesfully probe as pccons.)
   */
  static xf86ConsOpen_t xf86ConsTab[] = {
-+#if defined(USL_VT_SWITCHING)
++#if defined(TRY_DEV_WSKBD) || defined(USL_VT_SWITCHING)
 +#ifdef WSCONS_SUPPORT
 +    xf86OpenWScons,
 +#endif
-+#endif /* USL_VT_SWITCHING */
++#endif /* TRY_DEV_WSKBD || USL_VT_SWITCHING */
  #ifdef PCVT_SUPPORT
      xf86OpenPcvt,
  #endif
@@ -82,11 +82,11 @@ https://bugs.freebsd.org/bugzilla/attachment.cgi?id=191592&action=diff
  #ifdef PCCONS_SUPPORT
      xf86OpenPccons,
  #endif
-+#if !defined(USL_VT_SWITCHING)
++#if !defined(TRY_DEV_WSKBD) && !defined(USL_VT_SWITCHING)
  #ifdef WSCONS_SUPPORT
      xf86OpenWScons,
  #endif
-+#endif /* !USL_VT_SWITCHING */
++#endif /* !TRY_DEV_WSKBD && !USL_VT_SWITCHING */
      (xf86ConsOpen_t) NULL
  };
  
@@ -263,7 +263,7 @@ https://bugs.freebsd.org/bugzilla/attachment.cgi?id=191592&action=diff
              xf86Msg(X_PROBED, "Using pcvt driver (version %d.%d)\n",
                      pcvt_version.rmajor, pcvt_version.rminor);
  #endif
-+#if defined(STRICT_NETBSD)
++#if defined(STRICT_XSRC_NETBSD)
 +            xf86Msg(X_PROBED, "using VT number %d\n", xf86Info.vtno);
 +#endif
          }
@@ -383,7 +383,7 @@ https://bugs.freebsd.org/bugzilla/attachment.cgi?id=191592&action=diff
      struct vt_mode VT;
  #endif
  
-+#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) || !defined(STRICT_NETBSD)
++#if defined (SYSCONS_SUPPORT) || defined (PCVT_SUPPORT) || !defined(STRICT_XSRC_NETBSD)
      if (xf86Info.ShareVTs)
          return;
 +#endif
diff --git a/modular-xorg-server-dfbsd-meson/patches/patch-include_meson.build b/modular-xorg-server-dfbsd-meson/patches/patch-include_meson.build
index e5de8e4320..e8d994f327 100644
--- a/modular-xorg-server-dfbsd-meson/patches/patch-include_meson.build
+++ b/modular-xorg-server-dfbsd-meson/patches/patch-include_meson.build
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- include/meson.build.orig	2019-02-25 15:48:03.000000000 +0000
+--- include/meson.build.orig	2019-03-13 16:07:36.000000000 +0000
 +++ include/meson.build
 @@ -254,7 +254,7 @@ supports_syscons = false
  supports_wscons = false
diff --git a/modular-xorg-server-dfbsd-meson/patches/patch-os_utils.c b/modular-xorg-server-dfbsd-meson/patches/patch-os_utils.c
index 99822afdd4..7080e249b0 100644
--- a/modular-xorg-server-dfbsd-meson/patches/patch-os_utils.c
+++ b/modular-xorg-server-dfbsd-meson/patches/patch-os_utils.c
@@ -6,7 +6,7 @@ $NetBSD$
  #if !defined(WIN32) || !defined(__MINGW32__)
              struct rlimit core_limit;
  
-+#if defined(STRICT_NETBSD)
++#if defined(STRICT_XSRC_NETBSD)
 +            if (getrlimit(RLIMIT_CORE, &core_limit) != -1) {
 +                core_limit.rlim_cur = core_limit.rlim_max;
 +                setrlimit(RLIMIT_CORE, &core_limit);
@@ -15,7 +15,7 @@ $NetBSD$
              getrlimit(RLIMIT_CORE, &core_limit);
              core_limit.rlim_cur = core_limit.rlim_max;
              setrlimit(RLIMIT_CORE, &core_limit);
-+#endif /* STRICT_NETBSD */
++#endif /* STRICT_XSRC_NETBSD */
  #endif
              CoreDump = TRUE;
          }
Home | Main Index | Thread Index | Old Index