All of lore.kernel.org
 help / color / mirror / Atom feed
From: "akuster" <akuster808@gmail.com>
To: Martin Jansa <martin.jansa@gmail.com>
Cc: openembedded-devel <openembedded-devel@lists.openembedded.org>
Subject: Re: [oe] [dunfel 11/32] vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches
Date: Tue, 30 Jun 2020 19:07:43 -0700	[thread overview]
Message-ID: <9ec9db48-7a3d-e630-38a6-f76760d31e85@gmail.com> (raw)
In-Reply-To: <CA+chaQe_eVez=igr79bc1uBokxZpZsL+pBsA=hE+ikY_NECg8A@mail.gmail.com>

[-- Attachment #1: Type: text/plain, Size: 8513 bytes --]



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 <akuster808@gmail.com
> <mailto:akuster808@gmail.com>> wrote:
>
>     From: Andreas Müller <schnitzeltony@gmail.com
>     <mailto:schnitzeltony@gmail.com>>
>
>     Signed-off-by: Andreas Müller <schnitzeltony@gmail.com
>     <mailto:schnitzeltony@gmail.com>>
>     Signed-off-by: Khem Raj <raj.khem@gmail.com
>     <mailto:raj.khem@gmail.com>>
>     (cherry picked from commit aadbc77f8e132301403c1187e8d0488d526f8817)
>     [AK: meta-QT5 dufell has 5.15 so this is seems reasonable.]
>     Signed-off-by: Armin Kuster <akuster808@gmail.com
>     <mailto:akuster808@gmail.com>>
>     ---
>      ...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
>     <http://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?= <schnitzeltony@gmail.com
>     <mailto:schnitzeltony@gmail.com>>
>     +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 <schnitzeltony@gmail.com
>     <mailto:schnitzeltony@gmail.com>>
>     +---
>     + 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 <QMetaType>
>     + #include <QHeaderView>
>     + #include <QSvgRenderer>
>     ++#include <QPainterPath>
>     +
>     + #include <assert.h>
>     +
>     +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 <QSplitter>
>     + #include <QToolButton>
>     + #include <QStackedWidget>
>     ++#include <QPainterPath>
>     +
>     + //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 <QWidget>
>     ++#include <QPainterPath>
>     +
>     + class TimeTooltip : public QWidget
>     + {
>     +--
>     +2.26.2
>     +
>     diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb
>     <http://vlc_3.0.9.2.bb>
>     b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb
>     <http://vlc_3.0.9.2.bb>
>     index f6c7a606d5..24898a5a7f 100644
>     --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb
>     <http://vlc_3.0.9.2.bb>
>     +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.9.2.bb
>     <http://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
>     <http://download.videolan.org/pub/videolan/$%7BBPN%7D/$%7BPV%7D/$%7BBP%7D.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
>
>     
>


[-- Attachment #2: Type: text/html, Size: 12575 bytes --]

  reply	other threads:[~2020-07-01  2:07 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-01  0:06 [dunfel 00/32] Patch review akuster
2020-07-01  0:06 ` [dunfel 01/32] zchunk: upgrade 1.1.5 -> 1.1.6 akuster
2020-07-01  0:06 ` [dunfel 02/32] uriparser: upgrade 0.9.3 -> 0.9.4 akuster
2020-07-01  0:06 ` [dunfel 03/32] jsoncpp: upgrade 1.9.2 -> 1.9.3 akuster
2020-07-09 15:21   ` [oe] " Martin Jansa
2020-07-09 16:06     ` akuster
2020-07-09 16:48       ` Martin Jansa
2020-07-10  1:08         ` Khem Raj
2020-07-10  7:37           ` Mikko Rapeli
2020-07-12 18:41             ` akuster
2020-07-13  8:25               ` Mikko Rapeli
2020-07-13 15:46                 ` Khem Raj
2020-07-15  3:52                   ` akuster
2020-07-10 15:55           ` akuster
2020-07-10 16:18             ` Khem Raj
2020-07-01  0:06 ` [dunfel 04/32] proj: upgrade 7.0.0 -> 7.0.1 akuster
2020-07-01  0:06 ` [dunfel 05/32] netkit-rsh: properly append PACKAGECONFIG akuster
2020-07-01  0:06 ` [dunfel 06/32] zile: " akuster
2020-07-01  0:06 ` [dunfel 07/32] postgresql: 12.2 -> 12.3 akuster
2020-07-01  0:06 ` [dunfel 08/32] multipath-tools: Fix build with json-c 0.14 and newer akuster
2020-07-01  8:48   ` [oe] " Adrian Bunk
2020-07-01 16:56     ` akuster
2020-07-01  0:06 ` [dunfel 09/32] libblockdev: upgrade 2.23 -> 2.24 akuster
2020-07-01  0:06 ` [dunfel 10/32] libvpx: upgrade 1.8.1 -> 1.8.2 akuster
2020-07-01  0:06 ` [dunfel 11/32] vlc: Fix build with qt5 in PACKAGECONFIG and Qt >= 5.15 / renumber patches akuster
2020-07-01  0:28   ` [oe] " Martin Jansa
2020-07-01  2:07     ` akuster [this message]
2020-07-01  0:06 ` [dunfel 12/32] jpnevulator: upgrade 2.3.4 -> 2.3.5 akuster
2020-07-01  0:06 ` [dunfel 13/32] libnftnl: upgrade 1.1.6 -> 1.1.7 akuster
2020-07-01  0:06 ` [dunfel 14/32] nftables: upgrade 0.9.4 -> 0.9.5 akuster
2020-07-01  0:07 ` [dunfel 15/32] haveged: upgrade 1.9.8 -> 1.9.9 akuster
2020-07-01  0:07 ` [dunfel 16/32] mm-common: upgrade 1.0..0 -> 1.0.1 akuster
2020-07-01  0:07 ` [dunfel 17/32] python-django: add RDEPENDS akuster
2020-07-01  0:07 ` [dunfel 18/32] python-m2crypto: Add RDEPENDS akuster
2020-07-01  0:07 ` [dunfel 19/32] python-django: set CVE_PRODUCT to be django akuster
2020-07-01  0:07 ` [dunfel 20/32] python3-m2crypto: add the missing rdepends akuster
2020-07-01  0:07 ` [dunfel 21/32] zstd: Upgrade 1.4.4 -> 1.4.5 akuster
2020-07-01  0:07 ` [dunfel 22/32] rsnapshot: upgrade 1.4.2 -> 1.4.3 akuster
2020-07-01  0:07 ` [dunfel 23/32] fuse3: upgrade 3.9.1 -> 3.9.2 akuster
2020-07-01  0:07 ` [dunfel 24/32] protobuf-c: disable parallelism to avoid race condition akuster
2020-07-01  0:07 ` [dunfel 25/32] openipmi: upgrade 2.0.28 -> 2.0.29 akuster
2020-07-01  0:07 ` [dunfel 26/32] twm: upgrade 1.0.10 -> 1.0.11 akuster
2020-07-01  0:07 ` [dunfel 27/32] libtalloc: fix upstream url akuster
2020-07-01  0:07 ` [dunfel 28/32] linuxptp: Fix segmentation fault on 32 bit platforms with 64 bit time_t akuster
2020-07-01  0:07 ` [dunfel 29/32] openh264: upgrade 2.1.0 -> 2.1.1 akuster
2020-07-01  0:07 ` [dunfel 30/32] tcpreplay: upgrade 4.3.2 -> 4.3.3 akuster
2020-07-01  0:07 ` [dunfel 31/32] python3-sqlalchemy: Upgrade 1.3.12 -> 1.3.17 akuster
2020-07-01  0:07 ` [dunfel 32/32] ntp: update 4.2.8p15 akuster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=9ec9db48-7a3d-e630-38a6-f76760d31e85@gmail.com \
    --to=akuster808@gmail.com \
    --cc=martin.jansa@gmail.com \
    --cc=openembedded-devel@lists.openembedded.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.