diff options
-rw-r--r-- | meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb | 1 | ||||
-rw-r--r-- | meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb | 2 |
2 files changed, 2 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 672c8abc9a..618eaa68d1 100644 --- a/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb +++ b/meta-multimedia/recipes-multimedia/packagegroups/packagegroup-meta-multimedia.bb | |||
@@ -51,7 +51,6 @@ RDEPENDS:packagegroup-meta-multimedia = "\ | |||
51 | openal-soft \ | 51 | openal-soft \ |
52 | opusfile \ | 52 | opusfile \ |
53 | opus-tools \ | 53 | opus-tools \ |
54 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains("DISTRO_FEATURES", "x11", "vlc", "", d), "", d)} \ | ||
55 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "sox streamripper", "", d)} \ | 54 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "sox streamripper", "", d)} \ |
56 | tinyalsa \ | 55 | tinyalsa \ |
57 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 i686 x86-64", "x265", "", d), "", d)} \ | 56 | ${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", bb.utils.contains_any("TRANSLATED_TARGET_ARCH", "i586 i686 x86-64", "x265", "", d), "", d)} \ |
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb index 6406343c8d..2d2ecc63b9 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.21.bb | |||
@@ -132,3 +132,5 @@ FILES:${PN}-staticdev += "\ | |||
132 | INSANE_SKIP:${PN} = "dev-so" | 132 | INSANE_SKIP:${PN} = "dev-so" |
133 | 133 | ||
134 | EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}" | 134 | EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_ACCEPTED", "commercial", "0", "1", d)}" |
135 | |||
136 | SKIP_RECIPE[vlc] = "requires porting to ffmpeg >= 7 as of ffmpeg >= 5 it requires extensive changes disabling VAAPI (only supported with vlc >= 4)" | ||