From 470e6225e3109a63b2bffb072d0636c7ce9946d3 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Thu, 27 Oct 2016 22:07:19 +0200 Subject: libsdl2: update to 2.0.5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 0001-src-video-make-it-compatible-with-wayland-1.10.patch is removed because the problem has been resolved upstream * Add 0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch so that WAYLAND_PROTOCOLS_SYSROOT_DIR is substituted in a way similar to gtk3 (From OE-Core rev: 97fff54efe6b03798ad1c5e39155eaeab0a33300) Signed-off-by: Andreas Müller Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...-sysroot-path-so-that-make-finds-our-wayl.patch | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch (limited to 'meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.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 new file mode 100644 index 0000000000..d042430b56 --- /dev/null +++ b/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch @@ -0,0 +1,32 @@ +From b44808e43130dcd13b43e5b978b9b24aeb4c134c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 20 Oct 2016 14:57:51 +0200 +Subject: [PATCH] prepend our sysroot path so that make finds our + wayland-protocol files +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 +--- + configure.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +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_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_PROTOCOLS_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` ++ WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` + video_wayland=yes + fi + fi +-- +2.5.5 + -- cgit 1.2.3-korg