diff options
author | 2021-03-25 18:16:25 -0700 | |
---|---|---|
committer | 2021-04-03 07:46:03 -0700 | |
commit | c10ab3169fde7570d5aa7c3cac7acc213e722f14 (patch) | |
tree | c844755823dd2ebb09b80d7aac27b3585c00f892 /meta-multimedia | |
parent | d0c4661d78cac6a1db75fdb2f99d55516d20cb47 (diff) | |
download | meta-openembedded-contrib-c10ab3169fde7570d5aa7c3cac7acc213e722f14.tar.gz |
mpd: Check for commercial in LICENSE_FLAGS_WHITELIST
aac and ffmpeg could be enabled only if they have been whitelisted by
user
Signed-off-by: Khem Raj <raj.khem@gmail.com>
(cherry picked from commit 20ac7000cca4b1af84782e9e79dcc5207fdcf71a)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-multimedia')
-rw-r--r-- | meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.6.bb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.6.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.6.bb index e91bb5d978..b1fa96e1be 100644 --- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.6.bb +++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.22.6.bb @@ -2,8 +2,6 @@ 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 meson useradd systemd pkgconfig @@ -28,7 +26,14 @@ S = "${WORKDIR}/git" EXTRA_OEMESON += "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '-Dsystemd=enabled -Dsystemd_system_unit_dir=${systemd_system_unitdir} -Dsystemd_user_unit_dir=${systemd_system_unitdir}', '-Dsystemd=disabled', d)}" -PACKAGECONFIG ??= "aac alsa ao bzip2 daemon ffmpeg fifo flac fluidsynth iso9660 jack libsamplerate httpd mms mpg123 modplug sndfile upnp openal opus oss recorder vorbis wavpack zlib" +PACKAGECONFIG ??= "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "aac", "", d)} \ + alsa ao bzip2 daemon \ + ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "ffmpeg aac", "", d)} \ + fifo flac fluidsynth iso9660 \ + jack libsamplerate httpd \ + mms mpg123 modplug sndfile \ + upnp openal opus oss recorder \ + vorbis wavpack zlib" PACKAGECONFIG[aac] = "-Dfaad=enabled,-Dfaad=disabled,faad2" PACKAGECONFIG[alsa] = "-Dalsa=enabled,-Dalsa=disabled,alsa-lib" |