From: Paul Barker <paul@betafive.co.uk>
To: "Andreas Müller" <schnitzeltony@gmail.com>
Cc: openembeded-devel <openembedded-devel@lists.openembedded.org>
Subject: Re: [PATCH] vlc: rework qt PACKAGECONFIG
Date: Tue, 23 Apr 2019 01:41:26 +0100 [thread overview]
Message-ID: <16abe617-eaaf-afe4-6190-f51315494712@betafive.co.uk> (raw)
In-Reply-To: <CALbNGRQdfS-xNdheKuj=AA1zaChsA_g1gb6kMkiU8jGXngfw0g@mail.gmail.com>
On 23/04/2019 01:07, Andreas Müller wrote:
> On Tue, Apr 23, 2019 at 1:55 AM Paul Barker <paul@betafive.co.uk> wrote:
>>
>> On 23/04/2019 00:46, Andreas Müller wrote:
>>> * qt4 support is gone -> move to qt5
>>> * enable qt5 gui in case meta-qt5 is in layers (it is more or less useless
>>> without gui)
>>> * while at it remove noop libtool copy
>>>
>>> Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
>>> ---
>>> V1 -> V2: Aargh again typo in commit messeage...
>>> .../recipes-multimedia/vlc/vlc.inc | 25 ++++++++++++-------
>>> 1 file changed, 16 insertions(+), 9 deletions(-)
>>>
>>> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
>>> index 19ac8206c..6ba1444b5 100644
>>> --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
>>> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
>>> @@ -36,12 +36,18 @@ EXTRA_OECONF = "\
>>> --enable-realrtsp \
>>> --disable-libtar \
>>> --enable-avcodec \
>>> - ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
>>> - ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \
>>> - ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
>>> + ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/moc \
>>> + ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/rcc \
>>> + ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/uic \
>>> "
>>>
>>> -PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread png ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
>>> +PACKAGECONFIG ?= " \
>>> + live555 dc1394 dv1394 notify fontconfig freetype dvdread png \
>>> + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \
>>> + ${@bb.utils.contains('BBFILE_COLLECTIONS', 'qt5-layer', 'qt5', '', d)} \
>>
>> I don't like this change based on BBFILE_COLLECTIONS, it's just a
>> different way of having things change when you add an extra layer. We
>> wouldn't want an unconditional bbappend in meta-qt5 to set this and so
>> we don't want to set it here when that layer is added.
>>
>> Perhaps we should have qt5 as a distro feature instead?
> Isn't that a different naming for the same thing not working properly
> if you don't have meta-qt5 in layers?
>
Agreed, we shouldn't give people more opportunities to shoot themselves
in the foot!
For my builds I have all layers added all the time and just
enable/disable features as needed. So just because meta-qt5 is included
as a layer doesn't mean I'm even building an x11 or weston
configuration, it could be command line only in which case I wouldn't
want this extra PACKAGECONFIG creeping in.
meta-virtualization handles this by gating overrides on a
'virtualization' distro feature and adding a sanity check that you
enabled that distro feature when adding the layer
(http://git.yoctoproject.org/cgit/cgit.cgi/meta-virtualization/tree/classes/sanity-meta-virt.bbclass).
The sanity check can be disabled by setting SKIP_META_VIRT_SANITY_CHECK.
I find it a bit messy but it does work.
What would work for this case is a bbappend in meta-qt5 which checks for
the 'qt5' distro feature. The benefit of using a distro feature is that
we can gate changes to other recipes on the same configuration setting
so that we don't need to set lots of PACKAGECONFIG values explicitly in
a distro or local.conf.
Forgive my 01:40 AM brain if any of that doesn't make sense.
> Andreas
>
--
Paul Barker
Managing Director & Principal Engineer
Beta Five Ltd
next prev parent reply other threads:[~2019-04-23 0:41 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-22 23:46 [PATCH] vlc: rework qt PACKAGECONFIG Andreas Müller
2019-04-22 23:55 ` Paul Barker
2019-04-23 0:07 ` Andreas Müller
2019-04-23 0:41 ` Paul Barker [this message]
2019-04-23 6:08 ` Adrian Bunk
2019-04-23 11:30 ` Andreas Müller
2019-04-23 12:07 ` Paul Barker
2019-04-23 12:19 ` Adrian Bunk
2019-04-23 11:55 Andreas Müller
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=16abe617-eaaf-afe4-6190-f51315494712@betafive.co.uk \
--to=paul@betafive.co.uk \
--cc=openembedded-devel@lists.openembedded.org \
--cc=schnitzeltony@gmail.com \
/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.