[oe] [PATCH] vlc: rework qt PACKAGECONFIG

[Paul Barker]

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 at 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?

> +"
> +
> +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'qmake5_paths', '', d)}
>   
>   PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
>   PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
> @@ -54,7 +60,7 @@ PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv"
>   PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex"
>   PACKAGECONFIG[gstreamer] = "--enable-gst-decode,--disable-gst-decode,gstreamer1.0 gstreamer1.0-plugins-base gst-plugins-bad"
>   PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx, libvpx"
> -PACKAGECONFIG[qt4] = "--enable-qt,--disable-qt, qt4-x11-free"
> +PACKAGECONFIG[qt5] = "--enable-qt,--disable-qt, qtbase-native qtx11extras qtsvg"
>   PACKAGECONFIG[freerdp] = "--enable-freerdp,--disable-freerdp, freerdp"
>   PACKAGECONFIG[dvbpsi] = "--enable-dvbpsi,--disable-dvbpsi, libdvbpsi"
>   PACKAGECONFIG[samba] = "--enable-smbclient,--disable-smbclient, samba"
> @@ -76,12 +82,13 @@ PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb,  xcb-util
>   PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
>   PACKAGECONFIG[vdpau] = "--enable-vdpau,--disable-vdpau,libvdpau"
>   
> -do_configure_prepend() {
> -    cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
> -}
> -
>   do_configure_append() {
>       sed -i -e s:'${top_builddir_slash}libtool':'${top_builddir_slash}'${TARGET_SYS}-libtool:g ${B}/doltlibtool
> +
> +    # moc needs support: precreate build paths
> +    for qtpath in adapters components/epg components/playlist components/sout dialogs managers styles util/buttons; do
> +        mkdir -p "${B}/modules/gui/qt/$qtpath"
> +    done
>   }
>   
>   # This recipe packages vlc as a library as well, so qt4 dependencies
> 

-- 
Paul Barker
Managing Director & Principal Engineer
Beta Five Ltd