From 0bcc3f89f11a6f72a3b32fcb2e68d98291d647c5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Thu, 25 Mar 2021 18:19:36 -0700 Subject: vlc: Exclude from world if commercial is not in inclusion list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Remove LICENSE_FLAGS setting as its no longer needed Signed-off-by: Khem Raj Cc: Andreas Müller (cherry picked from commit dbd662de1ca670459ddc88cf68c9a3f888ba71ee) Signed-off-by: Armin Kuster --- meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb index c0074aabb5..cb796a00fa 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb +++ b/meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb @@ -16,9 +16,6 @@ DEPENDS = "coreutils-native fribidi libtool libgcrypt libgcrypt-native \ LDFLAGS_append_riscv64 = " -latomic" LDFLAGS_append_riscv32 = " -latomic" -# While this item does not require it, it depends on ffmpeg which does -LICENSE_FLAGS = "commercial" - SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \ file://0001-make-opencv-configurable.patch \ file://0002-use-vorbisidec.patch \ @@ -134,3 +131,4 @@ FILES_${PN}-staticdev += "\ INSANE_SKIP_${PN} = "dev-so" +EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "0", "1", d)}" -- cgit v1.2.3-54-g00ecf