diff options
author | Aníbal Limón <anibal.limon@linux.intel.com> | 2014-12-04 14:58:26 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-12-11 11:34:55 +0000 |
commit | acfb2982e851edb4505094f31bbba4bfbc88ca1e (patch) | |
tree | fa08ab82b6b180e1d29480b6bf530b59ef223653 /meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |
parent | 993989f033a31f3ac72891d9627c0d2c46e893be (diff) | |
download | poky-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.inc')
-rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index dd60884992..5b47e3445f 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |||
@@ -116,7 +116,9 @@ EXTRA_OECONF += "--with-fop=no \ | |||
116 | ac_cv_file__usr_share_sgml_X11_defs_ent=no \ | 116 | ac_cv_file__usr_share_sgml_X11_defs_ent=no \ |
117 | " | 117 | " |
118 | 118 | ||
119 | PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)}" | 119 | PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)} \ |
120 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" | ||
121 | |||
120 | PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" | 122 | PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" |
121 | PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto" | 123 | PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto" |
122 | PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" | 124 | PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" |
@@ -126,6 +128,7 @@ PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtua | |||
126 | PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" | 128 | PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" |
127 | PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" | 129 | PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" |
128 | PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" | 130 | PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" |
131 | PACKAGECONFIG[systemd] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,dbus-lib" | ||
129 | 132 | ||
130 | do_install_append () { | 133 | do_install_append () { |
131 | # Its assumed base-files creates this for us | 134 | # Its assumed base-files creates this for us |