Openembedded Devel Discussions
 help / color / mirror / Atom feed
From: Martin Jansa <martin.jansa@gmail.com>
To: openembedded-devel@lists.openembedded.org
Subject: Re: [meta-multimedia][PATCH 1/2] vlc: make x11 DISTRO_FEATURE optional (enabled by default)
Date: Wed, 2 Mar 2016 20:24:16 +0100	[thread overview]
Message-ID: <20160302192416.GF10529@jama> (raw)
In-Reply-To: <1455108862-2507-1-git-send-email-funman@videolan.org>

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

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
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

      parent reply	other threads:[~2016-03-02 19:22 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-10 12:54 [meta-multimedia][PATCH 1/2] vlc: make x11 DISTRO_FEATURE optional (enabled by default) Rafaël Carré
2016-02-10 12:54 ` [meta-multimedia][PATCH 2/2] vlc: make sdl " Rafaël Carré
2016-02-10 13:19   ` Martin Jansa
2016-02-10 13:20     ` Rafaël Carré
2016-02-10 13:25   ` [meta-multimedia][PATCHv2] " Rafaël Carré
2016-03-02 19:24 ` Martin Jansa [this message]

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=20160302192416.GF10529@jama \
    --to=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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox