aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2022-04-05 12:41:21 +0200
committerArmin Kuster <akuster808@gmail.com>2022-04-16 09:52:27 -0700
commitad8432f35f47e0aecf5b6c49a6d1794275f430aa (patch)
tree561d36e94dc3032677d76e79da66b149b8f947bc
parent908f06fb47f94e9afb91361f00064a8617d76f98 (diff)
downloadmeta-openembedded-ad8432f35f47e0aecf5b6c49a6d1794275f430aa.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> Signed-off-by: Armin Kuster <akuster808@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 73b852a4a..ee8b86268 100644
--- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
+++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb
@@ -72,7 +72,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"