From 43ef94068e072228446484bf58c0624b9b9649ac Mon Sep 17 00:00:00 2001
From: Laurent Carlier <lordheavym@gmail.com>
Date: Tue, 13 Feb 2018 22:33:50 +0100
Subject: [PATCH] meson: Make more extensions optional

Just mimic autoconf file for xf86bigfont, screensaver,
xres, xace and xinerama extensions

Signed-off-by: Laurent Carlier <lordheavym@gmail.com>
Reviewed-by: Adam Jackson <ajax@redhat.com>
---
 include/meson.build |  2 +-
 meson.build         | 11 ++++++-----
 meson_options.txt   | 10 ++++++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

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)')