xserver: Branch 'master' - 4 commits
Adam Jackson
ajax at kemper.freedesktop.org
Mon Feb 19 18:55:26 UTC 2018
hw/kdrive/ephyr/meson.build | 2 +-
hw/xfree86/common/xf86Xinput.c | 6 +++---
include/events.h | 2 +-
include/eventstr.h | 4 ++--
include/meson.build | 4 +++-
meson.build | 20 +++++++++++++++++---
meson_options.txt | 6 ++++++
mi/mieq.c | 4 ++--
8 files changed, 35 insertions(+), 13 deletions(-)
New commits:
commit 5ba0ba93e127a8c460b013e3c6851dd186377c27
Author: Laurent Carlier <lordheavym at gmail.com>
Date: Sun Feb 18 10:58:35 2018 +0100
meson: Make DGA extension optional
Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
diff --git a/include/meson.build b/include/meson.build
index 4d09e7dff..83778c69b 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -163,6 +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('DGA', build_dga)
conf_data.set('DPMSExtension', build_dpms)
conf_data.set('DRI2', build_dri2)
conf_data.set('DRI3', build_dri3)
@@ -184,6 +185,7 @@ conf_data.set('XF86BIGFONT', build_xf86bigfont)
conf_data.set('XF86DRI', build_dri1)
conf_data.set('XF86VIDMODE', build_xf86vidmode)
conf_data.set('XFIXES', '1')
+conf_data.set('XFreeXDGA', build_dga)
conf_data.set('XINERAMA', build_xinerama)
conf_data.set('XINPUT', '1')
conf_data.set('XRECORD', '1')
diff --git a/meson.build b/meson.build
index 364c6148e..492d8cd9d 100644
--- a/meson.build
+++ b/meson.build
@@ -81,7 +81,6 @@ dri2proto_dep = dependency('dri2proto', version: '>= 2.8', required: get_option(
dri3proto_dep = dependency('dri3proto', version: '>= 1.0', required: get_option('dri3') == 'true')
xineramaproto_dep = dependency('xineramaproto')
xf86bigfontproto_dep = dependency('xf86bigfontproto', version: '>= 1.2.0')
-xf86dgaproto_dep = dependency('xf86dgaproto', version: '>= 2.0.99.1', required: false)
xf86vidmodeproto_dep = dependency('xf86vidmodeproto', version: '>= 2.2.99.1', required: false)
windowswmproto_dep = dependency('windowswmproto', required: false)
applewmproto_dep = dependency('applewmproto', version: '>= 1.4', required: false)
@@ -359,12 +358,22 @@ if not build_xv
build_xvmc = false
endif
+build_dga = false
+if get_option('dga') == 'auto'
+ xf86dgaproto_dep = dependency('xf86dgaproto', version: '>= 2.0.99.1', required: false)
+ if xf86dgaproto_dep.found()
+ build_dga = true
+ endif
+elif get_option('dga') == 'true'
+ xf86dgaproto_dep = dependency('xf86dgaproto', version: '>= 2.0.99.1', required: true)
+ build_dga = true
+endif
+
# XXX: Allow configuration of these.
build_apm = false
build_acpi = false
build_mitshm = true
build_xselinux = false
-build_dga = false
build_xf86vidmode = xf86vidmodeproto_dep.found()
m_dep = cc.find_library('m', required : false)
diff --git a/meson_options.txt b/meson_options.txt
index 8ba6edf3f..52d02ab4e 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -75,6 +75,8 @@ option('xv', type: 'boolean', value: true,
description: 'Xv extension')
option('xvmc', type: 'boolean', value: true,
description: 'XvMC extension')
+option('dga', type: 'combo', choices: ['true', 'false', 'auto'], value: 'auto',
+ description: 'DGA 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 e790bc621b8f55489e35b1de260c649d8d105d63
Author: Laurent Carlier <lordheavym at gmail.com>
Date: Sun Feb 18 10:58:34 2018 +0100
dga: #if XFreeXDGA → #ifdef XFreeXDGA
../include/events.h:32:14: error: #if with no expression
Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index 136bf50ff..75235b368 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -1181,7 +1181,7 @@ xf86CheckMotionEvent4DGA(DeviceIntPtr device, int is_absolute,
{
int stolen = 0;
-#if XFreeXDGA
+#ifdef XFreeXDGA
ScreenPtr scr = NULL;
int idx = 0, i;
@@ -1375,7 +1375,7 @@ xf86PostButtonEventM(DeviceIntPtr device,
flags = POINTER_RELATIVE | POINTER_ACCELERATE;
}
-#if XFreeXDGA
+#ifdef XFreeXDGA
if (miPointerGetScreen(device)) {
int index = miPointerGetScreen(device)->myNum;
@@ -1406,7 +1406,7 @@ xf86PostKeyEventP(DeviceIntPtr device,
void
xf86PostKeyEventM(DeviceIntPtr device, unsigned int key_code, int is_down)
{
-#if XFreeXDGA
+#ifdef XFreeXDGA
DeviceIntPtr pointer;
/* Some pointers send key events, paired device is wrong then. */
diff --git a/include/events.h b/include/events.h
index c0ef45d5f..0cbd8c84a 100644
--- a/include/events.h
+++ b/include/events.h
@@ -29,7 +29,7 @@ typedef struct _DeviceChangedEvent DeviceChangedEvent;
typedef struct _TouchOwnershipEvent TouchOwnershipEvent;
typedef struct _BarrierEvent BarrierEvent;
-#if XFreeXDGA
+#ifdef XFreeXDGA
typedef struct _DGAEvent DGAEvent;
#endif
typedef struct _RawDeviceEvent RawDeviceEvent;
diff --git a/include/eventstr.h b/include/eventstr.h
index 74469613a..bf3b95fe4 100644
--- a/include/eventstr.h
+++ b/include/eventstr.h
@@ -200,7 +200,7 @@ struct _DeviceChangedEvent {
} keys;
};
-#if XFreeXDGA
+#ifdef XFreeXDGA
/**
* DGAEvent, used by DGA to intercept and emulate input events.
*/
@@ -287,7 +287,7 @@ union _InternalEvent {
DeviceChangedEvent changed_event;
TouchOwnershipEvent touch_ownership_event;
BarrierEvent barrier_event;
-#if XFreeXDGA
+#ifdef XFreeXDGA
DGAEvent dga_event;
#endif
RawDeviceEvent raw_event;
diff --git a/mi/mieq.c b/mi/mieq.c
index a6e867df6..555f0ec7e 100644
--- a/mi/mieq.c
+++ b/mi/mieq.c
@@ -320,7 +320,7 @@ ChangeDeviceID(DeviceIntPtr dev, InternalEvent *event)
case ET_TouchOwnership:
event->touch_ownership_event.deviceid = dev->id;
break;
-#if XFreeXDGA
+#ifdef XFreeXDGA
case ET_DGAEvent:
break;
#endif
@@ -385,7 +385,7 @@ CopyGetMasterEvent(DeviceIntPtr sdev,
if (!sdev || IsMaster(sdev) || IsFloating(sdev))
return NULL;
-#if XFreeXDGA
+#ifdef XFreeXDGA
if (type == ET_DGAEvent)
type = original->dga_event.subtype;
#endif
commit ce4e20f80ff64a5a8b9f344e2507128f379e0715
Author: Laurent Carlier <lordheavym at gmail.com>
Date: Sun Feb 18 10:58:33 2018 +0100
meson: Make Xv and XvMC extensions optional
Just mimic autoconf file, XvMC can't be enabled without Xv
Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
diff --git a/include/meson.build b/include/meson.build
index ee5a6fb29..4d09e7dff 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -192,7 +192,7 @@ conf_data.set('XSYNC', '1')
conf_data.set('XTEST', '1')
conf_data.set('XV', build_xv)
conf_data.set('XvExtension', build_xv)
-conf_data.set('XvMCExtension', build_xv)
+conf_data.set('XvMCExtension', build_xvmc)
conf_data.set('HAVE_SHA1_IN_LIBNETTLE', '1') # XXX
diff --git a/meson.build b/meson.build
index 52aaac514..364c6148e 100644
--- a/meson.build
+++ b/meson.build
@@ -353,12 +353,17 @@ if build_xsecurity
endif
endif
+build_xv = get_option('xv')
+build_xvmc = get_option('xvmc')
+if not build_xv
+ build_xvmc = false
+endif
+
# XXX: Allow configuration of these.
build_apm = false
build_acpi = false
build_mitshm = true
build_xselinux = false
-build_xv = true
build_dga = false
build_xf86vidmode = xf86vidmodeproto_dep.found()
diff --git a/meson_options.txt b/meson_options.txt
index 273ebaa22..8ba6edf3f 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -71,6 +71,10 @@ option('xinerama', type: 'boolean', value: true,
description: 'Xinerama extension')
option('xcsecurity', type: 'boolean', value: false,
description: 'Security extension')
+option('xv', type: 'boolean', value: true,
+ description: 'Xv extension')
+option('xvmc', type: 'boolean', value: true,
+ description: 'XvMC 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 82d9e99bf99660537a11d9475369c43814cad664
Author: Laurent Carlier <lordheavym at gmail.com>
Date: Sun Feb 18 10:58:32 2018 +0100
meson: Xephyr Requires xcb-shm version 1.9.3 or newer
Sync with commit 8510f542e5474b719f7d7edba7ef0cc05af0271e
Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
diff --git a/hw/kdrive/ephyr/meson.build b/hw/kdrive/ephyr/meson.build
index 7b9225f26..31e167387 100644
--- a/hw/kdrive/ephyr/meson.build
+++ b/hw/kdrive/ephyr/meson.build
@@ -15,7 +15,7 @@ xephyr_dep = [
dependency('xcb-aux'),
dependency('xcb-image'),
dependency('xcb-icccm'),
- dependency('xcb-shm'),
+ dependency('xcb-shm', version : '>=1.9.3'),
dependency('xcb-keysyms'),
dependency('xcb-randr'),
dependency('xcb-xkb'),
More information about the xorg-commit
mailing list