From 32fd3af26860a86668ac88c30be5f682620ca93b Mon Sep 17 00:00:00 2001 From: Fabien Lahoudere Date: Thu, 2 Nov 2017 00:22:54 +0100 Subject: 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 Signed-off-by: Richard Purdie --- .../usesysrootprefixforpkgdatadirvariable.patch | 27 ++++++++++++++++++ .../wayland/wayland-protocols_1.10.bb | 1 + .../wayland/wayland/fixpathinpcfiles.patch | 33 ++++++++++++++++++++++ meta/recipes-graphics/wayland/wayland_1.14.0.bb | 1 + meta/recipes-graphics/wayland/weston_2.0.0.bb | 1 - 5 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch create mode 100644 meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch (limited to 'meta/recipes-graphics/wayland') diff --git a/meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch b/meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch new file mode 100644 index 0000000000..0922a4d2c2 --- /dev/null +++ b/meta/recipes-graphics/wayland/wayland-protocols/usesysrootprefixforpkgdatadirvariable.patch @@ -0,0 +1,27 @@ +From 875130ee3cbcf62266901ef4b91b9a0fb6adad43 Mon Sep 17 00:00:00 2001 +From: Tomek Bury +Date: Fri, 4 Aug 2017 16:16:38 +0100 +Subject: Use sysroot prefix for pkgdatadir variable + +The pc_sysroot is automatically added to cflags and libs but not +to 'pkg-config --variable' + +Upstream-Status: Backport [https://cgit.freedesktop.org/wayland/wayland-protocols/commit/?id=875130ee3cbcf62266901ef4b91b9a0fb6adad43] + +Reviewed-by: Daniel Stone + +diff --git a/wayland-protocols.pc.in b/wayland-protocols.pc.in +index a26744c..379be06 100644 +--- a/wayland-protocols.pc.in ++++ b/wayland-protocols.pc.in +@@ -1,6 +1,6 @@ + prefix=@prefix@ + datarootdir=@datarootdir@ +-pkgdatadir=@datadir@/@PACKAGE@ ++pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@ + + Name: Wayland Protocols + Description: Wayland protocol files +-- +cgit v0.10.2 + diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb index 4f9e9f32bf..1ff12c607b 100644 --- a/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb +++ b/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb @@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://usesysrootprefixforpkgdatadirvariable.patch \ " SRC_URI[md5sum] = "84a7846c2b6a6a3e265fc9be36453e60" SRC_URI[sha256sum] = "5719c51d7354864983171c5083e93a72ac99229e2b460c4bb10513de08839c0a" 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 @@ +Fix wayland-client and wayland-scanner pc files + +Upstream-Status: Pending + +Signed-off-by: Fabien Lahoudere + +Index: wayland-1.14.0/src/wayland-client.pc.in +=================================================================== +--- wayland-1.14.0.orig/src/wayland-client.pc.in ++++ wayland-1.14.0/src/wayland-client.pc.in +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + datarootdir=@datarootdir@ +-pkgdatadir=@datadir@/@PACKAGE@ ++pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@ + libdir=@libdir@ + includedir=@includedir@ + +Index: wayland-1.14.0/src/wayland-scanner.pc.in +=================================================================== +--- wayland-1.14.0.orig/src/wayland-scanner.pc.in ++++ wayland-1.14.0/src/wayland-scanner.pc.in +@@ -1,8 +1,8 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + datarootdir=@datarootdir@ + pkgdatadir=@datadir@/@PACKAGE@ +-wayland_scanner=@bindir@/wayland-scanner ++wayland_scanner=wayland-scanner + + Name: Wayland Scanner + Description: Wayland scanner diff --git a/meta/recipes-graphics/wayland/wayland_1.14.0.bb b/meta/recipes-graphics/wayland/wayland_1.14.0.bb index 2a2489d658..1a9ff9807b 100644 --- a/meta/recipes-graphics/wayland/wayland_1.14.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.14.0.bb @@ -13,6 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ DEPENDS = "expat libxml2 libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://fixpathinpcfiles.patch \ " SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108" SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8" diff --git a/meta/recipes-graphics/wayland/weston_2.0.0.bb b/meta/recipes-graphics/wayland/weston_2.0.0.bb index 54b07bd6b9..8160f5556d 100644 --- a/meta/recipes-graphics/wayland/weston_2.0.0.bb +++ b/meta/recipes-graphics/wayland/weston_2.0.0.bb @@ -25,7 +25,6 @@ DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" EXTRA_OECONF = "--enable-setuid-install \ --disable-rdp-compositor \ - WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT} \ " EXTRA_OECONF_append_qemux86 = "\ WESTON_NATIVE_BACKEND=fbdev-backend.so \ -- cgit v1.2.3-54-g00ecf