aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-10-16 15:10:54 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2020-10-20 11:59:17 +0200
commit713882bf16a18a28ebdb5434e5524a8eeb2049c6 (patch)
tree92ed38a9aea2fd39333b619fb10910e3ac0097d3
parent4508395fcd1d09581c4749721cf98e1a5fdab73f (diff)
downloadmeta-openembedded-contrib-jansa/master.tar.gz
meta-openembedded-contrib-jansa/master.tar.bz2
meta-openembedded-contrib-jansa/master.zip
mpd: add commercial LICENSE_FLAGS when ffmpeg or aac PACKAGECONFIG is enabledjansa/master
* resolves bitbake world error: ERROR: Nothing PROVIDES 'ffmpeg' (but meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb DEPENDS on or otherwise requires it) ffmpeg was skipped: because it has a restricted license 'commercial'. Which is not whitelisted in LICENSE_FLAGS_WHITELIST ERROR: Required build target 'meta-world-pkgdata' has no buildable providers. Missing or unbuildable dependency chain was: ['meta-world-pkgdata', 'mpd', 'ffmpeg'] * aac is conditionally included in PACKAGECONFIG based on LICENSE_FLAGS since: commit f5d271fd545c5b78d4a8fbc81e54df454fa0d5e4 Author: Armin Kuster <akuster808@gmail.com> Date: Mon Oct 1 08:05:28 2018 -0700 mpd: enable aac PACKAGECONFIG only with commercial LICENSE_FLAGS maybe we could use the same for ffmpeg, but the conditional should be a bit more complicated, because the aac support is whitelisted by either commercial, commercial_faad2 or faad2 in LICENSE_FLAGS_WHITELIST not just currently checked 'commercial'. and we cannot use LICENSE_FLAGS conditional in both, because that leads to bb.data_smart.ExpansionError: Failure expanding variable LICENSE_FLAGS, expression was ${@bb.utils.contains('PACKAGECONFIG', 'ffmpeg', 'commercial', '', d)} which triggered exception RecursionError: maximum recursion depth exceeded Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb6
1 files changed, 4 insertions, 2 deletions
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb
index 818b9271f9..b214672c62 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.20.22.bb
@@ -1,6 +1,9 @@
SUMMARY = "Music Player Daemon"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+
+LICENSE_FLAGS = "${@bb.utils.contains_any('PACKAGECONFIG', ['ffmpeg', 'aac'], 'commercial', '', d)}"
+
HOMEPAGE ="http://www.musicpd.org"
inherit autotools useradd systemd pkgconfig
@@ -27,8 +30,7 @@ S = "${WORKDIR}/git"
EXTRA_OECONF += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
-PACKAGECONFIG ??= "alsa ao bzip2 daemon ffmpeg fifo flac fluidsynth iso9660 jack libsamplerate libwrap httpd mms mpg123 modplug sndfile upnp openal opus oss recorder vorbis wavpack zlib"
-PACKAGECONFIG_append = " ${@bb.utils.contains('LICENSE_FLAGS', 'commercial', 'aac', '', d)}"
+PACKAGECONFIG ??= "aac alsa ao bzip2 daemon ffmpeg fifo flac fluidsynth iso9660 jack libsamplerate libwrap httpd mms mpg123 modplug sndfile upnp openal opus oss recorder vorbis wavpack zlib"
PACKAGECONFIG[aac] = "--enable-aac,--disable-aac,faad2"
PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"