aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2021-11-29 19:35:47 +0100
committerMartin Jansa <Martin.Jansa@gmail.com>2022-05-28 13:02:18 +0200
commit30867a53355880cddef47eac468f457fc71dafe2 (patch)
treec98dfb5d77f21eb3a33a6755aacc0a5bed96fade
parent0e6c34f82ca4d43cbca3754c5fe37c5b3bdd0f37 (diff)
downloadmeta-openembedded-contrib-30867a53355880cddef47eac468f457fc71dafe2.tar.gz
packagegroup-meta-multimedia: include x265 only with commercial in LICENSE_FLAGS_WHITELIST
* fixes: ERROR: Nothing RPROVIDES 'x265' (but meta-openembedded/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb RDEPENDS on or otherwise requires it) x265 was skipped: because it has a restricted license 'commercial'. Which is not whitelisted in LICENSE_FLAGS_WHITELIST * also include i686 so that it's included e.g. with default DEFAULTTUNE of qemux86 as recipe allows that with: COMPATIBLE_HOST = '(x86_64|i.86).*-linux' i586 isn't used by qemux86 since: commit f3b1e577ec94c849d0354f5679257f02ef4e4fe9 Author: Alexander Kanavin <alex.kanavin@gmail.com> Date: Thu May 16 17:04:04 2019 +0200 qemux86: use a Core 2 Duo CPU instead of the original circa-1993 Pentium Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
index 7e581392b6..cfe96bf024 100644
--- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
+++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
@@ -74,7 +74,7 @@ RDEPENDS:packagegroup-meta-multimedia = "\
tinyalsa \
tremor \
webrtc-audio-processing \
- ${@bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 x86-64", "x265", "", d)} \
+ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 i686 x86-64", "x265", "", d), "", d)} \
"
RDEPENDS:packagegroup-meta-multimedia:remove:libc-musl = "projucer"
RDEPENDS:packagegroup-meta-multimedia:remove:powerpc64le = "openh264"