From 706ea4ba002b6a8f49e3513dbe08b4dbbdce48f4 Mon Sep 17 00:00:00 2001 From: Changhyeok Bae Date: Mon, 25 Dec 2017 14:52:39 +0000 Subject: qtbase: Remove -no-use-gold-linker option Bug-AGL: SPEC-1181 Change-Id: I104b459c6ad0fb904dfeca0b7a8c1fdc73da1794 Signed-off-by: Changhyeok Bae --- recipes-qt/qt5/qtbase_%.bbappend | 3 --- 1 file changed, 3 deletions(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtbase_%.bbappend b/recipes-qt/qt5/qtbase_%.bbappend index 203b3264b..d568b1284 100644 --- a/recipes-qt/qt5/qtbase_%.bbappend +++ b/recipes-qt/qt5/qtbase_%.bbappend @@ -14,6 +14,3 @@ EXTRA_OECONF_append = "" # '-qpa wayland-egl' set wayland-egl as default of platform plagins PACKAGECONFIG[wayland]="-qpa wayland-egl -no-qpa-platform-guard" - -# Temporarily fix bug due to binutils 2.28 -QT_CONFIG_FLAGS_append = " -no-use-gold-linker" -- cgit From c8d5b2d65771178736b873c5070b8dfbc1b8c6f2 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Wed, 17 Jan 2018 16:52:00 +0100 Subject: Remove backport patch from Qt5 to show cover art Change-Id: I2ae50b3c5e4576414433001dda02f8ed14161016 Signed-off-by: Ronan Le Martret --- .../0001-GStreamer-support-cover-art-image.patch | 25 ---------------------- recipes-qt/qt5/qtmultimedia_%.bbappend | 1 - 2 files changed, 26 deletions(-) delete mode 100644 recipes-qt/qt5/qtmultimedia/0001-GStreamer-support-cover-art-image.patch (limited to 'recipes-qt') 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 255220aaf..000000000 --- a/recipes-qt/qt5/qtmultimedia/0001-GStreamer-support-cover-art-image.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 83026d306daecdeb8743f5a7d3bfcc752555c86e -Author: Tasuku Suzuki -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 1f3693b2d..a06ac2d89 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 \ " -- cgit From a96b1e5d3e04add535e50fa521e86aab4707ac0e Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Fri, 19 Jan 2018 11:19:12 +0100 Subject: Fix build of qtwayland 5.9 without evdev MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes a FTBS due to no evdev present. Change-Id: If00dff352e4b270b2dbd1d7df15869d984c883b8 Signed-off-by: Jan-Simon Möller --- recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch | 14 ++++++++++++++ recipes-qt/qt5/qtwayland_%.bbappend | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch (limited to 'recipes-qt') 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 000000000..e243ef2fd --- /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 a6a8f00b6..9807840ca 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 " -- cgit From 27913bb1820be75d08355923f10d1d149893ecdb Mon Sep 17 00:00:00 2001 From: ronan Date: Fri, 9 Feb 2018 11:55:28 +0100 Subject: Fix qtwayland patch Change-Id: I9d905493c49b82e4cf87400260f4276405867a71 Signed-off-by: ronan --- recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch b/recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch index e243ef2fd..99b519399 100644 --- a/recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch +++ b/recipes-qt/qt5/qtwayland/0099_qtwayland_no_evdev.patch @@ -6,7 +6,7 @@ index f0cdaf32..64b60218 100644 QMAKE_USE += wayland-client wayland-server --qtConfig(xkbcommon-evdev) +-qtConfig(xkbcommon-evdev): \ - QMAKE_USE += xkbcommon_evdev - WAYLANDCLIENTSOURCES += \ -- cgit