On 6/30/20 5:28 PM, Martin Jansa wrote: > >  [AK: meta-QT5 dufell has 5.15 so this is seems reasonable.] > > I don't know which meta-QT5 had 'dufell' :) but 'dunfell' branch > in https://github.com/meta-qt5/meta-qt5 has 5.15 Hmm, I did try double checking... looks something went wrong in my checking not to mention my spelling. I will drop this. thanks for reviewing. -armin > only in master branch and dunfell will stay on 5.14.*, but the > 0005-Fix-build-with-Qt-5.15.patch seems to be backwards compatible, I > guess it does no harm backporting this and might be useful for someone > (as people are often mixing different meta-qt5 branches when they > needs specific Qt release for whatever reason) > > On Tue, Jun 30, 2020 at 5:07 PM akuster > wrote: > > From: Andreas Müller > > > Signed-off-by: Andreas Müller > > Signed-off-by: Khem Raj > > (cherry picked from commit aadbc77f8e132301403c1187e8d0488d526f8817) > [AK: meta-QT5 dufell has 5.15 so this is seems reasonable.] > Signed-off-by: Armin Kuster > > --- >  ...ch => 0001-make-opencv-configurable.patch} |  0 >  ...isidec.patch => 0002-use-vorbisidec.patch} |  0 >  ...int.patch => 0003-fix-luaL-checkint.patch} |  0 >  ...ackageconfig-to-detect-mmal-support.patch} |  0 >  .../vlc/vlc/0005-Fix-build-with-Qt-5.15.patch | 56 > +++++++++++++++++++ >  .../recipes-multimedia/vlc/vlc_3.0.9.2.bb >      |  9 +-- >  6 files changed, 61 insertions(+), 4 deletions(-) >  rename > meta-multimedia/recipes-multimedia/vlc/vlc/{0006-make-opencv-configurable.patch > => 0001-make-opencv-configurable.patch} (100%) >  rename > meta-multimedia/recipes-multimedia/vlc/vlc/{0007-use-vorbisidec.patch > => 0002-use-vorbisidec.patch} (100%) >  rename > meta-multimedia/recipes-multimedia/vlc/vlc/{0008-fix-luaL-checkint.patch > => 0003-fix-luaL-checkint.patch} (100%) >  rename > meta-multimedia/recipes-multimedia/vlc/vlc/{0001-Use-packageconfig-to-detect-mmal-support.patch > => 0004-Use-packageconfig-to-detect-mmal-support.patch} (100%) >  create mode 100644 > meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch > > diff --git > a/meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch > b/meta-multimedia/recipes-multimedia/vlc/vlc/0001-make-opencv-configurable.patch > similarity index 100% > rename from > meta-multimedia/recipes-multimedia/vlc/vlc/0006-make-opencv-configurable.patch > rename to > meta-multimedia/recipes-multimedia/vlc/vlc/0001-make-opencv-configurable.patch > diff --git > a/meta-multimedia/recipes-multimedia/vlc/vlc/0007-use-vorbisidec.patch > b/meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch > similarity index 100% > rename from > meta-multimedia/recipes-multimedia/vlc/vlc/0007-use-vorbisidec.patch > rename to > meta-multimedia/recipes-multimedia/vlc/vlc/0002-use-vorbisidec.patch > diff --git > a/meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch > b/meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-luaL-checkint.patch > similarity index 100% > rename from > meta-multimedia/recipes-multimedia/vlc/vlc/0008-fix-luaL-checkint.patch > rename to > meta-multimedia/recipes-multimedia/vlc/vlc/0003-fix-luaL-checkint.patch > diff --git > a/meta-multimedia/recipes-multimedia/vlc/vlc/0001-Use-packageconfig-to-detect-mmal-support.patch > b/meta-multimedia/recipes-multimedia/vlc/vlc/0004-Use-packageconfig-to-detect-mmal-support.patch > similarity index 100% > rename from > meta-multimedia/recipes-multimedia/vlc/vlc/0001-Use-packageconfig-to-detect-mmal-support.patch > rename to > meta-multimedia/recipes-multimedia/vlc/vlc/0004-Use-packageconfig-to-detect-mmal-support.patch > diff --git > a/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch > b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch > new file mode 100644 > index 0000000000..c4465b6af3 > --- /dev/null > +++ > b/meta-multimedia/recipes-multimedia/vlc/vlc/0005-Fix-build-with-Qt-5.15.patch > @@ -0,0 +1,56 @@ > +From c805c6f64da6d8b03355b4796865b75e2f3b500d Mon Sep 17 00:00:00 > 2001 > +From: =?UTF-8?q?Andreas=20M=C3=BCller?= > > +Date: Mon, 8 Jun 2020 00:50:08 +0200 > +Subject: [PATCH] Fix build with Qt >= 5.15 > +MIME-Version: 1.0 > +Content-Type: text/plain; charset=UTF-8 > +Content-Transfer-Encoding: 8bit > + > +Upstream-Status: Pending > + > +Signed-off-by: Andreas Müller > > +--- > + modules/gui/qt/components/playlist/views.cpp | 1 + > + modules/gui/qt/dialogs/plugins.cpp           | 1 + > + modules/gui/qt/util/timetooltip.hpp          | 1 + > + 3 files changed, 3 insertion(+) > + > +diff --git a/modules/gui/qt/components/playlist/views.cpp > b/modules/gui/qt/components/playlist/views.cpp > +index 24db9d9..71d8514 100644 > +--- a/modules/gui/qt/components/playlist/views.cpp > ++++ b/modules/gui/qt/components/playlist/views.cpp > +@@ -35,6 +35,7 @@ > + #include > + #include > + #include > ++#include > + > + #include > + > +diff --git a/modules/gui/qt/dialogs/plugins.cpp > b/modules/gui/qt/dialogs/plugins.cpp > +index d233382..9ae9a63 100644 > +--- a/modules/gui/qt/dialogs/plugins.cpp > ++++ b/modules/gui/qt/dialogs/plugins.cpp > +@@ -66,6 +66,7 @@ > + #include > + #include > + #include > ++#include > + > + //match the image source (width/height) > + #define SCORE_ICON_WIDTH_SCALE 4 > +diff --git a/modules/gui/qt/util/timetooltip.hpp > b/modules/gui/qt/util/timetooltip.hpp > +index 6a1329e..9f50b18 100644 > +--- a/modules/gui/qt/util/timetooltip.hpp > ++++ b/modules/gui/qt/util/timetooltip.hpp > +@@ -25,6 +25,7 @@ > + #include "qt.hpp" > + > + #include > ++#include > + > + class TimeTooltip : public QWidget > + { > +-- > +2.26.2 > + > diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb > > b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb > > index f6c7a606d5..24898a5a7f 100644 > --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb > > +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb > > @@ -19,10 +19,11 @@ LDFLAGS_append_riscv64 = " -latomic" >  LICENSE_FLAGS = "commercial" > >  SRC_URI = > "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz > > \ > -           file://0006-make-opencv-configurable.patch \ > -           file://0007-use-vorbisidec.patch \ > -           file://0008-fix-luaL-checkint.patch \ > -          >  file://0001-Use-packageconfig-to-detect-mmal-support.patch \ > +           file://0001-make-opencv-configurable.patch \ > +           file://0002-use-vorbisidec.patch \ > +           file://0003-fix-luaL-checkint.patch \ > +          >  file://0004-Use-packageconfig-to-detect-mmal-support.patch \ > +           file://0005-Fix-build-with-Qt-5.15.patch \ >  " >  SRC_URI[sha256sum] = > "a9bdad293d81cd48516abad8d490d8ab4012964ae541ff19e00021e071e47601" > > -- > 2.17.1 > > >