Merge "Fix rpi touchscreen support on master"

diff --git a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend
index b32523f..72a4a78 100644 (file)
--- a/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3-adas/recipes-kernel/linux/linux-renesas_%.bbappend
@@ -8,3 +8,23 @@ SRC_URI_append_ulcb = " \
 SRC_URI_remove_ulcb = " \
     file://0113-arm64-dts-ulcb-kf-increase-SDIO-frequency-for-WLAN-c.patch \
 "
+
+KERNEL_DEVICETREE_remove_h3ulcb = " \
+    renesas/r8a7795-es1-h3ulcb-view.dtb \
+    renesas/r8a7795-es1-h3ulcb-had-alfa.dtb \
+    renesas/r8a7795-es1-h3ulcb-had-beta.dtb \
+    renesas/r8a7795-es1-h3ulcb-vb.dtb \
+    renesas/r8a7795-es1-h3ulcb-vb2.dtb \
+    renesas/r8a7795-es1-h3ulcb-vbm.dtb \
+    renesas/r8a7795-h3ulcb-view.dtb \
+    renesas/r8a7795-h3ulcb-had-alfa.dtb \
+    renesas/r8a7795-h3ulcb-had-beta.dtb \
+    renesas/r8a7795-h3ulcb-vb.dtb \
+    renesas/r8a7795-h3ulcb-vb2.dtb \
+    renesas/r8a7795-h3ulcb-vb2.1.dtb \
+    renesas/r8a7795-h3ulcb-vbm.dtb \
+    renesas/r8a7795-h3ulcb-4x2g-vb.dtb \
+    renesas/r8a7795-h3ulcb-4x2g-vb2.dtb \
+    renesas/r8a7795-h3ulcb-4x2g-vb2.1.dtb \
+    renesas/r8a7795-h3ulcb-4x2g-vbm.dtb \
+"

diff --git a/meta-agl-bsp/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/meta-agl-bsp/recipes-graphics/wayland/weston/0001-make-error-portable.patch
index 09ec155..0eb3d95 100644 (file)
--- a/meta-agl-bsp/recipes-graphics/wayland/weston/0001-make-error-portable.patch
+++ b/meta-agl-bsp/recipes-graphics/wayland/weston/0001-make-error-portable.patch
@@ -1,4 +1,4 @@
-From ad1d2161c811cff25d1684c33611f300adb753bc Mon Sep 17 00:00:00 2001
+From c4677e155736062e75687f1a655732c8902e912b Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Fri, 29 May 2015 20:56:00 -0700
 Subject: [PATCH] make error() portable
@@ -18,12 +18,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  create mode 100644 libweston/weston-error.h
 
 diff --git a/configure.ac b/configure.ac
-index 7aebbdb..dc9c802 100644
+index c05ad01..6da6e04 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -109,6 +109,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
+@@ -126,6 +126,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[],
+             [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile weston")],
              [[#include <time.h>]])
- AC_CHECK_HEADERS([execinfo.h])
  
 +AC_CHECK_HEADERS([error.h])
 +
@@ -57,7 +57,7 @@ index 0000000..2089d02
 +#endif
 +
 diff --git a/libweston/weston-launch.c b/libweston/weston-launch.c
-index 1adcf21..166bf3b 100644
+index bf73e0d..9064439 100644
 --- a/libweston/weston-launch.c
 +++ b/libweston/weston-launch.c
 @@ -33,7 +33,6 @@

diff --git a/meta-agl-profile-graphical-qt5/recipes-qt/qtaglextras/qtaglextras_git.bb b/meta-agl-profile-graphical-qt5/recipes-qt/qtaglextras/qtaglextras_git.bb
new file mode 100644 (file)
index 0000000..a874a9c
--- /dev/null
+++ b/meta-agl-profile-graphical-qt5/recipes-qt/qtaglextras/qtaglextras_git.bb
@@ -0,0 +1,28 @@
+LICENSE     = "Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE-2.0.txt;md5=3b83ef96387f14655fc854ddc3c6bd57"
+
+DEPENDS += "qtbase qtdeclarative qtquickcontrols2 qlibwindowmanager libhomescreen"
+
+SRC_URI = "git://gerrit.automotivelinux.org/gerrit/src/qtaglextras;protocol=https;branch=${AGL_BRANCH}"
+SRCREV = "2fe96de41a540477d425403cf3a59ec6f5871521"
+
+PV = "5.8.0+git${SRCPV}"
+S = "${WORKDIR}/git/"
+
+inherit qmake5
+
+PACKAGES += "${PN}-mkspecs"
+
+FILES_${PN}-mkspecs = "\
+    ${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs \
+"
+
+FILES_${PN}-dev += " \
+    ${OE_QMAKE_PATH_LIBS}/lib*${SOLIBSDEV} \
+    ${OE_QMAKE_PATH_LIBS}/pkgconfig \
+    ${OE_QMAKE_PATH_LIBS}/cmake/* \
+    ${OE_QMAKE_PATH_LIBS}/*.prl \
+    ${OE_QMAKE_PATH_LIBS}/*.la \
+    ${OE_QMAKE_PATH_DATA}/* \
+    ${OE_QMAKE_PATH_HEADERS}/* \
+"