summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Champagne <champagne.guillaume.c@gmail.com>2020-08-19 12:28:25 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-09-02 16:04:37 +0100
commit2e071e6ddffdb89ff40cc9b1c47003423e0c816e (patch)
tree06e9e24d44fb21842b68429e242593483cfe3e78
parenteb929eef58a620fd827e2d909c546bbc51a2066d (diff)
downloadpoky-2e071e6ddffdb89ff40cc9b1c47003423e0c816e.tar.gz
weston: add missing packageconfigs
Add missing package configs to: - Select shell integration - Disable screen sharing module (independent from backend) - Disable jpeg image support `PACKAGECONFIG` default value is updated to enable these configs, since they were previously implicitly enabled. (From OE-Core rev: 156d3e066dbac0986f4f55bef9b2d9922b18e738) Signed-off-by: Guillaume Champagne <champagne.guillaume.c@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit f883413b2bc6e7d0bd44ce8324cd36a8fe918e5f) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/wayland/weston_8.0.0.bb20
1 files changed, 18 insertions, 2 deletions
diff --git a/meta/recipes-graphics/wayland/weston_8.0.0.bb b/meta/recipes-graphics/wayland/weston_8.0.0.bb
index f8e9e15f84..8fef864827 100644
--- a/meta/recipes-graphics/wayland/weston_8.0.0.bb
+++ b/meta/recipes-graphics/wayland/weston_8.0.0.bb
@@ -20,7 +20,7 @@ inherit meson pkgconfig useradd features_check
20# depends on virtual/egl 20# depends on virtual/egl
21REQUIRED_DISTRO_FEATURES = "opengl" 21REQUIRED_DISTRO_FEATURES = "opengl"
22 22
23DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" 23DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0"
24DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" 24DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native"
25 25
26WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" 26WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}"
@@ -31,7 +31,13 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev
31 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ 31 ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \
32 ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \ 32 ${@bb.utils.filter('DISTRO_FEATURES', 'pam systemd x11', d)} \
33 ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ 33 ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \
34 launch" 34 launch \
35 image-jpeg \
36 screenshare \
37 shell-desktop \
38 shell-fullscreen \
39 shell-ivi"
40
35# 41#
36# Compositor choices 42# Compositor choices
37# 43#
@@ -67,6 +73,16 @@ PACKAGECONFIG[clients] = "-Dsimple-clients=all -Ddemo-clients=true,-Dsimple-clie
67PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer-1.0" 73PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer-1.0"
68# Weston with PAM support 74# Weston with PAM support
69PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam" 75PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam"
76# Weston with screen-share support
77PACKAGECONFIG[screenshare] = "-Dscreenshare=true,-Dscreenshare=false"
78# Traditional desktop shell
79PACKAGECONFIG[shell-desktop] = "-Dshell-desktop=true,-Dshell-desktop=false"
80# Fullscreen shell
81PACKAGECONFIG[shell-fullscreen] = "-Dshell-fullscreen=true,-Dshell-fullscreen=false"
82# In-Vehicle Infotainment (IVI) shell
83PACKAGECONFIG[shell-ivi] = "-Dshell-ivi=true,-Dshell-ivi=false"
84# JPEG image loading support
85PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg"
70 86
71do_install_append() { 87do_install_append() {
72 # Weston doesn't need the .la files to load modules, so wipe them 88 # Weston doesn't need the .la files to load modules, so wipe them