diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2015-05-11 00:12:01 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-05-15 22:21:54 +0100 |
| commit | 10c379cb3b9aae093f82d75c583dfe93fcea0c18 (patch) | |
| tree | 7680b4ab37bd0fe638253545efc6edd7058417dd /meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |
| parent | c28291f1fb07fbc80275d9bceefed642c963e204 (diff) | |
| download | openembedded-core-contrib-10c379cb3b9aae093f82d75c583dfe93fcea0c18.tar.gz | |
xserver-xorg: add PACKAGECONFIG for wayland and add xserver-xorg-xwayland
Fixed do_compile error:
hw/xwayland/xwayland.h:36:28: fatal error: wayland-client.h: No such file or directory
#include <wayland-client.h>
^
compilation terminated.
Conditionally add xserver-xorg-xwayland pkg which contains
/usr/bin/Xwayland.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg.inc')
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 30299c2921..cc95da6394 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -47,6 +47,7 @@ PACKAGES =+ "${PN}-security-policy \ ${PN}-xvfb \ ${PN}-utils \ ${PN}-xephyr \ + ${PN}-xwayland \ ${PN}-multimedia-modules \ ${PN}-extension-dri \ ${PN}-extension-dri2 \ @@ -81,6 +82,7 @@ FILES_${PN}-fbdev = "${bindir}/Xfbdev" FILES_${PN}-xvfb = "${bindir}/Xvfb" FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf ${bindir}/getconfig ${bindir}/getconfig.pl" FILES_${PN}-xephyr = "${bindir}/Xephyr" +FILES_${PN}-xwayland = "${bindir}/Xwayland" FILES_${PN}-multimedia-modules = "${libdir}/xorg/modules/multimedia/*drv*" FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so" FILES_${PN}-extension-dri2 = "${libdir}/xorg/modules/extensions/libdri2.so" @@ -115,7 +117,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", "wayland", "xwayland", "", d)} \ +" PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto" @@ -128,6 +132,7 @@ 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-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus," PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto" +PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland libepoxy" do_install_append () { # Its assumed base-files creates this for us |