<div dir="ltr">I finally merged the sdl/wayland bits of this series but libsdl2 fails for me:<div><br></div><div><div>| GEN gen/wayland-client-protocol.h</div><div>| /bin/bash: client-header: command not found</div><div>| /bin/bash: client-header: command not found</div></div><div><br></div><div>Ross</div></div><div class="gmail_extra"><br><div class="gmail_quote">On 6 December 2016 at 00:19, Andreas Müller <span dir="ltr"><<a href="mailto:schnitzeltony@googlemail.com" target="_blank">schnitzeltony@googlemail.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">* add sysroot prefix to wayland core protocols<br>
* do not use pkg-config to find wayland-scanner<br>
<br>
Signed-off-by: Andreas Müller <<a href="mailto:schnitzeltony@googlemail.com">schnitzeltony@googlemail.com</a>><br>
---<br>
...-sysroot-path-so-that-make-<wbr>finds-our-wayl.patch | 8 +++---<br>
...void-finding-build-host-s-<wbr>wayland-scanner.patch | 31 ++++++++++++++++++++++<br>
meta/recipes-graphics/libsdl2/<a href="http://libsdl2_2.0.5.bb" rel="noreferrer" target="_blank"><wbr>libsdl2_2.0.5.bb</a> | 1 +<br>
3 files changed, 37 insertions(+), 3 deletions(-)<br>
create mode 100644 meta/recipes-graphics/libsdl2/<wbr>libsdl2/0002-Avoid-finding-<wbr>build-host-s-wayland-scanner.<wbr>patch<br>
<br>
diff --git a/meta/recipes-graphics/<wbr>libsdl2/libsdl2/0001-prepend-<wbr>our-sysroot-path-so-that-make-<wbr>finds-our-wayl.patch b/meta/recipes-graphics/<wbr>libsdl2/libsdl2/0001-prepend-<wbr>our-sysroot-path-so-that-make-<wbr>finds-our-wayl.patch<br>
index d042430..efc8418 100644<br>
--- a/meta/recipes-graphics/<wbr>libsdl2/libsdl2/0001-prepend-<wbr>our-sysroot-path-so-that-make-<wbr>finds-our-wayl.patch<br>
+++ b/meta/recipes-graphics/<wbr>libsdl2/libsdl2/0001-prepend-<wbr>our-sysroot-path-so-that-make-<wbr>finds-our-wayl.patch<br>
@@ -11,18 +11,20 @@ Upstream-Status: Inappropriate [embedded specific]<br>
<br>
Signed-off-by: Andreas Müller <<a href="mailto:schnitzeltony@googlemail.com">schnitzeltony@googlemail.com</a>><br>
---<br>
- <a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a> | 2 +-<br>
- 1 file changed, 1 insertion(+), 1 deletion(-)<br>
+ <a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a> | 4 +-<br>
+ 1 file changed, 2 insertions(+), 2 deletions(-)<br>
<br>
diff --git a/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a> b/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
index 726ded3..3376600 100644<br>
--- a/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
+++ b/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
@@ -1206,7 +1206,7 @@ AC_HELP_STRING([--enable-<wbr>video-wayland-qt-touch], [QtWayland server support for<br>
+ WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon`<br>
WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon`<br>
WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`<br>
- WAYLAND_CORE_PROTOCOL_DIR=`$<wbr>PKG_CONFIG --variable=pkgdatadir wayland-client`<br>
+- WAYLAND_CORE_PROTOCOL_DIR=`$<wbr>PKG_CONFIG --variable=pkgdatadir wayland-client`<br>
- WAYLAND_PROTOCOLS_DIR=`$PKG_<wbr>CONFIG --variable=pkgdatadir wayland-protocols`<br>
++ WAYLAND_CORE_PROTOCOL_DIR=${<wbr>WAYLAND_PROTOCOLS_SYSROOT_DIR}<wbr>`$PKG_CONFIG --variable=pkgdatadir wayland-client`<br>
+ WAYLAND_PROTOCOLS_DIR=${<wbr>WAYLAND_PROTOCOLS_SYSROOT_DIR}<wbr>`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`<br>
video_wayland=yes<br>
fi<br>
diff --git a/meta/recipes-graphics/<wbr>libsdl2/libsdl2/0002-Avoid-<wbr>finding-build-host-s-wayland-<wbr>scanner.patch b/meta/recipes-graphics/<wbr>libsdl2/libsdl2/0002-Avoid-<wbr>finding-build-host-s-wayland-<wbr>scanner.patch<br>
new file mode 100644<br>
index 0000000..7837315<br>
--- /dev/null<br>
+++ b/meta/recipes-graphics/<wbr>libsdl2/libsdl2/0002-Avoid-<wbr>finding-build-host-s-wayland-<wbr>scanner.patch<br>
@@ -0,0 +1,31 @@<br>
+From ae879091cf65cb70293b375ec7e61e<wbr>d12a96d8a7 Mon Sep 17 00:00:00 2001<br>
+From: =?UTF-8?q?Andreas=20M=C3=<wbr>BCller?= <<a href="mailto:schnitzeltony@googlemail.com">schnitzeltony@googlemail.com</a>><br>
+Date: Fri, 2 Dec 2016 09:39:25 +0100<br>
+Subject: [PATCH] Avoid finding build host's wayland-scanner<br>
+MIME-Version: 1.0<br>
+Content-Type: text/plain; charset=UTF-8<br>
+Content-Transfer-Encoding: 8bit<br>
+<br>
+Upstream-Status: Inappropriate [embedded specific]<br>
+<br>
+Signed-off-by: Andreas Müller <<a href="mailto:schnitzeltony@googlemail.com">schnitzeltony@googlemail.com</a>><br>
+---<br>
+ <a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a> | 2 +-<br>
+ 1 file changed, 1 insertion(+), 1 deletion(-)<br>
+<br>
+diff --git a/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a> b/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
+index 3376600..2aa6ed4 100644<br>
+--- a/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
++++ b/<a href="http://configure.in" rel="noreferrer" target="_blank">configure.in</a><br>
+@@ -1204,7 +1204,7 @@ AC_HELP_STRING([--enable-<wbr>video-wayland-qt-touch], [QtWayland server support for<br>
+ if $PKG_CONFIG --exists wayland-client wayland-scanner wayland-protocols wayland-egl wayland-cursor egl xkbcommon ; then<br>
+ WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon`<br>
+ WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon`<br>
+- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`<br>
++ AC_PATH_PROG([WAYLAND_SCANNER]<wbr>, [wayland-scanner])<br>
+ WAYLAND_CORE_PROTOCOL_DIR=${<wbr>WAYLAND_PROTOCOLS_SYSROOT_DIR}<wbr>`$PKG_CONFIG --variable=pkgdatadir wayland-client`<br>
+ WAYLAND_PROTOCOLS_DIR=${<wbr>WAYLAND_PROTOCOLS_SYSROOT_DIR}<wbr>`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`<br>
+ video_wayland=yes<br>
+--<br>
+2.7.4<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 bb75316..606e6fb 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>
@@ -18,6 +18,7 @@ SRC_URI = " \<br>
<a href="http://www.libsdl.org/release/SDL2-${PV}.tar.gz" rel="noreferrer" target="_blank">http://www.libsdl.org/release/<wbr>SDL2-${PV}.tar.gz</a> \<br>
file://linkage.patch \<br>
file://0001-prepend-our-<wbr>sysroot-path-so-that-make-<wbr>finds-our-wayl.patch \<br>
+ file://0002-Avoid-finding-<wbr>build-host-s-wayland-scanner.<wbr>patch \<br>
"<br>
<br>
S = "${WORKDIR}/SDL2-${PV}"<br>
<span class="HOEnZb"><font color="#888888">--<br>
2.5.5<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>