xserver: Branch 'master' - 4 commits
Adam Jackson
ajax at kemper.freedesktop.org
Wed Feb 14 19:17:09 UTC 2018
hw/dmx/dmx.c | 4 ++--
hw/dmx/dmxinit.c | 2 +-
include/meson.build | 4 ++--
meson.build | 25 ++++++++++++++++++-------
meson_options.txt | 14 ++++++++++++++
5 files changed, 37 insertions(+), 12 deletions(-)
New commits:
commit d1fdddeb76328ab84d9a181a5c72b90013f0f0a6
Author: Laurent Carlier <lordheavym at gmail.com>
Date: Tue Feb 13 22:33:51 2018 +0100
meson: Make Security extension optional
Just mimic autoconf file, Security extension needs X-ACE extension
Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
diff --git a/meson.build b/meson.build
index 59a0c5979..52aaac514 100644
--- a/meson.build
+++ b/meson.build
@@ -346,11 +346,17 @@ build_res = get_option('xres')
build_xace = get_option('xace')
build_xinerama = get_option('xinerama')
+build_xsecurity = get_option('xcsecurity')
+if build_xsecurity
+ if not build_xace
+ error('cannot build Security extension without X-ACE')
+ endif
+endif
+
# XXX: Allow configuration of these.
build_apm = false
build_acpi = false
build_mitshm = true
-build_xsecurity = true
build_xselinux = false
build_xv = true
build_dga = false
diff --git a/meson_options.txt b/meson_options.txt
index 0ae53d5c6..273ebaa22 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -69,6 +69,8 @@ option('xace', type: 'boolean', value: true,
description: 'X-ACE extension')
option('xinerama', type: 'boolean', value: true,
description: 'Xinerama extension')
+option('xcsecurity', type: 'boolean', value: false,
+ description: 'Security 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 43ef94068e072228446484bf58c0624b9b9649ac
Author: Laurent Carlier <lordheavym at gmail.com>
Date: Tue Feb 13 22:33:50 2018 +0100
meson: Make more extensions optional
Just mimic autoconf file for xf86bigfont, screensaver,
xres, xace and xinerama extensions
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 8822e796f..72892becd 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -169,7 +169,7 @@ 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('MITSHM', build_mitshm)
-conf_data.set('PANORAMIX', '1')
+conf_data.set('PANORAMIX', build_xinerama)
conf_data.set('PRESENT', '1')
conf_data.set('RANDR', '1')
conf_data.set('RES', build_res)
diff --git a/meson.build b/meson.build
index 9baec549c..59a0c5979 100644
--- a/meson.build
+++ b/meson.build
@@ -340,16 +340,17 @@ if build_xquartz
build_dpms = false
endif
+build_xf86bigfont = get_option('xf86bigfont')
+build_screensaver = get_option('screensaver')
+build_res = get_option('xres')
+build_xace = get_option('xace')
+build_xinerama = get_option('xinerama')
+
# XXX: Allow configuration of these.
build_apm = false
build_acpi = false
build_mitshm = true
-build_res = true
-build_screensaver = true
-build_xace = true
build_xsecurity = true
-build_xf86bigfont = true
-build_xinerama = true
build_xselinux = false
build_xv = true
build_dga = false
diff --git a/meson_options.txt b/meson_options.txt
index 5d37b75cd..0ae53d5c6 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -59,6 +59,16 @@ option('vgahw', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto'
description: 'Xorg VGA access module')
option('dpms', type: 'boolean', value: true,
description: 'Xorg DPMS extension')
+option('xf86bigfont', type: 'boolean', value: false,
+ description: 'XF86 Big Font extension')
+option('screensaver', type: 'boolean', value: true,
+ description: 'ScreenSaver extension')
+option('xres', type: 'boolean', value: true,
+ description: 'XRes extension')
+option('xace', type: 'boolean', value: true,
+ description: 'X-ACE extension')
+option('xinerama', type: 'boolean', value: true,
+ description: 'Xinerama 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 3203dd175bd71ef4d154578165d930eec29afddb
Author: Laurent Carlier <lordheavym at gmail.com>
Date: Tue Feb 13 22:33:49 2018 +0100
meson: Make DPMS extension optional
Just mimic autoconf file, DPMS is disabled with Xquartz
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 00ec0573d..8822e796f 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -163,7 +163,7 @@ conf_data.set('BIGREQS', '1')
conf_data.set('COMPOSITE', '1')
conf_data.set('DAMAGE', '1')
conf_data.set('DBE', '1')
-conf_data.set('DPMSExtension', '1')
+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'))
diff --git a/meson.build b/meson.build
index 3c1d54cdf..9baec549c 100644
--- a/meson.build
+++ b/meson.build
@@ -335,10 +335,14 @@ else
build_vgahw = get_option('vgahw') == 'true'
endif
+build_dpms = get_option('dpms')
+if build_xquartz
+ build_dpms = false
+endif
+
# XXX: Allow configuration of these.
build_apm = false
build_acpi = false
-build_dpms = true
build_mitshm = true
build_res = true
build_screensaver = true
diff --git a/meson_options.txt b/meson_options.txt
index 294279a5d..5d37b75cd 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -57,6 +57,8 @@ option('vbe', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
description: 'Xorg VBE module')
option('vgahw', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
description: 'Xorg VGA access module')
+option('dpms', type: 'boolean', value: true,
+ description: 'Xorg DPMS 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 2c3e137b786dab4a8002a4934fbcf4ef0742f473
Author: Adam Jackson <ajax at redhat.com>
Date: Wed Feb 14 14:10:44 2018 -0500
dmx: #if PANORAMIX → #ifdef PANORAMIX
Signed-off-by: Adam Jackson <ajax at redhat.com>
diff --git a/hw/dmx/dmx.c b/hw/dmx/dmx.c
index 0ae14a21b..4c7808de1 100644
--- a/hw/dmx/dmx.c
+++ b/hw/dmx/dmx.c
@@ -438,7 +438,7 @@ ProcDMXChangeScreensAttributes(ClientPtr client)
value_list += count;
}
-#if PANORAMIX
+#ifdef PANORAMIX
status = dmxConfigureScreenWindows(stuff->screenCount,
screen_list, attribs, &errorScreen);
#endif
@@ -748,7 +748,7 @@ ProcDMXChangeDesktopAttributes(ClientPtr client)
dmxGetDesktopAttributes(&attr);
dmxFetchDesktopAttributes(stuff->valueMask, &attr, value_list);
-#if PANORAMIX
+#ifdef PANORAMIX
status = dmxConfigureDesktop(&attr);
#endif
if (status == BadValue)
diff --git a/hw/dmx/dmxinit.c b/hw/dmx/dmxinit.c
index d1ffcc538..8f17f4ddf 100644
--- a/hw/dmx/dmxinit.c
+++ b/hw/dmx/dmxinit.c
@@ -640,7 +640,7 @@ InitOutput(ScreenInfo * pScreenInfo, int argc, char *argv[])
for (i = 0; i < dmxNumScreens; i++)
dmxDisplayInit(&dmxScreens[i]);
-#if PANORAMIX
+#ifdef PANORAMIX
/* Register a Xinerama callback which will run from within
* PanoramiXCreateConnectionBlock. We can use the callback to
* determine if Xinerama is loaded and to check the visuals
More information about the xorg-commit
mailing list