diff options
| -rw-r--r-- | meta/recipes-graphics/wayland/weston_9.0.0.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-graphics/wayland/weston_9.0.0.bb b/meta/recipes-graphics/wayland/weston_9.0.0.bb index 50fbfa613b..34ac66d4e9 100644 --- a/meta/recipes-graphics/wayland/weston_9.0.0.bb +++ b/meta/recipes-graphics/wayland/weston_9.0.0.bb | |||
| @@ -124,7 +124,7 @@ SUMMARY_libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wa | |||
| 124 | FILES_${PN}-examples = "${bindir}/*" | 124 | FILES_${PN}-examples = "${bindir}/*" |
| 125 | 125 | ||
| 126 | FILES_${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so" | 126 | FILES_${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so" |
| 127 | RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland" | 127 | RDEPENDS_${PN}-xwayland += "xwayland" |
| 128 | 128 | ||
| 129 | RDEPENDS_${PN} += "xkeyboard-config" | 129 | RDEPENDS_${PN} += "xkeyboard-config" |
| 130 | RRECOMMENDS_${PN} = "weston-init liberation-fonts" | 130 | RRECOMMENDS_${PN} = "weston-init liberation-fonts" |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index b3e03744c0..da025171db 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | |||
| @@ -122,7 +122,6 @@ EXTRA_OECONF += "--with-fop=no \ | |||
| 122 | OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" | 122 | OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" |
| 123 | PACKAGECONFIG ??= "dga dri2 udev ${XORG_CRYPTO} \ | 123 | PACKAGECONFIG ??= "dga dri2 udev ${XORG_CRYPTO} \ |
| 124 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ | 124 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ |
| 125 | ${@bb.utils.contains('DISTRO_FEATURES', 'opengl wayland', 'xwayland', '', d)} \ | ||
| 126 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-logind', '', d)} \ | 125 | ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd systemd-logind', '', d)} \ |
| 127 | " | 126 | " |
| 128 | 127 | ||
