xserver: Branch 'master' - 4 commits
Adam Jackson
ajax at kemper.freedesktop.org
Fri Mar 2 20:08:58 UTC 2018
hw/xfree86/os-support/meson.build | 2 --
include/meson.build | 7 +++++--
meson.build | 26 ++++++++++++++++++++++++--
meson_options.txt | 6 ++++++
4 files changed, 35 insertions(+), 6 deletions(-)
New commits:
commit 43ffd572592d26bb78decfdf55e643bdfb011d3f
Author: Laurent Carlier <lordheavym at gmail.com>
Date: Thu Mar 1 12:58:16 2018 +0100
meson: Make SHM extension optional
v2: check for header 'sys/shm.h'
Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/include/meson.build b/include/meson.build
index 188b835bf..25239ad74 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -167,7 +167,7 @@ conf_data.set('DPMSExtension', build_dpms)
conf_data.set('DRI2', build_dri2)
conf_data.set('DRI3', build_dri3)
conf_data.set_quoted('DRI_DRIVER_PATH', dri_dep.get_pkgconfig_variable('dridriverdir'))
-conf_data.set('HAS_SHM', '1')
+conf_data.set('HAS_SHM', build_mitshm)
conf_data.set('MITSHM', build_mitshm)
conf_data.set('PANORAMIX', build_xinerama)
conf_data.set('PRESENT', '1')
diff --git a/meson.build b/meson.build
index 8e17c4f82..c66a2501c 100644
--- a/meson.build
+++ b/meson.build
@@ -387,8 +387,14 @@ if (get_option('linux_acpi') == true and
endif
endif
+build_mitshm = false
+if get_option('mitshm') == 'auto'
+ build_mitshm = cc.has_header('sys/shm.h')
+elif get_option('mitshm') == 'true'
+ build_mitshm = true
+endif
+
# XXX: Allow configuration of these.
-build_mitshm = true
build_xselinux = false
build_xf86vidmode = xf86vidmodeproto_dep.found()
diff --git a/meson_options.txt b/meson_options.txt
index c674d750a..d7af87d73 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -81,6 +81,8 @@ option('linux_apm', type: 'boolean', value: true,
description: 'APM support on Linux')
option('linux_acpi', type: 'boolean', value: true,
description: 'ACPI support on Linux')
+option('mitshm', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
+ description: 'SHM extension')
option('dri1', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI1 extension (default: auto)')
option('dri2', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI2 extension (default: auto)')
commit de4565727a0bb199365d33e3c98d9ddd3e0de6f2
Author: Laurent Carlier <lordheavym at gmail.com>
Date: Thu Mar 1 12:57:27 2018 +0100
meson: get rid of useless HAVE_SYSV_IPC
Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/xfree86/os-support/meson.build b/hw/xfree86/os-support/meson.build
index dfb613e32..2b96e7e4a 100644
--- a/hw/xfree86/os-support/meson.build
+++ b/hw/xfree86/os-support/meson.build
@@ -40,7 +40,6 @@ if host_machine.system() == 'linux'
endif
endif
- os_support_flags += '-DHAVE_SYSV_IPC'
elif host_machine.system() == 'solaris'
srcs_xorg_os_support += [
'solaris/sun_apm.c',
@@ -72,7 +71,6 @@ elif host_machine.system() == 'solaris'
error('Unknown CPU family for Solaris build')
endif
- os_support_flags += '-DHAVE_SYSV_IPC'
elif host_machine.system().endswith('bsd')
srcs_xorg_os_support += [
'bsd/bsd_VTsw.c',
diff --git a/include/meson.build b/include/meson.build
index c5597321d..188b835bf 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -53,7 +53,6 @@ conf_data.set('HAS_APERTURE_DRV', host_machine.system() == 'openbsd')
# XXX: BUNDLE_ID_PREFIX
# XXX: HAVE_LIBDISPATCH
conf_data.set_quoted('OSNAME', 'Linux') # XXX
-conf_data.set('HAVE_SYSV_IPC', '1') # XXX
conf_data.set('HAVE_INPUTTHREAD', '1') # XXX
conf_data.set('HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID', '1') # XXX
conf_data.set('HAVE_LIBBSD', libbsd_dep.found())
commit e02afb94783a25c21b07e44a7b615acdd86fa3f7
Author: Laurent Carlier <lordheavym at gmail.com>
Date: Thu Mar 1 12:56:28 2018 +0100
meson: Make ACPI support optional
v2: Define HAVE_ACPI in dix-config.h
Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/include/meson.build b/include/meson.build
index 45d27774a..c5597321d 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -199,6 +199,7 @@ conf_data.set('XvMCExtension', build_xvmc)
conf_data.set('HAVE_SHA1_IN_LIBNETTLE', '1') # XXX
conf_data.set('HAVE_APM', build_apm or build_acpi)
+conf_data.set('HAVE_ACPI', build_acpi)
enable_debugging = get_option('buildtype') == 'debug'
conf_data.set('DEBUG', enable_debugging)
@@ -257,7 +258,7 @@ xorg_data.set('XSERVER_LIBPCIACCESS', get_option('pciaccess'))
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')
-xorg_data.set('XF86PM', build_apm)
+xorg_data.set('XF86PM', build_apm or build_acpi)
if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonflybsd'
if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64'
diff --git a/meson.build b/meson.build
index 6a671587e..8e17c4f82 100644
--- a/meson.build
+++ b/meson.build
@@ -377,8 +377,17 @@ if (get_option('linux_apm') == true and
endif
endif
-# XXX: Allow configuration of these.
build_acpi = false
+if (get_option('linux_acpi') == true and
+ host_machine.system() == 'linux')
+ if (host_machine.cpu() == 'x86' or
+ host_machine.cpu() == 'x86_64' or
+ host_machine.cpu() == 'ia64')
+ build_acpi = true
+ endif
+endif
+
+# XXX: Allow configuration of these.
build_mitshm = true
build_xselinux = false
build_xf86vidmode = xf86vidmodeproto_dep.found()
diff --git a/meson_options.txt b/meson_options.txt
index 54cf61d78..c674d750a 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -79,6 +79,8 @@ option('dga', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
description: 'DGA extension')
option('linux_apm', type: 'boolean', value: true,
description: 'APM support on Linux')
+option('linux_acpi', type: 'boolean', value: true,
+ description: 'ACPI support on Linux')
option('dri1', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI1 extension (default: auto)')
option('dri2', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI2 extension (default: auto)')
commit 238219e7312e2b5d972a8620b02379009686a005
Author: Laurent Carlier <lordheavym at gmail.com>
Date: Thu Mar 1 12:55:11 2018 +0100
meson: Make APM support optional
v2: Define HAVE_APM in dix-config.h
Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/include/meson.build b/include/meson.build
index 83778c69b..45d27774a 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -198,6 +198,8 @@ conf_data.set('XvMCExtension', build_xvmc)
conf_data.set('HAVE_SHA1_IN_LIBNETTLE', '1') # XXX
+conf_data.set('HAVE_APM', build_apm or build_acpi)
+
enable_debugging = get_option('buildtype') == 'debug'
conf_data.set('DEBUG', enable_debugging)
@@ -255,6 +257,7 @@ xorg_data.set('XSERVER_LIBPCIACCESS', get_option('pciaccess'))
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')
+xorg_data.set('XF86PM', build_apm)
if host_machine.system() == 'freebsd' or host_machine.system() == 'dragonflybsd'
if host_machine.cpu_family() == 'x86' or host_machine.cpu_family() == 'x86_64'
diff --git a/meson.build b/meson.build
index 4748724e3..6a671587e 100644
--- a/meson.build
+++ b/meson.build
@@ -369,8 +369,15 @@ elif get_option('dga') == 'true'
build_dga = true
endif
-# XXX: Allow configuration of these.
build_apm = false
+if (get_option('linux_apm') == true and
+ host_machine.system() == 'linux')
+ if cc.has_header('linux/apm_bios.h')
+ build_apm = true
+ endif
+endif
+
+# XXX: Allow configuration of these.
build_acpi = false
build_mitshm = true
build_xselinux = false
diff --git a/meson_options.txt b/meson_options.txt
index 52d02ab4e..54cf61d78 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -77,6 +77,8 @@ option('xvmc', type: 'boolean', value: true,
description: 'XvMC extension')
option('dga', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
description: 'DGA extension')
+option('linux_apm', type: 'boolean', value: true,
+ description: 'APM support on Linux')
option('dri1', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI1 extension (default: auto)')
option('dri2', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto', description: 'Build DRI2 extension (default: auto)')
More information about the xorg-commit
mailing list