xserver: Branch 'master' - 9 commits
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Aug 9 17:56:29 UTC 2018
hw/xfree86/common/meson.build | 14 +++++++++++++-
hw/xfree86/os-support/bsd/Makefile.am | 2 +-
hw/xfree86/os-support/hurd/Makefile.am | 2 +-
hw/xfree86/os-support/linux/Makefile.am | 2 +-
hw/xfree86/os-support/meson.build | 19 +++++++++++++++++--
hw/xfree86/os-support/solaris/Makefile.am | 2 +-
hw/xquartz/meson.build | 20 +++++++++++++-------
include/meson.build | 22 +++++++++-------------
meson.build | 10 ++++++++--
meson_options.txt | 2 ++
os/meson.build | 12 ++++++++++++
11 files changed, 78 insertions(+), 29 deletions(-)
New commits:
commit 1fc20b985cc888345bc8c6fce7b43f10ce71fe43
Author: Eric Anholt <eric at anholt.net>
Date: Tue Aug 7 16:23:19 2018 -0700
meson: Add detection of libsystemd-daemon.
This enables Xtrans's systemd socket activation.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/include/meson.build b/include/meson.build
index 2c139e6b0..9a7547c47 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -72,7 +72,8 @@ elif cc.compiles('''
endif
conf_data.set('HAVE_LIBBSD', libbsd_dep.found())
-# XXX: HAVE_SYSTEMD_DAEMON
+# Note: this symbol is used by libXtrans.
+conf_data.set('HAVE_SYSTEMD_DAEMON', libsystemd_daemon_dep.found())
conf_data.set('CONFIG_UDEV', build_udev)
conf_data.set('CONFIG_UDEV_KMS', build_udev)
conf_data.set('HAVE_DBUS', build_dbus)
diff --git a/meson.build b/meson.build
index ec79479d9..e7ce68a50 100644
--- a/meson.build
+++ b/meson.build
@@ -96,6 +96,12 @@ nettle_dep = dependency('nettle')
dbus_required = get_option('systemd_logind') == 'true'
dbus_dep = dependency('dbus-1', version: '>= 1.0', required: dbus_required)
+# libsystemd-daemon was moved into libsystemd in version 209
+libsystemd_daemon_dep = dependency('libsystemd', version: '>= 209', required: false)
+if not libsystemd_daemon_dep.found()
+ libsystemd_daemon_dep = dependency('libsystemd-daemon', required: false)
+endif
+
build_hashtable = false
# Resolve default values of some options
@@ -455,6 +461,7 @@ common_dep = [
xcmiscproto_dep,
bigreqsproto_dep,
xtrans_dep,
+ libsystemd_daemon_dep,
videoproto_dep,
compositeproto_dep,
commit 4ba786677050684c8801201f6bd83ce884f2885e
Author: Eric Anholt <eric at anholt.net>
Date: Tue Aug 7 16:23:18 2018 -0700
meson: Get close to parity with autotools for CLIENTIDS tracking.
The client ID is only needed for XRes, and autotools build ignores the
--clientids= arg if xres is disabled. We haven't made a meson option
for disabling tracking client ids (is it actually worth a build
option?), so just make this depend on xres.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/include/meson.build b/include/meson.build
index 6d08b0573..2c139e6b0 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -182,8 +182,6 @@ conf_data.set('TCPCONN', '1')
conf_data.set('UNIXCONN', '1')
conf_data.set('IPv6', build_ipv6)
-conf_data.set('CLIENTIDS', '1') # XXX
-
conf_data.set('BIGREQS', '1')
conf_data.set('COMPOSITE', '1')
conf_data.set('DAMAGE', '1')
diff --git a/os/meson.build b/os/meson.build
index 0e41f9c02..f6313807a 100644
--- a/os/meson.build
+++ b/os/meson.build
@@ -66,6 +66,16 @@ if get_option('secure-rpc')
srcs_os += 'rpcauth.c'
endif
+os_dep = []
+os_c_args = []
+if get_option('xres')
+ # Only the XRes extension cares about the client ID.
+ os_c_args += '-DCLIENTIDS'
+ if host_machine.system() == 'openbsd'
+ os_deps += cc.find_library('kvm')
+ endif
+endif
+
libxlibc = []
if srcs_libc.length() > 0
libxlibc = static_library('libxlibc',
@@ -85,7 +95,9 @@ libxserver_os = static_library('libxserver_os',
dl_dep,
sha1_dep,
rpc_dep,
+ os_dep,
dependency('xau')
],
+ c_args: os_c_args,
link_with: libxlibc,
)
commit e047da37becc23a8d2549d8f264aaa18e4965186
Author: Eric Anholt <eric at anholt.net>
Date: Tue Aug 7 16:23:17 2018 -0700
meson: Add missing setup of the NO_LOCAL_CLIENT_CRED define.
Ported from autotools.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/include/meson.build b/include/meson.build
index 13ca1f8f8..6d08b0573 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -45,7 +45,6 @@ if cc.sizeof('unsigned long') == 8
endif
conf_data.set('_GNU_SOURCE', '1')
-# XXX: NO_LOCAL_CLIENT_CRED
# autoconf checks for /dev/xf86 here, but the test should be based on
# the target, not the build system. Could we get rid of this and just
@@ -173,6 +172,12 @@ if cc.has_header_symbol('sys/socket.h', 'SCM_RIGHTS')
conf_data.set('XTRANS_SEND_FDS', '1')
endif
+if not conf_data.get('HAVE_GETPEEREID') and not conf_data.get('HAVE_GETPEERUCRED')
+ if not cc.has_header_symbol('sys/socket.h', 'SO_PEERCRED')
+ conf_data.set('NO_LOCAL_CLIENT_CRED', 1)
+ endif
+endif
+
conf_data.set('TCPCONN', '1')
conf_data.set('UNIXCONN', '1')
conf_data.set('IPv6', build_ipv6)
commit 049d2346abee091f18e6f62bcf7331267c2ba656
Author: Eric Anholt <eric at anholt.net>
Date: Tue Aug 7 16:23:16 2018 -0700
meson: Make FALLBACK_INPUT_DRIVER configurable in meson.
This makes us match the featureset of autotools, and also fixes the
non-Linux default value to match.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xfree86/common/meson.build b/hw/xfree86/common/meson.build
index 514999ff6..3e617dc36 100644
--- a/hw/xfree86/common/meson.build
+++ b/hw/xfree86/common/meson.build
@@ -47,6 +47,15 @@ xorg_sdk_headers = [
'xaarop.h',
]
+fallback_driver = get_option('fallback_input_driver')
+if fallback_driver == 'auto'
+ if host_machine.system() == 'linux'
+ fallback_driver = 'libinput'
+ else
+ fallback_driver = ''
+ endif
+endif
+
if build_dga
srcs_xorg_common += 'xf86DGA.c'
xorg_sdk_headers += 'dgaproc.h'
@@ -87,7 +96,10 @@ xorg_common = static_library('xorg_common',
pciaccess_dep,
libdrm_dep,
],
- c_args: xorg_c_args,
+ c_args: [
+ xorg_c_args,
+ '-DFALLBACK_INPUT_DRIVER="@0@"'.format(fallback_driver)
+ ],
)
install_data(xorg_sdk_headers, install_dir: xorgsdkdir)
diff --git a/include/meson.build b/include/meson.build
index 52fb837b9..13ca1f8f8 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -52,7 +52,6 @@ conf_data.set('_GNU_SOURCE', '1')
# ifdef for openbsd?
conf_data.set('HAS_APERTURE_DRV', host_machine.system() == 'openbsd')
-# XXX: FALLBACK_INPUT_DRIVER
# XXX: BUNDLE_ID_PREFIX
conf_data.set_quoted('OSNAME', 'Linux') # XXX
conf_data.set('HAVE_INPUTTHREAD', '1') # XXX
@@ -329,7 +328,6 @@ xorg_data.set_quoted('DEFAULT_XDG_DATA_HOME', '.local/share')
xorg_data.set_quoted('DEFAULT_XDG_DATA_HOME_LOGDIR', 'xorg')
xorg_data.set_quoted('DEFAULT_LOGDIR', log_dir)
xorg_data.set_quoted('DEFAULT_LOGPREFIX', 'Xorg.')
-xorg_data.set_quoted('FALLBACK_INPUT_DRIVER', 'libinput')
xorg_data.set_quoted('DEFAULT_MODULE_PATH', join_paths(get_option('prefix'), module_dir))
xorg_data.set_quoted('DEFAULT_LIBRARY_PATH', join_paths(get_option('prefix'), get_option('libdir')))
xorg_data.set_quoted('__XSERVERNAME__', 'Xorg')
diff --git a/meson_options.txt b/meson_options.txt
index 3453b8df5..8c600f398 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -40,6 +40,8 @@ option('xkb_default_layout', type: 'string', value: 'us')
option('xkb_default_variant', type: 'string')
option('xkb_default_options', type: 'string')
+option('fallback_input_driver', type: 'string', value: 'auto')
+
option('vendor_name', type: 'string', value: 'The X.Org Foundation')
option('vendor_name_short', type: 'string', value: 'X.Org')
option('vendor_web', type: 'string', value: 'http://wiki.x.org')
commit 97bd8bc9cb6d910420627760288696e2a0c5d226
Author: Eric Anholt <eric at anholt.net>
Date: Tue Aug 7 16:23:14 2018 -0700
meson: Make xf86vidmodeproto mandatory.
This is silly to have optional based on detection of the protocol
headers, particularly now that we have a single protocol header repo
to install.
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
Signed-off-by: Eric Anholt <eric at anholt.net>
diff --git a/include/meson.build b/include/meson.build
index 43d70d594..52fb837b9 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -204,7 +204,7 @@ conf_data.set('XCSECURITY', build_xsecurity)
conf_data.set('XDMCP', xdmcp_dep.found())
conf_data.set('XF86BIGFONT', build_xf86bigfont)
conf_data.set('XF86DRI', build_dri1)
-conf_data.set('XF86VIDMODE', build_xf86vidmode)
+conf_data.set('XF86VIDMODE', 1)
conf_data.set('XFIXES', '1')
conf_data.set('XFreeXDGA', build_dga)
conf_data.set('XINERAMA', build_xinerama)
diff --git a/meson.build b/meson.build
index cd1e4a58c..ec79479d9 100644
--- a/meson.build
+++ b/meson.build
@@ -81,7 +81,7 @@ dri2proto_dep = dependency('dri2proto', version: '>= 2.8', required: get_option(
dri3proto_dep = dependency('dri3proto', version: '>= 1.2', required: get_option('dri3') == 'true')
xineramaproto_dep = dependency('xineramaproto')
xf86bigfontproto_dep = dependency('xf86bigfontproto', version: '>= 1.2.0')
-xf86vidmodeproto_dep = dependency('xf86vidmodeproto', version: '>= 2.2.99.1', required: false)
+xf86vidmodeproto_dep = dependency('xf86vidmodeproto', version: '>= 2.2.99.1')
windowswmproto_dep = dependency('windowswmproto', required: false)
applewmproto_dep = dependency('applewmproto', version: '>= 1.4', required: false)
xshmfence_dep = dependency('xshmfence', version: '>= 1.1', required: false)
@@ -438,7 +438,6 @@ endif
# XXX: Allow configuration of these.
build_xselinux = false
-build_xf86vidmode = xf86vidmodeproto_dep.found()
m_dep = cc.find_library('m', required : false)
dl_dep = cc.find_library('dl', required : false)
commit db53c439ba785a16f789918fe66da6ba161a0742
Author: Eric Anholt <eric at anholt.net>
Date: Tue Aug 7 16:23:13 2018 -0700
meson: Add linking to x86 iopl libs on BSDs.
Ported from automake.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build
index 49b138ed2..65418b74a 100644
--- a/hw/xfree86/os-support/meson.build
+++ b/hw/xfree86/os-support/meson.build
@@ -100,8 +100,16 @@ elif host_machine.system().endswith('bsd')
if host_machine.cpu_family() == 'x86_64'
srcs_xorg_os_support += 'bsd/i386_video.c'
+ if host_machine.system() == 'netbsd'
+ os_dep += cc.find_library('x86_64')
+ elif host_machine.system() == 'openbsd'
+ os_dep += cc.find_library('amd64')
+ endif
elif host_machine.cpu_family() == 'x86'
srcs_xorg_os_support += 'bsd/i386_video.c'
+ if host_machine.system() == 'netbsd' or host_machine.system() == 'openbsd'
+ os_dep += cc.find_library('i386')
+ endif
elif host_machine.cpu_family() == 'arm'
srcs_xorg_os_support += 'bsd/arm_video.c'
elif host_machine.cpu_family() == 'powerpc'
diff --git a/include/meson.build b/include/meson.build
index 43139fa97..43d70d594 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -343,12 +343,10 @@ if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonflybsd'
xorg_data.set('USE_DEV_IO', true)
endif
elif host_machine.system() == 'netbsd'
- # XXX: Add link to libi386
if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64'
xorg_data.set('USE_I386_IOPL', true)
endif
elif host_machine.system() == 'openbsd'
- # XXX: Add link to libi386, libamd64
if host_machine.cpu_family() == 'x86'
xorg_data.set('USE_I386_IOPL', true)
endif
commit 9869512cbf1bd87146f59106c0c71bda76cc0dcc
Author: Eric Anholt <eric at anholt.net>
Date: Tue Aug 7 16:23:12 2018 -0700
meson: Add HAVE_LIBDISPATCH define to xquartz build.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xquartz/meson.build b/hw/xquartz/meson.build
index f92fbc960..ebb24132c 100644
--- a/hw/xquartz/meson.build
+++ b/hw/xquartz/meson.build
@@ -17,6 +17,18 @@ srcs = [
'../../mi/miinitext.c',
]
+xquartz_c_args = [
+ '-DXFree86Server',
+ # XXXX: BUILD_DATE
+ '-DXSERVER_VERSION="' + meson_project.version() + '"',
+ '-DINXQUARTZ',
+ '-DUSE_NEW_CLUT',
+]
+
+if cc.has_function('dispatch_async')
+ xquartz_c_args += '-DHAVE_LIBDISPATCH'
+endif
+
executable(
'Xquartz',
srcs,
@@ -29,12 +41,6 @@ executable(
libxserver_glx,
libxserver_pseudoramix,
],
- c_args: [
- '-DXFree86Server',
- # XXXX: BUILD_DATE
- '-DXSERVER_VERSION="' + meson_project.version() + '"',
- '-DINXQUARTZ',
- '-DUSE_NEW_CLUT',
- ],
+ c_args: xquartz_c_args,
install: true,
)
diff --git a/include/meson.build b/include/meson.build
index 3548ac3c9..43139fa97 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -54,7 +54,6 @@ conf_data.set('HAS_APERTURE_DRV', host_machine.system() == 'openbsd')
# XXX: FALLBACK_INPUT_DRIVER
# XXX: BUNDLE_ID_PREFIX
-# XXX: HAVE_LIBDISPATCH
conf_data.set_quoted('OSNAME', 'Linux') # XXX
conf_data.set('HAVE_INPUTTHREAD', '1') # XXX
commit 843e44adf17b2828991a26ac3f8f82cf2fa63bd3
Author: Eric Anholt <eric at anholt.net>
Date: Tue Aug 7 16:23:11 2018 -0700
meson: Add PIO access support for FreeBSD and NetBSD on Alpha.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build
index 512bc8c1f..49b138ed2 100644
--- a/hw/xfree86/os-support/meson.build
+++ b/hw/xfree86/os-support/meson.build
@@ -11,6 +11,9 @@ hdrs_xorg_os_support = [
'xf86_OSproc.h'
]
+os_dep = []
+os_c_args = []
+
if get_option('pciaccess')
srcs_xorg_os_support += 'bus/Pci.c'
if host_machine.system() != 'linux' and host_machine.system() != 'solaris'
@@ -108,6 +111,11 @@ elif host_machine.system().endswith('bsd')
srcs_xorg_os_support += 'shared/ioperm_noop.c'
elif host_machine.cpu_family() == 'alpha'
srcs_xorg_os_support += 'bsd/alpha_video.c'
+ if host_machine.system() == 'freebsd'
+ os_dep += cc.find_library('io')
+ elif host_machine.system() == 'netbsd'
+ os_c_args += '-DUSE_ALPHA_PIO'
+ endif
endif
if host_machine.system() == 'freebsd'
@@ -145,8 +153,9 @@ xorg_os_support = static_library('xorg_os_support',
common_dep,
dbus_dep,
libdrm_dep,
+ os_dep,
],
- c_args: xorg_c_args,
+ c_args: xorg_c_args + os_c_args,
)
install_data(hdrs_xorg_os_support, install_dir: xorgsdkdir)
diff --git a/include/meson.build b/include/meson.build
index 678555692..3548ac3c9 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -52,7 +52,6 @@ conf_data.set('_GNU_SOURCE', '1')
# ifdef for openbsd?
conf_data.set('HAS_APERTURE_DRV', host_machine.system() == 'openbsd')
-# XXX: USE_ALPHA_PIO and other bsd bits
# XXX: FALLBACK_INPUT_DRIVER
# XXX: BUNDLE_ID_PREFIX
# XXX: HAVE_LIBDISPATCH
@@ -344,9 +343,7 @@ if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonflybsd'
if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64'
xorg_data.set('USE_DEV_IO', true)
endif
- # XXX: Add link to libio on alpha
elif host_machine.system() == 'netbsd'
- # XXX: USE_ALPHA_PIO
# XXX: Add link to libi386
if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64'
xorg_data.set('USE_I386_IOPL', true)
commit 513d52d58915f291c0f706b67b8dc73f45de109f
Author: Eric Anholt <eric at anholt.net>
Date: Tue Aug 7 16:23:10 2018 -0700
meson, automake: Drop unused USESTDRES cflag setup.
Nothing in tree references the flag.
Signed-off-by: Eric Anholt <eric at anholt.net>
Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
diff --git a/hw/xfree86/os-support/bsd/Makefile.am b/hw/xfree86/os-support/bsd/Makefile.am
index 66ac83805..90d9e555f 100644
--- a/hw/xfree86/os-support/bsd/Makefile.am
+++ b/hw/xfree86/os-support/bsd/Makefile.am
@@ -49,7 +49,7 @@ ARCH_SOURCES = \
endif
# FIXME: NetBSD Aperture defines (configure.ac)
-AM_CFLAGS = -DUSESTDRES $(XORG_CFLAGS) $(DIX_CFLAGS)
+AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS)
AM_CPPFLAGS = $(XORG_INCS)
diff --git a/hw/xfree86/os-support/hurd/Makefile.am b/hw/xfree86/os-support/hurd/Makefile.am
index 38660544a..33857f459 100644
--- a/hw/xfree86/os-support/hurd/Makefile.am
+++ b/hw/xfree86/os-support/hurd/Makefile.am
@@ -10,6 +10,6 @@ libhurd_la_SOURCES = hurd_bell.c hurd_init.c \
$(srcdir)/../shared/kmod_noop.c \
$(srcdir)/../shared/agp_noop.c
-AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS)
+AM_CFLAGS = -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS)
AM_CPPFLAGS = $(XORG_INCS)
diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am
index 9b4535b53..aa76a7b92 100644
--- a/hw/xfree86/os-support/linux/Makefile.am
+++ b/hw/xfree86/os-support/linux/Makefile.am
@@ -28,6 +28,6 @@ liblinux_la_SOURCES = linux.h lnx_init.c lnx_video.c \
$(APM_SRCS) \
$(LOGIND_SRCS)
-AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
+AM_CFLAGS = -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES)
AM_CPPFLAGS = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS)
diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build
index fb282be82..512bc8c1f 100644
--- a/hw/xfree86/os-support/meson.build
+++ b/hw/xfree86/os-support/meson.build
@@ -11,8 +11,6 @@ hdrs_xorg_os_support = [
'xf86_OSproc.h'
]
-os_support_flags = ['-DUSESTDRES']
-
if get_option('pciaccess')
srcs_xorg_os_support += 'bus/Pci.c'
if host_machine.system() != 'linux' and host_machine.system() != 'solaris'
diff --git a/hw/xfree86/os-support/solaris/Makefile.am b/hw/xfree86/os-support/solaris/Makefile.am
index e534bc8dc..ae109ff09 100644
--- a/hw/xfree86/os-support/solaris/Makefile.am
+++ b/hw/xfree86/os-support/solaris/Makefile.am
@@ -29,7 +29,7 @@ nodist_libsolaris_la_SOURCES = $(SOLARIS_INOUT_SRC)
sdk_HEADERS =
nodist_sdk_HEADERS = solaris- at SOLARIS_INOUT_ARCH@.il
-AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS)
+AM_CFLAGS = -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(DIX_CFLAGS)
AM_CPPFLAGS = $(XORG_INCS)
More information about the xorg-commit
mailing list