modular-xorg-server-dfbsd-meson: Update wip/modular-xorg-server-dfbsd-meson to git 2019-04-04
Still not working modesetting for Intel.
This commit is contained in:
David Shao
parent
a74af60725
commit
cca2034aad
|
|
@ -2,8 +2,14 @@
|
|||
# used by x11/modular-xorg-server/Makefile
|
||||
# used by x11/modular-xorg-xephyr/Makefile
|
||||
|
||||
# 2019-04-04 test: Fix meson build with xvfb disabled.
|
||||
COMMIT_ID= 0a005c4fe4fccc9bb6c3a5266065f8437621fdb9
|
||||
|
||||
# 2019-03-29 present: Call present_vblank_scrap in screen mode
|
||||
# COMMIT_ID= 4adda1f6359fd96436dd61d0250b84f55b2fd277
|
||||
|
||||
# 2019-03-20 Revert "systemd-logind: Monitor systemd-logind going away"
|
||||
COMMIT_ID= 5a549c957a873bd44ab351e627828905ee7dbf18
|
||||
# COMMIT_ID= 5a549c957a873bd44ab351e627828905ee7dbf18
|
||||
|
||||
# 2019-03-13 Add xf86OSInputThreadInit to stub os-support as well
|
||||
# COMMIT_ID= c020769dbfb965740c8441d8242b738ef572a7c9
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
$NetBSD: distinfo,v 1.94 2019/02/28 12:32:39 tnn Exp $
|
||||
|
||||
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 (xserver-0a005c4fe4fccc9bb6c3a5266065f8437621fdb9.tar.xz) = 80f4a1212273707cf1f6d53c986d1613dcdab13f
|
||||
RMD160 (xserver-0a005c4fe4fccc9bb6c3a5266065f8437621fdb9.tar.xz) = c13d4d3e0db134eae9d85d8debe1ccf40490d30b
|
||||
SHA512 (xserver-0a005c4fe4fccc9bb6c3a5266065f8437621fdb9.tar.xz) = 57086fcc66f748fa4d61d6632862bb8c2536da749e114b6d74a8872dd8ab86f020e0d4f1b38ed895a30d315fde3450138f47647702fe27a523ca0676ec549cab
|
||||
Size (xserver-0a005c4fe4fccc9bb6c3a5266065f8437621fdb9.tar.xz) = 3097856 bytes
|
||||
SHA1 (patch-Xext_xf86bigfont.c) = 0d8b9f84f3441764d990c0d7ee41dc34e5430cde
|
||||
SHA1 (patch-config_config-backends.h) = f44868caa51e972a76949f73ac6083640af2c351
|
||||
SHA1 (patch-config_config.c) = 5a3fe4cb6c2170335ab547f438386cff77a9c152
|
||||
|
|
@ -11,6 +11,9 @@ SHA1 (patch-config_devd.c) = d8c534837b1c448563c363465570b9dc403f19fa
|
|||
SHA1 (patch-config_meson.build) = 3d70b7c70994245a4527a51d0a0e00bcb0476422
|
||||
SHA1 (patch-config_wscons.c) = 2259af3a83576336d75e655d0ef4268435a8a5eb
|
||||
SHA1 (patch-glamor_glamor__egl.c) = 8057778a5f0fd03c3ecd1191cff9123310396a1f
|
||||
SHA1 (patch-glx_glxcmds.c) = 3ac525b39aad3e36499daa8f12c585260878aec0
|
||||
SHA1 (patch-glx_glxdrawable.h) = d44d875aa21ade8ba70bae60e5c35ecef13b6507
|
||||
SHA1 (patch-glx_glxext.c) = 33db8bd3f447e8d773913bab144073080eb5676f
|
||||
SHA1 (patch-hw_xfree86_common_xf86AutoConfig.c) = ec02893276a3f4360f27fd8648d846f3074057db
|
||||
SHA1 (patch-hw_xfree86_common_xf86Config.c) = 904e192e3abf80e78e2afba0f589e51c25ccc3a2
|
||||
SHA1 (patch-hw_xfree86_common_xf86Configure.c) = 787d2de8fac99fa74c4d7460d286d545abf5d401
|
||||
|
|
@ -36,7 +39,9 @@ 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) = 915fd4b45297d05dd70c3bb89895bd23b9647acf
|
||||
SHA1 (patch-include_meson.build) = fd1a78723f0a08edea0317479d60a765f6e7dc1f
|
||||
SHA1 (patch-meson.build) = ca054971f140966189952da69621da919c167da9
|
||||
SHA1 (patch-meson__options.txt) = 1ad0114a7a7944a388184560bb9330747e457d7b
|
||||
SHA1 (patch-os_utils.c) = c6c8975fae3d16224fc1182a747437e4136a309a
|
||||
SHA1 (patch-randr_randr.c) = eb44a07770ca7308d706aa2324408bb8c6c6b7ba
|
||||
SHA1 (patch-randr_rrlease.c) = 82ace923fe7b65f4cf1be2ff243eabd886f3109e
|
||||
|
|
|
|||
|
|
@ -9,23 +9,26 @@ PKG_SUGGESTED_OPTIONS+= dri
|
|||
.endif
|
||||
|
||||
PKG_SUPPORTED_OPTIONS+= devd
|
||||
PKG_SUPPORTED_OPTIONS+= xkb_evdev
|
||||
|
||||
PKG_SUPPORTED_OPTIONS+= revert_flink
|
||||
PKG_SUPPORTED_OPTIONS+= revert_randr_lease
|
||||
PKG_SUPPORTED_OPTIONS+= allow_unprivileged
|
||||
PKG_SUPPORTED_OPTIONS+= xkb_evdev
|
||||
PKG_SUPPORTED_OPTIONS+= add_modesetting_driver
|
||||
PKG_SUPPORTED_OPTIONS+= add_scfb_driver
|
||||
PKG_SUPPORTED_OPTIONS+= add_modesetting_driver
|
||||
|
||||
PKG_SUPPORTED_OPTIONS+= allow_unprivileged
|
||||
PKG_SUPPORTED_OPTIONS+= otherid_xsrc_netbsd
|
||||
PKG_SUPPORTED_OPTIONS+= strict_xsrc_netbsd
|
||||
|
||||
PKG_SUPPORTED_OPTIONS+= modesetting_on_intel
|
||||
PKG_SUPPORTED_OPTIONS+= try_dev_wskbd
|
||||
|
||||
PKG_SUPPORTED_OPTIONS+= fallback_not_wsdisplay
|
||||
PKG_SUPPORTED_OPTIONS+= kbd_by_masking_bits
|
||||
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
|
||||
|
|
@ -36,8 +39,9 @@ PKG_SUGGESTED_OPTIONS+= revert_flink
|
|||
PKG_SUGGESTED_OPTIONS+= revert_randr_lease
|
||||
.endif
|
||||
|
||||
.if ${OPSYS} == "NetBSD"
|
||||
PKG_SUGGESTED_OPTIONS+= allow_unprivileged
|
||||
# Add scfb driver in xf86AutoConfig.c
|
||||
.if ${OPSYS} == "FreeBSD"
|
||||
PKG_SUGGESTED_OPTIONS+= add_scfb_driver
|
||||
.endif
|
||||
|
||||
# Add modesetting driver in xf86AutoConfig.c
|
||||
|
|
@ -45,9 +49,12 @@ PKG_SUGGESTED_OPTIONS+= allow_unprivileged
|
|||
PKG_SUGGESTED_OPTIONS+= add_modesetting_driver
|
||||
.endif
|
||||
|
||||
# Add scfb driver in xf86AutoConfig.c
|
||||
.if ${OPSYS} == "FreeBSD"
|
||||
PKG_SUGGESTED_OPTIONS+= add_scfb_driver
|
||||
.if ${OPSYS} == "NetBSD"
|
||||
PKG_SUGGESTED_OPTIONS+= allow_unprivileged
|
||||
.endif
|
||||
|
||||
.if ${OPSYS} == "NetBSD"
|
||||
PKG_SUGGESTED_OPTIONS+= otherid_xsrc_netbsd
|
||||
.endif
|
||||
|
||||
.if ${OPSYS} == "NetBSD"
|
||||
|
|
@ -55,10 +62,16 @@ PKG_SUGGESTED_OPTIONS+= strict_xsrc_netbsd
|
|||
.endif
|
||||
|
||||
# Patch from OpenBSD to aggressively use the modesetting driver on intel integrated graphics
|
||||
.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD"
|
||||
# .if ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD"
|
||||
.if ${OPSYS} == "OpenBSD"
|
||||
PKG_SUGGESTED_OPTIONS+= modesetting_on_intel
|
||||
.endif
|
||||
|
||||
# From NetBSD 1.20.4 but extended to amd64 and i386
|
||||
# .if ${OPSYS} == "NetBSD"
|
||||
# PKG_SUGGESTED_OPTIONS+= try_dev_wskbd
|
||||
# .endif
|
||||
|
||||
# From OpenBSD 6.5 xenocara xserver 1.19.6
|
||||
.if ${OPSYS} == "OpenBSD"
|
||||
PKG_SUGGESTED_OPTIONS+= fallback_not_wsdisplay
|
||||
|
|
@ -83,15 +96,11 @@ PKG_SUGGESTED_OPTIONS+= randr_backlight
|
|||
.endif
|
||||
|
||||
# From OpenBSD 6.5 xenocara xserver 1.19.6
|
||||
.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD"
|
||||
# .if ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD"
|
||||
.if ${OPSYS} == "OpenBSD"
|
||||
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
|
||||
|
|
@ -173,6 +182,13 @@ CONFIGURE_ARGS+= --without-dtrace
|
|||
# SUBST_FILES.devd_dix+= include/dix-config.h
|
||||
# SUBST_SED.devd_dix+= -e 's|/\* \#undef CONFIG_UDEV \*/|\#define CONFIG_DEVD 1 |'
|
||||
CPPFLAGS+= -DCONFIG_DEVD=1
|
||||
MESON_ARGS+= -Ddevd=true
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mxkb_evdev)
|
||||
MESON_ARGS+= -Dxkb_default_rules=evdev
|
||||
.else
|
||||
MESON_ARGS+= -Dxkb_default_rules=base
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mrevert_flink)
|
||||
|
|
@ -189,22 +205,20 @@ SUBST_FILES.lease+= hw/xfree86/modes/xf86Crtc.h
|
|||
SUBST_SED.lease+= -e 's|XF86_LEASE_VERSION|REVERT_XF86_LEASE_VERSION|g'
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mallow_unprivileged)
|
||||
CPPFLAGS+= -DALLOW_UNPRIVILEGED
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mxkb_evdev)
|
||||
MESON_ARGS+= -Dxkb_default_rules=evdev
|
||||
.else
|
||||
MESON_ARGS+= -Dxkb_default_rules=base
|
||||
.if !empty(PKG_OPTIONS:Madd_scfb_driver)
|
||||
CPPFLAGS+= -DADD_SCFB_DRIVER
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Madd_modesetting_driver)
|
||||
CPPFLAGS+= -DADD_MODESETTING_DRIVER
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Madd_scfb_driver)
|
||||
CPPFLAGS+= -DADD_SCFB_DRIVER
|
||||
.if !empty(PKG_OPTIONS:Mallow_unprivileged)
|
||||
CPPFLAGS+= -DALLOW_UNPRIVILEGED
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Motherid_xsrc_netbsd)
|
||||
CPPFLAGS+= -DOTHERID_XSRC_NETBSD
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mstrict_xsrc_netbsd)
|
||||
|
|
@ -215,6 +229,12 @@ CPPFLAGS+= -DSTRICT_XSRC_NETBSD
|
|||
CPPFLAGS+= -DMODESETTING_ON_INTEL
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mtry_dev_wskbd)
|
||||
CPPFLAGS+= -DTRY_DEV_WSKBD
|
||||
CPPFLAGS+= -DCONFIG_WSCONS=1
|
||||
MESON_ARGS+= -Dwscons=true
|
||||
.endif
|
||||
|
||||
.if !empty(PKG_OPTIONS:Mfallback_not_wsdisplay)
|
||||
CPPFLAGS+= -DFALLBACK_NOT_WSDISPLAY
|
||||
.endif
|
||||
|
|
@ -235,11 +255,6 @@ 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
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
$NetBSD$
|
||||
|
||||
--- glx/glxcmds.c.orig 2019-02-26 19:28:50.000000000 +0000
|
||||
+++ glx/glxcmds.c
|
||||
@@ -1137,6 +1137,9 @@ __glXDrawableInit(__GLXdrawable * drawab
|
||||
drawable->pDraw = pDraw;
|
||||
drawable->type = type;
|
||||
drawable->drawId = drawId;
|
||||
+#if defined(OTHERID_XSRC_NETBSD)
|
||||
+ drawable->otherId = 0;
|
||||
+#endif
|
||||
drawable->config = config;
|
||||
drawable->eventMask = 0;
|
||||
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
$NetBSD$
|
||||
|
||||
--- glx/glxdrawable.h.orig 2019-02-26 19:28:50.000000000 +0000
|
||||
+++ glx/glxdrawable.h
|
||||
@@ -53,6 +53,9 @@ struct __GLXdrawable {
|
||||
|
||||
DrawablePtr pDraw;
|
||||
XID drawId;
|
||||
+#if defined(OTHERID_XSRC_NETBSD)
|
||||
+ XID otherId; /* for glx1.3 we need to track the original Drawable as well */
|
||||
+#endif
|
||||
|
||||
/*
|
||||
** Either GLX_DRAWABLE_PIXMAP, GLX_DRAWABLE_WINDOW or
|
||||
|
|
@ -0,0 +1,33 @@
|
|||
$NetBSD$
|
||||
|
||||
--- glx/glxext.c.orig 2019-02-26 19:28:50.000000000 +0000
|
||||
+++ glx/glxext.c
|
||||
@@ -97,6 +97,20 @@ DrawableGone(__GLXdrawable * glxPriv, XI
|
||||
{
|
||||
__GLXcontext *c, *next;
|
||||
|
||||
+#if defined(OTHERID_XSRC_NETBSD)
|
||||
+ if (glxPriv->type == GLX_DRAWABLE_WINDOW || glxPriv->type == GLX_DRAWABLE_PIXMAP) {
|
||||
+ /* If this was created by glXCreateWindow, free the matching resource */
|
||||
+ if (glxPriv->otherId) {
|
||||
+ XID other = glxPriv->otherId;
|
||||
+ glxPriv->otherId = 0;
|
||||
+ if (xid == other)
|
||||
+ FreeResourceByType(glxPriv->drawId, __glXDrawableRes, TRUE);
|
||||
+ else
|
||||
+ FreeResourceByType(other, __glXDrawableRes, TRUE);
|
||||
+ }
|
||||
+ /* otherwise this window was implicitly created by MakeCurrent */
|
||||
+ }
|
||||
+#else
|
||||
if (glxPriv->type == GLX_DRAWABLE_WINDOW) {
|
||||
/* If this was created by glXCreateWindow, free the matching resource */
|
||||
if (glxPriv->drawId != glxPriv->pDraw->id) {
|
||||
@@ -107,6 +121,7 @@ DrawableGone(__GLXdrawable * glxPriv, XI
|
||||
}
|
||||
/* otherwise this window was implicitly created by MakeCurrent */
|
||||
}
|
||||
+#endif
|
||||
|
||||
for (c = glxAllContexts; c; c = next) {
|
||||
next = c->next;
|
||||
|
|
@ -1,8 +1,18 @@
|
|||
$NetBSD$
|
||||
|
||||
--- include/meson.build.orig 2019-03-13 16:07:36.000000000 +0000
|
||||
--- include/meson.build.orig 2019-03-20 23:09:22.000000000 +0000
|
||||
+++ include/meson.build
|
||||
@@ -254,7 +254,7 @@ supports_syscons = false
|
||||
@@ -89,7 +89,8 @@ conf_data.set('HAVE_DBUS', build_dbus)
|
||||
conf_data.set('CONFIG_HAL', build_hal)
|
||||
conf_data.set('SYSTEMD_LOGIND', build_systemd_logind)
|
||||
conf_data.set('NEED_DBUS', build_systemd_logind or build_hal)
|
||||
-conf_data.set('CONFIG_WSCONS', host_machine.system() == 'openbsd')
|
||||
+conf_data.set('CONFIG_WSCONS', host_machine.system() == 'openbsd' or build_wscons)
|
||||
+conf_data.set('CONFIG_DEVD', build_devd)
|
||||
|
||||
conf_data.set('HAVE_XSHMFENCE', xshmfence_dep.found())
|
||||
conf_data.set('WITH_LIBDRM', libdrm_dep.found())
|
||||
@@ -254,7 +255,7 @@ supports_syscons = false
|
||||
supports_wscons = false
|
||||
csrg_based = false
|
||||
|
||||
|
|
@ -11,7 +21,7 @@ $NetBSD$
|
|||
supports_pccons = true
|
||||
supports_pcvt = true
|
||||
supports_syscons = true
|
||||
@@ -344,14 +344,17 @@ xorg_data.set_quoted('PCI_TXT_IDS_PATH',
|
||||
@@ -344,14 +345,17 @@ xorg_data.set_quoted('PCI_TXT_IDS_PATH',
|
||||
xorg_data.set('XSERVER_PLATFORM_BUS', build_udev)
|
||||
xorg_data.set('WSCONS_SUPPORT', host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd')
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,14 @@
|
|||
$NetBSD$
|
||||
|
||||
--- meson.build.orig 2019-03-20 23:09:22.000000000 +0000
|
||||
+++ meson.build
|
||||
@@ -155,6 +155,9 @@ if host_machine.system() == 'windows'
|
||||
hal_option = 'false'
|
||||
endif
|
||||
|
||||
+build_wscons = get_option('wscons')
|
||||
+build_devd = get_option('devd')
|
||||
+
|
||||
if get_option('systemd_logind') == 'auto'
|
||||
build_systemd_logind = build_udev and dbus_dep.found()
|
||||
else
|
||||
|
|
@ -0,0 +1,13 @@
|
|||
$NetBSD$
|
||||
|
||||
--- meson_options.txt.orig 2019-03-20 23:09:22.000000000 +0000
|
||||
+++ meson_options.txt
|
||||
@@ -64,6 +64,8 @@ option('pciaccess', type: 'boolean', val
|
||||
option('udev', type: 'boolean', value: 'true')
|
||||
option('hal', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
|
||||
description: 'Enable HAL integration')
|
||||
+option('wscons', type: 'boolean', value: 'false')
|
||||
+option('devd', type: 'boolean', value: 'false')
|
||||
option('systemd_logind', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
|
||||
description: 'Enable systemd-logind integration')
|
||||
option('vbe', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
|
||||
Loading…
Reference in New Issue