Merge remote-tracking branch 'origin/morty' into pyro

Not entirely a normal kind of merge. In previous merge
from origin/morty into pyro several automotive suite
specific commits were left out from the merge due
conflicts in automotive component recipes between
used platforms (morty 5.9 vs. pyro 5.10).

The commits previously left out fo the merge are
now included in this merge by a direct copy of
origin/morty branch's recipes-qt/automotive folder
into pyro. An exception is a single commit in pyro
(8513b63 - neptune-ui: bump srcrev, install fonts system-wide)
that's left in place and merged with origin/morty
content. Also, the toolchain changes under
packagegroups folder for automotive are applied,
thus making the following included commits list:

origin/morty:

  qtdeviceutilities: update to latest version
  meta-qt5: update meta layer
  meta-qt5: update meta layer
  neptune-ui: fetch sources from code.qt.io instead of github
  automotive: update neptune-ui
  automotive: update qtapplicationmanager
  automotive: update components
  intel: update mesa to 17.0.2
  automotive: update qtapplicationmanager
  automotive: update qtivi & qtapplicatiomanager
  Update GammaRay to the 2.9.0 release
  automotive: update qtivi
  automotive: update revisions
  automotive: update revisions
  automotive: update revisions
  automotive: update revisions
  Neptune-UI: Update to use the latest Neptune-UI
  qtivi: Fix the broken python3 binary inside an yocto SDK
  Update GammaRay
  qtquickcontrols2: Fix background regression
  kontron: update SMARC-sAMX6i BSP to r03.00

origin/morty (previously left out):

  Fix license checksum due to incremented year number
  Update GammaRay revision
  multiscreen-demo: update revision and fix startup
  automotive: update revisions
  sdk: add qtapplicationmanger staticdev package
  qtivi: enable ivigenerator for toolchain
  appman: add dependency to nativesdk-qtdeclarative
  qtivi: Update to the latest version and add PACKAGECONFIG options for qtsimulator

Conflicts:

 recipes-qt/automotive/gammaray_git.bb
 recipes-qt/automotive/multiscreen-demo_git.bb
 recipes-qt/automotive/neptune-ui_git.bb
 recipes-qt/automotive/qtapplicationmanager_git.bb
 recipes-qt/automotive/qtivi_git.bb
 recipes-qt/b2qt-addons/b2qt-demos.bb
 recipes-qt/qt5/qtdeviceutilities.bb
 recipes-qt/qt5/qtsystems_git.bbappend
 scripts/manifest.xml

Change-Id: I95ee06882d88e0dc91be1b9a769e4d88e0b11591

4 files changed, 110 insertions, 0 deletions

diff --git a/meta-intel-extras/recipes/mesa/files/0001-Use-wayland-scanner-in-the-path.patch b/meta-intel-extras/recipes/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
new file mode 100644
index 0000000..e49695b
--- /dev/null
+++ b/meta-intel-extras/recipes/mesa/files/0001-Use-wayland-scanner-in-the-path.patch
@@ -0,0 +1,37 @@
+From 2f68fcaaf4964e7feeb383f5c26851965cda037c Mon Sep 17 00:00:00 2001
+From: Jussi Kukkonen <jussi.kukkonen@intel.com>
+Date: Tue, 15 Nov 2016 15:20:49 +0200
+Subject: [PATCH] Simplify wayland-scanner lookup
+
+Don't use pkg-config to lookup the path of a binary that's in the path.
+
+Alternatively we'd have to prefix the path returned by pkg-config with
+PKG_CONFIG_SYSROOT_DIR.
+
+Upstream-Status: Pending
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ configure.ac | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index e56e35a..a92005a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -2020,12 +2020,7 @@ if test "x$with_egl_platforms" != "x" -a "x$enable_egl" != xyes; then
+     AC_MSG_ERROR([cannot build egl state tracker without EGL library])
+ fi
+ 
+-PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner],
+-        WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`,
+-        WAYLAND_SCANNER='')
+-if test "x$WAYLAND_SCANNER" = x; then
+-    AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
+-fi
++AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner])
+ 
+ # Do per-EGL platform setups and checks
+ egl_platforms=`IFS=', '; echo $with_egl_platforms`
+-- 
+2.1.4
+
diff --git a/meta-intel-extras/recipes/mesa/files/disable-asm-on-non-gcc.patch b/meta-intel-extras/recipes/mesa/files/disable-asm-on-non-gcc.patch
new file mode 100644
index 0000000..d2d6755
--- /dev/null
+++ b/meta-intel-extras/recipes/mesa/files/disable-asm-on-non-gcc.patch
@@ -0,0 +1,29 @@
+Configure checks for compiler to be gcc and then it enables asm_offsets
+generation. see
+
+https://cgit.freedesktop.org/mesa/mesa/commit/?id=73c9b4b0e05fc66629ba250846948dc55c0e7a0d
+
+However, we missed the check when enabling this on cross compilation
+when architecture for both host and target is x86
+
+Fixes errors like
+./gen_matypes > matypes.h
+/bin/bash: ./gen_matypes: No such file or directory
+
+-Khem
+
+Upstream-Status: Submitted
+
+Index: mesa-12.0.1/configure.ac
+===================================================================
+--- mesa-12.0.1.orig/configure.ac
++++ mesa-12.0.1/configure.ac
+@@ -732,7 +732,7 @@ test "x$enable_asm" = xno && AC_MSG_RESU
+ if test "x$enable_asm" = xyes -a "x$cross_compiling" = xyes; then
+     case "$host_cpu" in
+     i?86 | x86_64 | amd64)
+-        if test "x$host_cpu" != "x$target_cpu"; then
++        if test "x$host_cpu" != "x$target_cpu" -o "x$acv_mesa_CLANG" = xyes; then
+             enable_asm=no
+             AC_MSG_RESULT([no, cross compiling])
+         fi
diff --git a/meta-intel-extras/recipes/mesa/files/replace_glibc_check_with_linux.patch b/meta-intel-extras/recipes/mesa/files/replace_glibc_check_with_linux.patch
new file mode 100644
index 0000000..0280ee8
--- /dev/null
+++ b/meta-intel-extras/recipes/mesa/files/replace_glibc_check_with_linux.patch
@@ -0,0 +1,26 @@
+endianness check is OS wide and not specific to libc
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
+Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
+---
+ src/util/u_endian.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/util/u_endian.h b/src/util/u_endian.h
+index b9d563d..2d5eab9 100644
+--- a/src/util/u_endian.h
++++ b/src/util/u_endian.h
+@@ -27,7 +27,7 @@
+ #ifndef U_ENDIAN_H
+ #define U_ENDIAN_H
+ 
+-#if defined(__GLIBC__) || defined(ANDROID)
++#if defined(__linux__)
+ #include <endian.h>
+ 
+ #if __BYTE_ORDER == __LITTLE_ENDIAN
+-- 
+2.1.4
+
diff --git a/meta-intel-extras/recipes/mesa/mesa_17.0.2.bb b/meta-intel-extras/recipes/mesa/mesa_17.0.2.bb
new file mode 100644
index 0000000..b95f301
--- /dev/null
+++ b/meta-intel-extras/recipes/mesa/mesa_17.0.2.bb
@@ -0,0 +1,18 @@
+require recipes-graphics/mesa/${BPN}.inc
+
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/mesa-${PV}.tar.xz \
+           file://replace_glibc_check_with_linux.patch \
+           file://disable-asm-on-non-gcc.patch \
+           file://0001-Use-wayland-scanner-in-the-path.patch \
+"
+
+SRC_URI[md5sum] = "8f808e92b893d412fbd6510e1d16f5c5"
+SRC_URI[sha256sum] = "f8f191f909e01e65de38d5bdea5fb057f21649a3aed20948be02348e77a689d4"
+
+#because we cannot rely on the fact that all apps will use pkgconfig,
+#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER
+do_install_append() {
+    if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then
+        sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h
+    fi
+}