Merge remote-tracking branch 'agl/sandbox/ronan/rocko' into HEAD

* agl/sandbox/ronan/rocko:
  Remove weston virtual screen
  Fix most for kernel 4.14
  Fix qtwayland patch
  Fix build of qtwayland 5.9 without evdev
  Remove backport patch from Qt5 to show cover art
  ninja,harfbuzz: Remove .bbappend
  libdbus-c++:Fix build error in GCC-7
  qtbase: Remove -no-use-gold-linker option
  unicens-config: Add bash to rdeps
  libdbus-c++: Remove bbappend file
  opencv: Rename .bbappend to match new version from meta-openembedded

Bug-AGL: SPEC-1181

Change-Id: Icc3062631994e8afbddeb18a52c72619156d219a
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>

4 files changed, 16 insertions, 26 deletions

diff --git a/recipes-qt/qt5/qtmultimedia/0001-GStreamer-support-cover-art-image.patch b/recipes-qt/qt5/qtmultimedia/0001-GStreamer-support-cover-art-image.patch
deleted file mode 100644
index 255220aa..00000000
--- a/recipes-qt/qt5/qtmultimedia/0001-GStreamer-support-cover-art-image.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-commit 83026d306daecdeb8743f5a7d3bfcc752555c86e
-Author: Tasuku Suzuki <tasuku.suzuki@qt.io>
-Date:   Wed Dec 14 23:00:37 2016 +0900
-
-    return better images in metadata in gstreamer
-    
-    cover art image uses "preview image". But "image" is better for
-    that. "preview image" will be used for thumbnail image.
-    
-    Change-Id: Ic01f878f146b0369eb84e6b153fa68fbc6c54e57
-
-diff --git a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
-index 01103d65..b9e29245 100644
---- a/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
-+++ b/src/plugins/gstreamer/mediaplayer/qgstreamermetadataprovider.cpp
-@@ -93,7 +93,8 @@ static const QGstreamerMetaDataKeyLookup *qt_gstreamerMetaDataKeys()
- 
-         //metadataKeys->insert(0, QMediaMetaData::CoverArtUrlSmall);
-         //metadataKeys->insert(0, QMediaMetaData::CoverArtUrlLarge);
--        metadataKeys->insert(GST_TAG_PREVIEW_IMAGE, QMediaMetaData::CoverArtImage);
-+        metadataKeys->insert(GST_TAG_PREVIEW_IMAGE, QMediaMetaData::ThumbnailImage);
-+        metadataKeys->insert(GST_TAG_IMAGE, QMediaMetaData::CoverArtImage);
- 
-         // Image/Video
-         metadataKeys->insert("resolution", QMediaMetaData::Resolution);
diff --git a/recipes-qt/qt5/qtmultimedia_%.bbappend b/recipes-qt/qt5/qtmultimedia_%.bbappend
index 1f3693b2..a06ac2d8 100644
--- a/recipes-qt/qt5/qtmultimedia_%.bbappend
+++ b/recipes-qt/qt5/qtmultimedia_%.bbappend
@@ -4,5 +4,4 @@ PACKAGECONFIG_append = " gstreamer"
 
 SRC_URI_append = " \
     file://0001-metadata-image-support-with-the-data-URL-scheme-for-.patch \
-    file://0001-GStreamer-support-cover-art-image.patch \
     "
diff --git a/recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch b/recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch
new file mode 100644
index 00000000..99b51939
--- /dev/null
+++ b/recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch
@@ -0,0 +1,14 @@
+diff --git a/tests/auto/compositor/compositor/compositor.pro b/tests/auto/compositor/compositor/compositor.pro
+index f0cdaf32..64b60218 100644
+--- a/tests/auto/compositor/compositor/compositor.pro
++++ b/tests/auto/compositor/compositor/compositor.pro
+@@ -7,9 +7,6 @@ QT += core-private gui-private waylandcompositor waylandcompositor-private
+ 
+ QMAKE_USE += wayland-client wayland-server
+ 
+-qtConfig(xkbcommon-evdev): \
+-    QMAKE_USE += xkbcommon_evdev
+-
+ WAYLANDCLIENTSOURCES += \
+             ../../../../src/3rdparty/protocol/xdg-shell.xml \
+             ../../../../src/3rdparty/protocol/ivi-application.xml \
diff --git a/recipes-qt/qt5/qtwayland_%.bbappend b/recipes-qt/qt5/qtwayland_%.bbappend
index a6a8f00b..9807840c 100644
--- a/recipes-qt/qt5/qtwayland_%.bbappend
+++ b/recipes-qt/qt5/qtwayland_%.bbappend
@@ -32,3 +32,5 @@ SRC_URI_append_checkforkrogoth = "\
 
 DEPENDS_append_koelsch = " libegl gles-user-module"
 DEPENDS_append_porter = " ${@base_conditional('PREFERRED_PROVIDER_virtual/egl', 'mesa', 'mesa', 'libegl gles-user-module', d)}"
+
+SRC_URI_append = " file://0099_qtwayland_no_evdev.patch "