On Wed, Feb 10, 2016 at 01:54:21PM +0100, Rafaël Carré wrote: > --- > meta-multimedia/recipes-multimedia/vlc/vlc.inc | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc > b/meta-multimedia/recipes-multimedia/vlc/vlc.inc > index 46dbd5d..2887a68 100644 > --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc > +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc > @@ -7,17 +7,15 @@ LIC_FILES_CHKSUM = > "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" > > DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \ > virtual/libsdl libsdl-image dbus dbus-glib libxml2 gnutls \ > - tremor faad2 ffmpeg flac libxpm libxinerama fluidsynth alsa-lib \ > + tremor faad2 ffmpeg flac fluidsynth alsa-lib \ > lua-native lua libidn \ > avahi jpeg xz libmodplug mpeg2dec \ > libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \ > - tiff xcb-util-keysyms" > + tiff" > > SRC_URI = > "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz"; > > inherit autotools gettext pkgconfig distro_features_check > -# depends on libxinerama libxpm xcb-util-keysyms > -REQUIRED_DISTRO_FEATURES = "x11" > > ARM_INSTRUCTION_SET = "arm" > > @@ -41,7 +39,7 @@ EXTRA_OECONF = "\ > ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ > " > > -PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread" > +PACKAGECONFIG ?= " live555 dc1394 dv1394 notify fontconfig freetype dvdread > {@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
Missing $ before {@ causes few QA errors:
vlc-2.2.1: vlc: invalid PACKAGECONFIG: {@bb.utils.contains('DISTRO_FEATURES',
[invalid-packageconfig]
vlc-2.2.1: vlc: invalid PACKAGECONFIG: 'x11', [invalid-packageconfig]
vlc-2.2.1: vlc: invalid PACKAGECONFIG: 'x11 [invalid-packageconfig]
vlc-2.2.1: vlc: invalid PACKAGECONFIG: sdl', [invalid-packageconfig]
vlc-2.2.1: vlc: invalid PACKAGECONFIG: '', [invalid-packageconfig]
vlc-2.2.1: vlc: invalid PACKAGECONFIG: d)} [invalid-packageconfig]
Interesting that nobody noticed.
> PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
> PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
> PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
> @@ -73,6 +71,7 @@ PACKAGECONFIG[fontconfig] =
> "--enable-fontconfig,--disable-fontconfig, fontconfi
> PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype, freetype"
> PACKAGECONFIG[dvdread] = "--enable-dvdread,--disable-dvdread, libdvdread
> libdvdcss"
> PACKAGECONFIG[vnc] = "--enable-vnc,--disable-vnc, libvncserver"
> +PACKAGECONFIG[x11] = "--with-x --enable-xcb,--without-x --disable-xcb,
> xcb-util-keysyms libxpm libxinerama"
>
> do_configure_prepend() {
> cp ${STAGING_DATADIR}/libtool/config.* ${S}/autotools/ || true
> --
> 2.5.0
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> [email protected]
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: [email protected]
signature.asc
Description: Digital signature
-- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
