summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/wayland/wayland
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-graphics/wayland/wayland
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-graphics/wayland/wayland')
-rw-r--r--meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
new file mode 100644
index 0000000000..9fb1252284
--- /dev/null
+++ b/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch
@@ -0,0 +1,33 @@
1Fix wayland-client and wayland-scanner pc files
2
3Upstream-Status: Pending
4
5Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk>
6
7Index: wayland-1.14.0/src/wayland-client.pc.in
8===================================================================
9--- wayland-1.14.0.orig/src/wayland-client.pc.in
10+++ wayland-1.14.0/src/wayland-client.pc.in
11@@ -1,7 +1,7 @@
12 prefix=@prefix@
13 exec_prefix=@exec_prefix@
14 datarootdir=@datarootdir@
15-pkgdatadir=@datadir@/@PACKAGE@
16+pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@
17 libdir=@libdir@
18 includedir=@includedir@
19
20Index: wayland-1.14.0/src/wayland-scanner.pc.in
21===================================================================
22--- wayland-1.14.0.orig/src/wayland-scanner.pc.in
23+++ wayland-1.14.0/src/wayland-scanner.pc.in
24@@ -1,8 +1,8 @@
25 prefix=@prefix@
26 exec_prefix=@exec_prefix@
27 datarootdir=@datarootdir@
28 pkgdatadir=@datadir@/@PACKAGE@
29-wayland_scanner=@bindir@/wayland-scanner
30+wayland_scanner=wayland-scanner
31
32 Name: Wayland Scanner
33 Description: Wayland scanner