summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linux.intel.com>2014-12-04 14:58:26 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-11 11:34:55 +0000
commitacfb2982e851edb4505094f31bbba4bfbc88ca1e (patch)
treefa08ab82b6b180e1d29480b6bf530b59ef223653 /meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch
parent993989f033a31f3ac72891d9627c0d2c46e893be (diff)
downloadpoky-acfb2982e851edb4505094f31bbba4bfbc88ca1e.tar.gz
xorg-xserver: Upgrade to 1.16.2.
Add PACKAGECONFIG systemd, xserver-xorg now depends in dbus because adds support for systemd-logind, dbus is used by xserver-xorg to communicate with systemd. Add conditional enablement of systemd-logind if DISTRO_FEATURES contains systemd. Remove crosscompile, mips64-compile and present-module because are already in upstream. (From OE-Core rev: 4c33baa4a95aee26c6bf6fd0c7ec827ff63a9e62) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch')
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch66
1 files changed, 0 insertions, 66 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch
deleted file mode 100644
index 13f3caf768..0000000000
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch
+++ /dev/null
@@ -1,66 +0,0 @@
1[ YOCTO #6583 ]
2
3Upstream-Status: Backport
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6From 746be5a03ebbda4ab411ca3efb2ed95f99e9ea46 Mon Sep 17 00:00:00 2001
7From: Chris Wilson <chris@chris-wilson.co.uk>
8Date: Wed, 28 May 2014 08:13:59 +0100
9Subject: xfree86: Report DRI3 as a built-in module
10
11This is so that drivers can do a runtime check that DRI3 is available,
12similar to existing runtime checks performed by the drivers for DRI and
13DRI2.
14
15v2: Only add DRI3 to the list if the module was actually built into the
16server (Mark Kettenis).
17
18Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
19Cc: Mark Kettenis <mark.kettenis@xs4all.nl>
20Signed-off-by: Keith Packard <keithp@keithp.com>
21
22diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
23index 092bf57..f92ad8d 100644
24--- a/hw/xfree86/loader/loadmod.c
25+++ b/hw/xfree86/loader/loadmod.c
26@@ -838,6 +838,9 @@ static const char *compiled_in_modules[] = {
27 "extmod",
28 "dri",
29 "dri2",
30+#if DRI3
31+ "dri3",
32+#endif
33 NULL
34 };
35
36--
37cgit v0.10.2
38
39
40From 7ca458493aa2f0aa091c989ea0768611e0730bf5 Mon Sep 17 00:00:00 2001
41From: Chris Wilson <chris@chris-wilson.co.uk>
42Date: Wed, 28 May 2014 08:14:00 +0100
43Subject: xfree86: Report Present as a built-in module
44
45This is so that drivers can do a runtime check that Present is available,
46similar to existing runtime checks performed by the drivers for DRI.
47
48Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
49Signed-off-by: Keith Packard <keithp@keithp.com>
50
51diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c
52index f92ad8d..e1f649a 100644
53--- a/hw/xfree86/loader/loadmod.c
54+++ b/hw/xfree86/loader/loadmod.c
55@@ -841,6 +841,9 @@ static const char *compiled_in_modules[] = {
56 #if DRI3
57 "dri3",
58 #endif
59+#if PRESENT
60+ "present",
61+#endif
62 NULL
63 };
64
65--
66cgit v0.10.2