[oe] [warrior][PATCH 1/4] vlc: rework qt PACKAGECONFIG

[akuster808]

On 8/17/19 1:13 AM, Andreas Müller wrote:
I found this buried at the bottom of my inbox so apologies for
responding so late.
> * qt4 support is gone -> move to qt5
By support gone do mean, not supported by Poky or do you mean QT removed
the sources?

- armin
> * while at it remove noop libtool copy
>
> Signed-off-by: Andreas Müller <schnitzeltony at gmail.com>
> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> ---
>  .../recipes-multimedia/vlc/vlc.inc            | 24 ++++++++++++-------
>  1 file changed, 15 insertions(+), 9 deletions(-)
>
> diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> index 19ac8206c..9bbc6685d 100644
> --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
> @@ -36,12 +36,17 @@ 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)} \
> +"
> +
> +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 +59,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 +81,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