aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2017-09-05 17:28:35 -0500
committerMark Hatle <mark.hatle@windriver.com>2017-09-06 15:06:43 -0500
commitfdc579867d20bc7f4c809783d59e74d0dbf16440 (patch)
tree8030abbd23dca1701fa89f3d86d80705f0e6fbb0
parent8d5071a368a60906da863b1042ca235bb4f29b9e (diff)
downloadmeta-openembedded-contrib-fdc579867d20bc7f4c809783d59e74d0dbf16440.tar.gz
meta-openembedded-contrib-fdc579867d20bc7f4c809783d59e74d0dbf16440.tar.bz2
meta-openembedded-contrib-fdc579867d20bc7f4c809783d59e74d0dbf16440.zip
recipes-multimedia: Add LICENSE_FLAGS
Multiple recipes require libmap, mpg123 or ffmpeg which all are defined to have a LICENSE_FLAGS = "commercial". Set these referring packages to the same license flag so they are only enabled when their dependency is also enabled. Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
-rw-r--r--meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb4
-rw-r--r--meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb3
-rw-r--r--meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb3
-rw-r--r--meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb3
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc.inc3
5 files changed, 15 insertions, 1 deletions
diff --git a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb
index bb69bfe9f6..f3eaf30940 100644
--- a/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb
+++ b/meta-multimedia/recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb
@@ -14,7 +14,9 @@ DEPENDS += "gst-plugins-base virtual/libgles2 virtual/egl jpeg libpng glew"
PR = "r4"
-inherit gettext
+inherit gettext distro_features_check
+
+REQUIRED_DISTRO_FEATURES = "opengl"
# This package doesn't have a configure switch for EGL or GL, so forcibly tell
# configure that it can't find gl.h so it always uses EGL. If/when we have some
diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb
index c16f3be779..77ab5ebcef 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb
@@ -39,6 +39,9 @@ DEPENDS += " \
libupnp \
"
+# While this item does not require it, it depends on mpg123 which does
+LICENSE_FLAGS = "commercial"
+
SRC_URI = " \
http://www.musicpd.org/download/${BPN}/0.19/${BP}.tar.xz \
file://mpd.conf.in \
diff --git a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
index e115f1c189..3eb1856e06 100644
--- a/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
+++ b/meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb
@@ -6,6 +6,9 @@ SECTION = "audio"
DEPENDS = "libpng ffmpeg libsndfile1 libvorbis"
+# While this item does not require it, it depends on ffmpeg which does
+LICENSE_FLAGS = "commercial"
+
PR = "r2"
PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'alsa pulseaudio', d)} \
diff --git a/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb b/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb
index 94355b64d4..722815ab6a 100644
--- a/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb
+++ b/meta-multimedia/recipes-multimedia/streamripper/streamripper_1.64.6.bb
@@ -6,6 +6,9 @@ LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
DEPENDS = "glib-2.0 libmad libogg libvorbis"
+# While this item does not require it, it depends on libmad which does
+LICENSE_FLAGS = "commercial"
+
SRC_URI = "\
${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz \
file://0001-build-these-are-foreign-automake-projects.patch \
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
index 087baab87e..acb3ccd1d1 100644
--- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc
+++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc
@@ -13,6 +13,9 @@ DEPENDS = "libfribidi libtool libgcrypt libgcrypt-native \
libmtp libopus orc libsamplerate0 libusb1 schroedinger taglib \
tiff"
+# 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"
inherit autotools gettext pkgconfig distro_features_check