On 05/14/2015 07:38 AM, Burton, Ross wrote:
On 13 May 2015 at 02:31, Robert Yang <liezhi.y...@windriver.com
<mailto:liezhi.y...@windriver.com>> wrote:
I've updated it in the repo:
git://git.openembedded.org/openembedded-core-contrib
<http://git.openembedded.org/openembedded-core-contrib> rbt/3fixes
Actually looked at the build output this time... we should have each xserver in
a separate package really, so can the xwayland binary go into an xwayland
package? We don't really want to force the xwayland binary (and extra
dependencies) on everyone's X11-based images just because wayland is a default
distro feature.
Sounds good, updated in the repo:
git://git.openembedded.org/openembedded-core-contrib rbt/3fixes
commit 913aba210698327a099fd2c43af63fba3545d868
Author: Robert Yang <liezhi.y...@windriver.com>
Date: Mon May 11 00:12:01 2015 -0700
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.y...@windriver.com>
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 30299c2..ee5041f 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -62,7 +62,9 @@ PACKAGES =+ "${PN}-security-policy \
${PN}-module-exa \
${PN}-module-xaa \
${PN}-module-libxf1bpp \
- ${PN}-module-libxf4bpp"
+ ${PN}-module-libxf4bpp \
+ ${@bb.utils.contains("DISTRO_FEATURES", "wayland",
"${PN}-xwayland", "", d)} \
+"
RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb
xserver-xf86-config xkbcomp"
RDEPENDS_${PN}-xvfb += "xkeyboard-config"
@@ -97,6 +99,7 @@ FILES_${PN}-module-exa = "${libdir}/xorg/modules/libexa.so"
FILES_${PN}-module-xaa = "${libdir}/xorg/modules/libxaa.so"
FILES_${PN}-module-libxf1bpp = "${libdir}/xorg/modules/libxf1bpp.so"
FILES_${PN}-module-libxf4bpp = "${libdir}/xorg/modules/libxf4bpp.so"
+FILES_${PN}-xwayland = "${bindir}/Xwayland"
EXTRA_OECONF += "--with-fop=no \
--with-pic \
@@ -115,7 +118,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 +133,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
// Robert
Ross
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
