<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On 1 December 2016 at 10:37, Khem Raj <span dir="ltr"><<a href="mailto:raj.khem@gmail.com" target="_blank">raj.khem@gmail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">When configure pokes for wayland-protocols isntallations it ended up<br>
using the ones from host, which is because it did not account for sysroot<br>
prefix<br>
<br>
Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
---<br>
.../gstreamer/gstreamer1.0-<wbr>plugins-bad.inc | 2 +-<br>
...G_CONFIG_SYSROOT_DIR-to-<wbr>pkg-config-output.patch | 37 ++++++++++++++++++++++<br>
.../gstreamer/<a href="http://gstreamer1.0-plugins-bad_1.10.1.bb" rel="noreferrer" target="_blank">gstreamer1.0-<wbr>plugins-bad_1.10.1.bb</a> | 1 +<br>
3 files changed, 39 insertions(+), 1 deletion(-)<br>
create mode 100644 meta/recipes-multimedia/<wbr>gstreamer/gstreamer1.0-<wbr>plugins-bad/0001-Prepend-PKG_<wbr>CONFIG_SYSROOT_DIR-to-pkg-<wbr>config-output.patch<br>
<br>
diff --git a/meta/recipes-multimedia/<wbr>gstreamer/gstreamer1.0-<wbr>plugins-bad.inc b/meta/recipes-multimedia/<wbr>gstreamer/gstreamer1.0-<wbr>plugins-bad.inc<br>
index d26a6a9..d3c5326 100644<br>
--- a/meta/recipes-multimedia/<wbr>gstreamer/gstreamer1.0-<wbr>plugins-bad.inc<br>
+++ b/meta/recipes-multimedia/<wbr>gstreamer/gstreamer1.0-<wbr>plugins-bad.inc<br>
@@ -64,7 +64,7 @@ PACKAGECONFIG[srtp] = "--enable-srtp,--disable-srtp,<wbr>libsrtp"<br>
PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-<wbr>uvch264,libusb1 libgudev"<br>
PACKAGECONFIG[voaacenc] = "--enable-voaacenc,--disable-<wbr>voaacenc,vo-aacenc"<br>
PACKAGECONFIG[voamrwbenc] = "--enable-voamrwbenc,--<wbr>disable-voamrwbenc,vo-<wbr>amrwbenc"<br>
-PACKAGECONFIG[wayland] = "--enable-wayland,--disable-<wbr>wayland,wayland-native wayland"<br>
+PACKAGECONFIG[wayland] = "--enable-wayland,--disable-<wbr>wayland,wayland-native wayland wayland-protocols"<br>
PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,<wbr>libwebp"<br>
<br>
# these plugins have not been ported to 1.0 (yet):<br>
diff --git a/meta/recipes-multimedia/<wbr>gstreamer/gstreamer1.0-<wbr>plugins-bad/0001-Prepend-PKG_<wbr>CONFIG_SYSROOT_DIR-to-pkg-<wbr>config-output.patch b/meta/recipes-multimedia/<wbr>gstreamer/gstreamer1.0-<wbr>plugins-bad/0001-Prepend-PKG_<wbr>CONFIG_SYSROOT_DIR-to-pkg-<wbr>config-output.patch<br>
new file mode 100644<br>
index 0000000..eb789df<br>
--- /dev/null<br>
+++ b/meta/recipes-multimedia/<wbr>gstreamer/gstreamer1.0-<wbr>plugins-bad/0001-Prepend-PKG_<wbr>CONFIG_SYSROOT_DIR-to-pkg-<wbr>config-output.patch<br>
@@ -0,0 +1,37 @@<br>
+From c271503d7e233428ac0323c51d6517<wbr>113e26bef7 Mon Sep 17 00:00:00 2001<br>
+From: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
+Date: Thu, 1 Dec 2016 00:27:13 -0800<br>
+Subject: [PATCH] Prepend PKG_CONFIG_SYSROOT_DIR to pkg-config output<br>
+<br>
+In cross environment we have to prepend the sysroot to the path found by<br>
+pkgconfig since the path returned from pkgconfig does not have sysroot prefixed<br>
+it ends up using the files from host system. If build host has wayland installed<br>
+the build will succeed but if you dont have wayland-protocols installed on build host then<br>
+it wont find the files on build host<br>
+<br>
+This should work ok with non sysrooted builds too since in those cases PKG_CONFIG_SYSROOT_DIR<br>
+will be empty<br>
+<br>
+Upstream-Status: Pending<br>
+<br>
+Signed-off-by: Khem Raj <<a href="mailto:raj.khem@gmail.com">raj.khem@gmail.com</a>><br>
+---<br>
+ <a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> | 2 +-<br>
+ 1 file changed, 1 insertion(+), 1 deletion(-)<br>
+<br>
+diff --git a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a> b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
+index f8ac96b..dc87b08 100644<br>
+--- a/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
++++ b/<a href="http://configure.ac" rel="noreferrer" target="_blank">configure.ac</a><br>
+@@ -2233,7 +2233,7 @@ AG_GST_CHECK_FEATURE(WAYLAND, [wayland sink], wayland , [<br>
+ PKG_CHECK_MODULES(WAYLAND_<wbr>PROTOCOLS, wayland-protocols >= 1.4, [<br>
+ if test "x$wayland_scanner" != "x"; then<br>
+ HAVE_WAYLAND="yes"<br>
+- AC_SUBST(WAYLAND_PROTOCOLS_<wbr>DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`)<br>
++ AC_SUBST(WAYLAND_PROTOCOLS_<wbr>DATADIR, ${PKG_CONFIG_SYSROOT_DIR}`$<wbr>PKG_CONFIG --variable=pkgdatadir wayland-protocols`)<br>
</blockquote><div><br></div><div>I believe this breaks multilib because wayland-protocols is allarch so PKG_CONFIG_SYSROOT_DIR may then be incorrect.</div><div><br></div><div>I've set "WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE}" in EXTRA_OECONF in other recipes and used that variable in the patches. It's not pretty but seems to work.<br></div><div><br></div><div>Jussi</div><div><br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">+ else<br>
+ AC_MSG_RESULT([wayland-scanner is required to build the wayland plugin])<br>
+ HAVE_WAYLAND="no"<br>
+--<br>
+2.10.2<br>
+<br>
diff --git a/meta/recipes-multimedia/<wbr>gstreamer/<a href="http://gstreamer1.0-plugins-bad_1.10.1.bb" rel="noreferrer" target="_blank">gstreamer1.0-<wbr>plugins-bad_1.10.1.bb</a> b/meta/recipes-multimedia/<wbr>gstreamer/<a href="http://gstreamer1.0-plugins-bad_1.10.1.bb" rel="noreferrer" target="_blank">gstreamer1.0-<wbr>plugins-bad_1.10.1.bb</a><br>
index 9cd892e..6c6f011 100644<br>
--- a/meta/recipes-multimedia/<wbr>gstreamer/<a href="http://gstreamer1.0-plugins-bad_1.10.1.bb" rel="noreferrer" target="_blank">gstreamer1.0-<wbr>plugins-bad_1.10.1.bb</a><br>
+++ b/meta/recipes-multimedia/<wbr>gstreamer/<a href="http://gstreamer1.0-plugins-bad_1.10.1.bb" rel="noreferrer" target="_blank">gstreamer1.0-<wbr>plugins-bad_1.10.1.bb</a><br>
@@ -14,6 +14,7 @@ SRC_URI = " \<br>
file://0001-gstreamer-gl.pc.<wbr>in-don-t-append-GL_CFLAGS-to-<wbr>CFLAGS.patch \<br>
file://0009-glimagesink-<wbr>Downrank-to-marginal.patch \<br>
file://0001-introspection.m4-<wbr>prefix-pkgconfig-paths-with-<wbr>PKG_CON.patch \<br>
+ file://0001-Prepend-PKG_<wbr>CONFIG_SYSROOT_DIR-to-pkg-<wbr>config-output.patch \<br>
"<br>
SRC_URI[md5sum] = "<wbr>491d2d5aab55ffc60c66e714d3d664<wbr>ea"<br>
SRC_URI[sha256sum] = "<wbr>133e0ed9fe21011b15d3898e3d3a9d<wbr>17ab74eed31996da2e353353e688ca<wbr>921d"<br>
<span class="gmail-HOEnZb"><font color="#888888">--<br>
2.10.2<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></div>