From acfb2982e851edb4505094f31bbba4bfbc88ca1e Mon Sep 17 00:00:00 2001 From: Aníbal Limón Date: Thu, 4 Dec 2014 14:58:26 -0600 Subject: xorg-xserver: Upgrade to 1.16.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg.inc') 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 \ ac_cv_file__usr_share_sgml_X11_defs_ent=no \ " -PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)}" +PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}" + PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto" PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" @@ -126,6 +128,7 @@ PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtua PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" +PACKAGECONFIG[systemd] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,dbus-lib" do_install_append () { # Its assumed base-files creates this for us -- cgit v1.2.3-54-g00ecf