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