summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome
diff options
context:
space:
mode:
authorFabien Lahoudere <fabien.lahoudere@collabora.co.uk>2017-11-02 00:22:54 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-07 13:25:31 +0000
commit32fd3af26860a86668ac88c30be5f682620ca93b (patch)
treec2918eeebb997800b1bb948170503aacd33890c3 /meta/recipes-gnome
parent8fa2a2f46d13f20860f5fe290403a387cb3a34fe (diff)
downloadpoky-32fd3af26860a86668ac88c30be5f682620ca93b.tar.gz
wayland: Fix installation patch issue
This patch modify the way we manage wayland path issues. Instead of patching each recipe to make it work with wayland and its protocols, it is better to patch wayland to fix its path issues. So wayland-scanner.pc, wayland-client.pc and wayland-protocols.pc are patched to change paths. Then we can drop the following workaround: WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT} in: - gtk+3 - libsdl2 - xserver-xorg - gstreamer1.0-plugins-bad - weston-2.0.0 We also dropped libsdl2 patches which fix wayland paths. (From OE-Core rev: 14c0d992152ce27ee616558cafb408ed008d936e) Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome')
-rw-r--r--meta/recipes-gnome/gtk+/gtk+3.inc1
1 files changed, 0 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gtk+/gtk+3.inc b/meta/recipes-gnome/gtk+/gtk+3.inc
index 0a357db049..420ead2ca2 100644
--- a/meta/recipes-gnome/gtk+/gtk+3.inc
+++ b/meta/recipes-gnome/gtk+/gtk+3.inc
@@ -35,7 +35,6 @@ EXTRA_OECONF += " \
35 --enable-modules \ 35 --enable-modules \
36 --disable-cups \ 36 --disable-cups \
37 --disable-colord \ 37 --disable-colord \
38 WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT} \
39 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "", "--disable-gtk-doc", d)} \ 38 ${@bb.utils.contains("DISTRO_FEATURES", "x11", "", "--disable-gtk-doc", d)} \
40 " 39 "
41 40