summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2021-03-25 18:19:36 -0700
committerArmin Kuster <akuster808@gmail.com>2021-04-03 07:46:03 -0700
commit0bcc3f89f11a6f72a3b32fcb2e68d98291d647c5 (patch)
tree2e58f2d3383f385168498e60f4f88ce70c464d50
parent377e9ec1cb6ed3ebe1cb03259664eac28c301b09 (diff)
downloadmeta-openembedded-0bcc3f89f11a6f72a3b32fcb2e68d98291d647c5.tar.gz
vlc: Exclude from world if commercial is not in inclusion list
Remove LICENSE_FLAGS setting as its no longer needed Signed-off-by: Khem Raj <raj.khem@gmail.com> Cc: Andreas Müller <schnitzeltony@gmail.com> (cherry picked from commit dbd662de1ca670459ddc88cf68c9a3f888ba71ee) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc_3.0.12.bb4
1 files changed, 1 insertions, 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 \
16LDFLAGS_append_riscv64 = " -latomic" 16LDFLAGS_append_riscv64 = " -latomic"
17LDFLAGS_append_riscv32 = " -latomic" 17LDFLAGS_append_riscv32 = " -latomic"
18 18
19# While this item does not require it, it depends on ffmpeg which does
20LICENSE_FLAGS = "commercial"
21
22SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \ 19SRC_URI = "http://download.videolan.org/pub/videolan/${BPN}/${PV}/${BP}.tar.xz \
23 file://0001-make-opencv-configurable.patch \ 20 file://0001-make-opencv-configurable.patch \
24 file://0002-use-vorbisidec.patch \ 21 file://0002-use-vorbisidec.patch \
@@ -134,3 +131,4 @@ FILES_${PN}-staticdev += "\
134 131
135INSANE_SKIP_${PN} = "dev-so" 132INSANE_SKIP_${PN} = "dev-so"
136 133
134EXCLUDE_FROM_WORLD = "${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "0", "1", d)}"