rtyler
/
pkgsrc-wip
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

This commit is contained in:
David Shao 2019-05-23 23:18:56 -07:00
parent 9a3f954ef6
commit f6cb29d2e2
4 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modular-xorg-server-dfbsd-meson/Makefile
View File

@ -20,10 +20,10 @@ CONFIGURE_ARGS+= --enable-xorg
CONFIGURE_ARGS+= --disable-xephyr
CONFIGURE_ARGS+= --disable-kdrive
CONFIGURE_ARGS.SunOS+= --disable-input-thread
MESON_ARGS+= -Dxorg=true
MESON_ARGS+= -Dxephyr=false
MESON_ARGS+= -Dxorg=true
MESON_ARGS+= -Dxephyr=false
.if ${OPSYS} == "SunOS"
MESON_ARGS+= -Dinput_thread=false
MESON_ARGS+= -Dinput_thread=false
.endif
.include "options.mk"

5
modular-xorg-server-dfbsd-meson/Makefile.common
View File

@ -2,8 +2,11 @@
# used by x11/modular-xorg-server/Makefile
# used by x11/modular-xorg-xephyr/Makefile
# 2019-05-20 xwayland: Avoid a crash on pointer enter with a grab
COMMIT_ID= 0a07446318f248b65fcbc8ab8a73ead51153f09e
# 2019-05-07 os: add support for systemd notification
COMMIT_ID= bb46e785405891775a30636a647e40a7dc4d1ca7
# COMMIT_ID= bb46e785405891775a30636a647e40a7dc4d1ca7
# 2019-05-02 travis: Suppress uninteresting warnings on OSX
# COMMIT_ID= dd1aebccf2e1722ac10fb73ed438251785283b8d

8
modular-xorg-server-dfbsd-meson/distinfo
View File

@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.94 2019/02/28 12:32:39 tnn Exp $
SHA1 (xserver-bb46e785405891775a30636a647e40a7dc4d1ca7.tar.xz) = 622bb8182f1962f6882ea0255d07f860570ea853
RMD160 (xserver-bb46e785405891775a30636a647e40a7dc4d1ca7.tar.xz) = db2e3ecdb0d3601954ede83416c8ea8d94d01eb5
SHA512 (xserver-bb46e785405891775a30636a647e40a7dc4d1ca7.tar.xz) = ea156fe86d17e22046782b2dc35887b17491d54e84a5535a1e3a0a8ef385bd7b0692bb57bd18f3aa344de485100768ab3152d7d017ec6d8e0e4cd69db99fb700
Size (xserver-bb46e785405891775a30636a647e40a7dc4d1ca7.tar.xz) = 3091440 bytes
SHA1 (xserver-0a07446318f248b65fcbc8ab8a73ead51153f09e.tar.xz) = 6296dfff5d620df75f6c2c067d087626112ab342
RMD160 (xserver-0a07446318f248b65fcbc8ab8a73ead51153f09e.tar.xz) = faebf896379766256e7fcb720ed3ea127f589e02
SHA512 (xserver-0a07446318f248b65fcbc8ab8a73ead51153f09e.tar.xz) = 40c951224cbf7ebeadbd5ee62ea5c4b8e21304649cb58103955a2c88d3e8003779dbc23e4f1e01cd5e897d5a8df02575719e361a0fb63ec756666e0011f2cd36
Size (xserver-0a07446318f248b65fcbc8ab8a73ead51153f09e.tar.xz) = 3091848 bytes
SHA1 (patch-Xext_xf86bigfont.c) = 0d8b9f84f3441764d990c0d7ee41dc34e5430cde
SHA1 (patch-config_config-backends.h) = f44868caa51e972a76949f73ac6083640af2c351
SHA1 (patch-config_config.c) = 5a3fe4cb6c2170335ab547f438386cff77a9c152

68
modular-xorg-server-dfbsd-meson/options.mk
View File

@ -8,30 +8,30 @@ PKG_SUPPORTED_OPTIONS+= dri
PKG_SUGGESTED_OPTIONS+= dri
.endif
PKG_SUPPORTED_OPTIONS+= devd
PKG_SUPPORTED_OPTIONS+= xkb_evdev
PKG_SUPPORTED_OPTIONS+= devd
PKG_SUPPORTED_OPTIONS+= xkb_evdev
PKG_SUPPORTED_OPTIONS+= revert_flink
PKG_SUPPORTED_OPTIONS+= revert_randr_lease
PKG_SUPPORTED_OPTIONS+= add_scfb_driver
PKG_SUPPORTED_OPTIONS+= add_modesetting_driver
PKG_SUPPORTED_OPTIONS+= revert_flink
PKG_SUPPORTED_OPTIONS+= revert_randr_lease
PKG_SUPPORTED_OPTIONS+= add_scfb_driver
PKG_SUPPORTED_OPTIONS+= add_modesetting_driver
PKG_SUPPORTED_OPTIONS+= allow_unprivileged
PKG_SUPPORTED_OPTIONS+= allow_unprivileged
PKG_SUPPORTED_OPTIONS+= otherid_xsrc_netbsd
PKG_SUPPORTED_OPTIONS+= strict_xsrc_netbsd
PKG_SUPPORTED_OPTIONS+= strict_xsrc_netbsd
PKG_SUPPORTED_OPTIONS+= modesetting_on_intel
PKG_SUPPORTED_OPTIONS+= try_dev_wskbd
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+= 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
.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
PKG_SUGGESTED_OPTIONS+= devd
PKG_SUGGESTED_OPTIONS+= devd
.endif
.if ${OPSYS} == "DragonFly"
@ -41,12 +41,12 @@ PKG_SUGGESTED_OPTIONS+= revert_randr_lease
# Add scfb driver in xf86AutoConfig.c
.if ${OPSYS} == "FreeBSD"
PKG_SUGGESTED_OPTIONS+= add_scfb_driver
PKG_SUGGESTED_OPTIONS+= add_scfb_driver
.endif
# Add modesetting driver in xf86AutoConfig.c
.if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
PKG_SUGGESTED_OPTIONS+= add_modesetting_driver
PKG_SUGGESTED_OPTIONS+= add_modesetting_driver
.endif
.if ${OPSYS} == "NetBSD"
@ -54,17 +54,17 @@ PKG_SUGGESTED_OPTIONS+= allow_unprivileged
.endif
.if ${OPSYS} == "NetBSD"
PKG_SUGGESTED_OPTIONS+= otherid_xsrc_netbsd
PKG_SUGGESTED_OPTIONS+= otherid_xsrc_netbsd
.endif
.if ${OPSYS} == "NetBSD"
PKG_SUGGESTED_OPTIONS+= strict_xsrc_netbsd
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"
PKG_SUGGESTED_OPTIONS+= modesetting_on_intel
PKG_SUGGESTED_OPTIONS+= modesetting_on_intel
.endif
# From NetBSD 1.20.4 but extended to amd64 and i386
@ -74,31 +74,31 @@ PKG_SUGGESTED_OPTIONS+= modesetting_on_intel
# From OpenBSD 6.5 xenocara xserver 1.19.6
.if ${OPSYS} == "OpenBSD"
PKG_SUGGESTED_OPTIONS+= fallback_not_wsdisplay
PKG_SUGGESTED_OPTIONS+= fallback_not_wsdisplay
.endif
.if ${OPSYS} == "OpenBSD"
PKG_SUGGESTED_OPTIONS+= kbd_by_masking_bits
PKG_SUGGESTED_OPTIONS+= kbd_by_masking_bits
.endif
# Implement VT switching based on the USL compat interface
.if ${OPSYS} == "OpenBSD"
PKG_SUGGESTED_OPTIONS+= usl_vt_switching
PKG_SUGGESTED_OPTIONS+= usl_vt_switching
.endif
.if ${OPSYS} == "OpenBSD"
PKG_SUGGESTED_OPTIONS+= openbsd_more_calls
PKG_SUGGESTED_OPTIONS+= openbsd_more_calls
.endif
# From OpenBSD 6.5 xenocara xserver 1.19.6
.if ${OPSYS} == "OpenBSD"
PKG_SUGGESTED_OPTIONS+= randr_backlight
PKG_SUGGESTED_OPTIONS+= randr_backlight
.endif
# From OpenBSD 6.5 xenocara xserver 1.19.6
# .if ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD"
.if ${OPSYS} == "OpenBSD"
PKG_SUGGESTED_OPTIONS+= ws_drivers_openbsd
PKG_SUGGESTED_OPTIONS+= ws_drivers_openbsd
.endif
.include "../../mk/bsd.options.mk"
@ -181,7 +181,7 @@ CONFIGURE_ARGS+= --without-dtrace
# SUBST_MESSAGE.devd_dix= Patching include/dix-config.h for devd
# 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
CPPFLAGS+= -DCONFIG_DEVD=1
MESON_ARGS+= -Ddevd=true
.endif
@ -198,11 +198,11 @@ CPPFLAGS+= -DREVERT_FLINK
.if !empty(PKG_OPTIONS:Mrevert_randr_lease)
CPPFLAGS+= -DREVERT_RANDR_LEASE
SUBST_CLASSES+= lease
SUBST_STAGE.lease= post-configure
SUBST_MESSAGE.lease= Removing definition of XF86_LEASE_VERSION
SUBST_FILES.lease+= hw/xfree86/modes/xf86Crtc.h
SUBST_SED.lease+= -e 's|XF86_LEASE_VERSION|REVERT_XF86_LEASE_VERSION|g'
SUBST_CLASSES+= lease
SUBST_STAGE.lease= post-configure
SUBST_MESSAGE.lease= Removing definition of XF86_LEASE_VERSION
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:Madd_scfb_driver)