<div dir="ltr">Does this depend on the upgrades, or should it work standalone?<div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 22 September 2017 at 12:02, Fabien Lahoudere <span dir="ltr">&lt;<a href="mailto:fabien.lahoudere@collabora.co.uk" target="_blank">fabien.lahoudere@collabora.co.uk</a>&gt;</span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This patch also remove workaround to find wayland-protocols:<br>
<br>
WAYLAND_PROTOCOLS_SYSROOT_DIR=<wbr>${RECIPE_SYSROOT}<br>
<br>
in:<br>
<br>
- gtk+3<br>
- libsdl2<br>
- xserver-xorg<br>
- gstreamer1.0-plugins-bad<br>
<br>
Signed-off-by: Fabien Lahoudere &lt;<a href="mailto:fabien.lahoudere@collabora.co.uk">fabien.lahoudere@collabora.<wbr>co.uk</a>&gt;<br>
---<br>
 meta/recipes-gnome/gtk+/gtk+3.<wbr>inc                  |  1 -<br>
 meta/recipes-graphics/libsdl2/<a href="http://libsdl2_2.0.5.bb" rel="noreferrer" target="_blank"><wbr>libsdl2_2.0.5.bb</a>     |  2 +-<br>
 .../<wbr>usesysrootprefixforpkgdatadirv<wbr>ariable.patch    | 27 ++++++++++++++++++++++<br>
 .../wayland/<a href="http://wayland-protocols_1.10.bb" rel="noreferrer" target="_blank">wayland-protocols_<wbr>1.10.bb</a>              |  1 +<br>
 .../recipes-graphics/xorg-<wbr>xserver/xserver-xorg.inc |  1 -<br>
 .../gstreamer/<a href="http://gstreamer1.0-plugins-bad_1.12.2.bb" rel="noreferrer" target="_blank">gstreamer1.0-<wbr>plugins-bad_1.12.2.bb</a>   |  1 -<br>
 6 files changed, 29 insertions(+), 4 deletions(-)<br>
 create mode 100644 meta/recipes-graphics/wayland/<wbr>wayland-protocols/<wbr>usesysrootprefixforpkgdatadirv<wbr>ariable.patch<br>
<br>
diff --git a/meta/recipes-gnome/gtk+/gtk+<wbr>3.inc b/meta/recipes-gnome/gtk+/gtk+<wbr>3.inc<br>
index 0a357db049..420ead2ca2 100644<br>
--- a/meta/recipes-gnome/gtk+/gtk+<wbr>3.inc<br>
+++ b/meta/recipes-gnome/gtk+/gtk+<wbr>3.inc<br>
@@ -35,7 +35,6 @@ EXTRA_OECONF += &quot; \<br>
                  --enable-modules \<br>
                  --disable-cups \<br>
                  --disable-colord \<br>
-                 WAYLAND_PROTOCOLS_SYSROOT_DIR=<wbr>${RECIPE_SYSROOT} \<br>
                  ${@bb.utils.contains(&quot;DISTRO_<wbr>FEATURES&quot;, &quot;x11&quot;, &quot;&quot;, &quot;--disable-gtk-doc&quot;, d)} \<br>
                  &quot;<br>
<br>
diff --git a/meta/recipes-graphics/<wbr>libsdl2/<a href="http://libsdl2_2.0.5.bb" rel="noreferrer" target="_blank">libsdl2_2.0.5.bb</a> b/meta/recipes-graphics/<wbr>libsdl2/<a href="http://libsdl2_2.0.5.bb" rel="noreferrer" target="_blank">libsdl2_2.0.5.bb</a><br>
index 12d3aaf6f0..6bfa13200b 100644<br>
--- a/meta/recipes-graphics/<wbr>libsdl2/<a href="http://libsdl2_2.0.5.bb" rel="noreferrer" target="_blank">libsdl2_2.0.5.bb</a><br>
+++ b/meta/recipes-graphics/<wbr>libsdl2/<a href="http://libsdl2_2.0.5.bb" rel="noreferrer" target="_blank">libsdl2_2.0.5.bb</a><br>
@@ -35,7 +35,7 @@ EXTRA_OECONF = &quot;--disable-oss --disable-esd --disable-arts \<br>
                 --enable-pthreads \<br>
                 --enable-sdl-dlopen \<br>
                 --disable-rpath \<br>
-                WAYLAND_PROTOCOLS_SYSROOT_DIR=<wbr>${RECIPE_SYSROOT}&quot;<br>
+                &quot;<br>
<br>
 # opengl packageconfig factored out to make it easy for distros<br>
 # and BSP layers to pick either (desktop) opengl, gles2, or no GL<br>
diff --git a/meta/recipes-graphics/<wbr>wayland/wayland-protocols/<wbr>usesysrootprefixforpkgdatadirv<wbr>ariable.patch b/meta/recipes-graphics/<wbr>wayland/wayland-protocols/<wbr>usesysrootprefixforpkgdatadirv<wbr>ariable.patch<br>
new file mode 100644<br>
index 0000000000..0922a4d2c2<br>
--- /dev/null<br>
+++ b/meta/recipes-graphics/<wbr>wayland/wayland-protocols/<wbr>usesysrootprefixforpkgdatadirv<wbr>ariable.patch<br>
@@ -0,0 +1,27 @@<br>
+From 875130ee3cbcf62266901ef4b91b9a<wbr>0fb6adad43 Mon Sep 17 00:00:00 2001<br>
+From: Tomek Bury &lt;<a href="mailto:tomek.bury@broadcom.com">tomek.bury@broadcom.com</a>&gt;<br>
+Date: Fri, 4 Aug 2017 16:16:38 +0100<br>
+Subject: Use sysroot prefix for pkgdatadir variable<br>
+<br>
+The pc_sysroot is automatically added to cflags and libs but not<br>
+to &#39;pkg-config --variable&#39;<br>
+<br>
+Upstream-Status: Backport [<a href="https://cgit.freedesktop.org/wayland/wayland-protocols/commit/?id=875130ee3cbcf62266901ef4b91b9a0fb6adad43" rel="noreferrer" target="_blank">https://cgit.freedesktop.org/<wbr>wayland/wayland-protocols/<wbr>commit/?id=<wbr>875130ee3cbcf62266901ef4b91b9a<wbr>0fb6adad43</a>]<br>
+<br>
+Reviewed-by: Daniel Stone &lt;<a href="mailto:daniels@collabora.com">daniels@collabora.com</a>&gt;<br>
+<br>
+diff --git a/<a href="http://wayland-protocols.pc.in" rel="noreferrer" target="_blank">wayland-protocols.pc.in</a> b/<a href="http://wayland-protocols.pc.in" rel="noreferrer" target="_blank">wayland-protocols.pc.in</a><br>
+index a26744c..379be06 100644<br>
+--- a/<a href="http://wayland-protocols.pc.in" rel="noreferrer" target="_blank">wayland-protocols.pc.in</a><br>
++++ b/<a href="http://wayland-protocols.pc.in" rel="noreferrer" target="_blank">wayland-protocols.pc.in</a><br>
+@@ -1,6 +1,6 @@<br>
+ prefix=@prefix@<br>
+ datarootdir=@datarootdir@<br>
+-pkgdatadir=@datadir@/@<wbr>PACKAGE@<br>
++pkgdatadir=${pc_sysrootdir}@<wbr>datadir@/@PACKAGE@<br>
+<br>
+ Name: Wayland Protocols<br>
+ Description: Wayland protocol files<br>
+--<br>
+cgit v0.10.2<br>
+<br>
diff --git a/meta/recipes-graphics/<wbr>wayland/<a href="http://wayland-protocols_1.10.bb" rel="noreferrer" target="_blank">wayland-protocols_1.<wbr>10.bb</a> b/meta/recipes-graphics/<wbr>wayland/<a href="http://wayland-protocols_1.10.bb" rel="noreferrer" target="_blank">wayland-protocols_1.<wbr>10.bb</a><br>
index 4f9e9f32bf..1ff12c607b 100644<br>
--- a/meta/recipes-graphics/<wbr>wayland/<a href="http://wayland-protocols_1.10.bb" rel="noreferrer" target="_blank">wayland-protocols_1.<wbr>10.bb</a><br>
+++ b/meta/recipes-graphics/<wbr>wayland/<a href="http://wayland-protocols_1.10.bb" rel="noreferrer" target="_blank">wayland-protocols_1.<wbr>10.bb</a><br>
@@ -10,6 +10,7 @@ LIC_FILES_CHKSUM = &quot;file://COPYING;md5=<wbr>c7b12b6702da38ca028ace54aae3d4<wbr>84 \<br>
                     file://stable/presentation-<wbr>time/presentation-time.xml;<wbr>endline=26;md5=<wbr>4646cd7d9edc9fa55db941f2d3a7dc<wbr>53&quot;<br>
<br>
 SRC_URI = &quot;<a href="https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" rel="noreferrer" target="_blank">https://wayland.freedesktop.<wbr>org/releases/${BPN}-${PV}.tar.<wbr>xz</a> \<br>
+          file://<wbr>usesysrootprefixforpkgdatadirv<wbr>ariable.patch \<br>
            &quot;<br>
 SRC_URI[md5sum] = &quot;<wbr>84a7846c2b6a6a3e265fc9be36453e<wbr>60&quot;<br>
 SRC_URI[sha256sum] = &quot;<wbr>5719c51d7354864983171c5083e93a<wbr>72ac99229e2b460c4bb10513de0883<wbr>9c0a&quot;<br>
diff --git a/meta/recipes-graphics/xorg-<wbr>xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-<wbr>xserver/xserver-xorg.inc<br>
index 863d80ce43..e8025de55f 100644<br>
--- a/meta/recipes-graphics/xorg-<wbr>xserver/xserver-xorg.inc<br>
+++ b/meta/recipes-graphics/xorg-<wbr>xserver/xserver-xorg.inc<br>
@@ -117,7 +117,6 @@ EXTRA_OECONF += &quot;--with-fop=no \<br>
                  --sysconfdir=/etc/X11 \<br>
                  --localstatedir=/var \<br>
                  --with-xkb-output=/var/lib/xkb \<br>
-                 WAYLAND_PROTOCOLS_SYSROOT_DIR=<wbr>${RECIPE_SYSROOT} \<br>
 &quot;<br>
<br>
 OPENGL_PKGCONFIGS = &quot;dri glx glamor dri3 xshmfence&quot;<br>
diff --git a/meta/recipes-multimedia/<wbr>gstreamer/<a href="http://gstreamer1.0-plugins-bad_1.12.2.bb" rel="noreferrer" target="_blank">gstreamer1.0-<wbr>plugins-bad_1.12.2.bb</a> b/meta/recipes-multimedia/<wbr>gstreamer/<a href="http://gstreamer1.0-plugins-bad_1.12.2.bb" rel="noreferrer" target="_blank">gstreamer1.0-<wbr>plugins-bad_1.12.2.bb</a><br>
index 8321da0c27..a83a5bab21 100644<br>
--- a/meta/recipes-multimedia/<wbr>gstreamer/<a href="http://gstreamer1.0-plugins-bad_1.12.2.bb" rel="noreferrer" target="_blank">gstreamer1.0-<wbr>plugins-bad_1.12.2.bb</a><br>
+++ b/meta/recipes-multimedia/<wbr>gstreamer/<a href="http://gstreamer1.0-plugins-bad_1.12.2.bb" rel="noreferrer" target="_blank">gstreamer1.0-<wbr>plugins-bad_1.12.2.bb</a><br>
@@ -22,5 +22,4 @@ SRC_URI[sha256sum] = &quot;<wbr>9c2c7edde4f59d74eb414e0701c551<wbr>31f562e5c605a3ce9b091754f106<br>
<br>
 S = &quot;${WORKDIR}/gst-plugins-bad-${<wbr>PV}&quot;<br>
<br>
-EXTRA_OECONF += &quot;WAYLAND_PROTOCOLS_SYSROOT_<wbr>DIR=${RECIPE_SYSROOT}&quot;<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
2.11.0<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</font></span></blockquote></div><br></div>