raspberrypi: add support for RPi 3 Model B+

Latest revision from meta-raspberrypi rocko branch has support for
model B+. gstreamer1.0-omx was updated to 1.12 in poky, but still 1.10
in pyro branch that we are using.

Task-number: QTBUG-67656
Change-Id: I4fb26055759682b3d385cf2b385f437a7fba9628
Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io>

3 files changed, 20 insertions, 1 deletions

diff --git a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
index f980e13..8c86d1a 100644
--- a/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
+++ b/meta-boot2qt-distro/conf/distro/include/raspberrypi.inc
@@ -46,3 +46,9 @@ module_conf_bcm2835-v4l2 = "options bcm2835-v4l2 gst_v4l2src_is_broken=1"
 VIDEO_CAMERA = "1"
 
 MACHINE_FEATURES += "pitft"
+
+BBMASK += "\
+    meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.12%.bbappend \
+    "
+
+MACHINE_GSTREAMER_1_0_PLUGIN += "gstreamer1.0-omx"
diff --git a/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-omx_1.10%.bbappend b/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-omx_1.10%.bbappend
new file mode 100644
index 0000000..5f5e919
--- /dev/null
+++ b/meta-raspberrypi-extras/recipes/gstreamer/gstreamer1.0-omx_1.10%.bbappend
@@ -0,0 +1,13 @@
+#
+# Need to make this conditional to gstreamer1
+#
+SRC_URI_append_rpi = " \
+             file://0001-config-files-path.patch \
+             file://0001-Don-t-try-to-acquire-buffer-when-src-pad-isn-t-activ.patch \
+             file://0002-fix-decoder-flushing.patch \
+             file://0003-no-timeout-on-get-state.patch \
+             file://0004-Properly-handle-drain-requests-while-flushing.patch \
+             file://0005-Don-t-abort-gst_omx_video_dec_set_format-if-there-s-.patch \
+"
+
+FILESEXTRAPATHS_prepend := "${BSPDIR}/sources/meta-raspberrypi/recipes-multimedia/gstreamer/gstreamer1.0-omx-1.12:"
diff --git a/scripts/manifest.xml b/scripts/manifest.xml
index c06b415..54185ee 100644
--- a/scripts/manifest.xml
+++ b/scripts/manifest.xml
@@ -50,7 +50,7 @@
            groups="notdefault,external,ti"/>
   <project name="meta-raspberrypi"
            remote="yocto"
-           revision="8ba2d6fc80b31c87d25c87c863e2a77752b07c3c"
+           revision="acfb857227f1216cd64767952f0c25d633df10b8"
            path="sources/meta-raspberrypi"
            groups="notdefault,external,rpi"/>
   <project name="meta-intel"