From: Mark Hatle <mark.hatle@windriver.com>
To: <openembedded-devel@lists.openembedded.org>
Subject: [PATCH 26/31] recipes-multimedia: Add LICENSE_FLAGS
Date: Wed, 6 Sep 2017 14:23:24 -0500 [thread overview]
Message-ID: <1504725809-12825-27-git-send-email-mark.hatle@windriver.com> (raw)
In-Reply-To: <1504725809-12825-1-git-send-email-mark.hatle@windriver.com>
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>
---
.../recipes-multimedia/gstreamer-0.10/gst-plugins-gl_0.10.3.bb | 4 +++-
meta-multimedia/recipes-multimedia/musicpd/mpd_0.19.21.bb | 3 +++
meta-multimedia/recipes-multimedia/sox/sox_14.4.0.bb | 3 +++
.../recipes-multimedia/streamripper/streamripper_1.64.6.bb | 3 +++
meta-multimedia/recipes-multimedia/vlc/vlc.inc | 3 +++
5 files changed, 15 insertions(+), 1 deletion(-)
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 bb69bfe..f3eaf30 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 c16f3be..77ab5eb 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 e115f1c..3eb1856 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 94355b6..722815a 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 087baab..acb3ccd 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
--
1.8.3.1
next prev parent reply other threads:[~2017-09-06 19:29 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-06 19:22 [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
2017-09-06 19:22 ` [PATCH 01/31] iproute2: Move tipc enablement to oe-core Mark Hatle
2017-09-06 19:23 ` [PATCH 02/31] libml: Move " Mark Hatle
2017-09-06 19:23 ` [PATCH 03/31] openipmi: Move to meta-networking requires net-snmp Mark Hatle
2017-09-06 19:23 ` [PATCH 04/31] glmark2: Set required distro features to opengl Mark Hatle
2017-09-06 19:23 ` [PATCH 05/31] openlmi-tools: Only build if the necessary python pieces are available Mark Hatle
2017-09-06 19:23 ` [PATCH 06/31] xorg-drivers: Add opengl distro flag requirement to ati and nouveau Mark Hatle
2017-09-06 19:23 ` [PATCH 07/31] boinc-client: Add distro flag, requires opengl Mark Hatle
2017-09-06 19:23 ` [PATCH 08/31] networkmanager-openvpn: requires openvpn from meta-networking Mark Hatle
2017-09-06 19:23 ` [PATCH 09/31] telepathy-python: Move to meta-python, requires python-dbus Mark Hatle
2017-09-06 19:23 ` [PATCH 10/31] networkmanager: Move to meta-networking, requires dnsmasq Mark Hatle
2017-09-06 19:23 ` [PATCH 11/31] python-ldap: Move to meta-networking, requires cyrus-sasl Mark Hatle
2017-09-06 19:23 ` [PATCH 12/31] python-networkmanager: Move to networking, requires networkmanager Mark Hatle
2017-09-06 19:23 ` [PATCH 13/31] corosync: Requires net-snmp from meta-networking Mark Hatle
2017-09-06 20:12 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 14/31] pywbem: Requires python-m2crypto-native (and others) from meta-python Mark Hatle
2017-09-06 19:23 ` [PATCH 15/31] dlm: requires corosync, from meta-networking Mark Hatle
2017-09-06 19:23 ` [PATCH 16/31] open-vm-tools: only build if meta-networking and meta-filesystems is available Mark Hatle
2017-09-06 19:23 ` [PATCH 17/31] miniupnpd: Move to meta-networking, requires libnetfilter-conntrack Mark Hatle
2017-09-06 19:23 ` [PATCH 18/31] enable_gnome.conf: Move the AVAHI_GTK setting Mark Hatle
2017-09-06 19:23 ` [PATCH 19/31] glade3: Move PACKAGECONFIG setting to enable_gnome.conf Mark Hatle
2017-09-07 9:29 ` Andreas Müller
2017-09-07 13:45 ` Mark Hatle
2017-09-07 14:51 ` Andreas Müller
2017-09-07 15:08 ` Philip Balister
2017-09-06 19:23 ` [PATCH 20/31] libart-lgpg: Obsolete, replaced by version in oe-core Mark Hatle
2017-09-06 19:23 ` [PATCH 21/31] pinpoint: Add dependency on opengl for cogl Mark Hatle
2017-09-06 19:23 ` [PATCH 22/31] vim: Remove xfce vim bbappend Mark Hatle
2017-09-07 8:57 ` Andreas Müller
2017-09-07 13:52 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 23/31] layer.conf: Add meta-networking for the networkmanager Mark Hatle
2017-09-06 19:23 ` [PATCH 24/31] meta-xfce: depend on meta-multimedia Mark Hatle
2017-09-06 19:23 ` [PATCH 25/31] mpv: Requires ffmpeg which has a LICENSE_FLAGS = commercial set Mark Hatle
2017-09-06 19:23 ` Mark Hatle [this message]
2017-09-06 19:23 ` [PATCH 27/31] recipes-multimedia: Add LICENSE_FLAGS Mark Hatle
2017-09-06 19:23 ` [PATCH 28/31] libmtp: remove 'mtp-tools' from PACKAGES Mark Hatle
2017-09-06 19:23 ` [PATCH 29/31] xfce4-mixer: Remove, gstreamer-0.10 is obsolete Mark Hatle
2017-09-06 19:58 ` Andreas Müller
2017-09-06 20:02 ` Mark Hatle
2017-09-06 20:13 ` Andreas Müller
2017-09-06 20:21 ` Mark Hatle
2017-09-06 20:35 ` Andreas Müller
2017-09-06 20:44 ` Mark Hatle
2017-09-06 20:53 ` Andreas Müller
2017-09-06 21:00 ` Mark Hatle
2017-09-06 23:40 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 30/31] florence: update 0.6.3 Mark Hatle
2017-09-06 19:59 ` Andreas Müller
2017-09-06 20:15 ` Mark Hatle
2017-09-06 19:23 ` [PATCH 31/31] gstreamer-0.10: Remove as all users are gone and it is obsolete Mark Hatle
2017-09-06 20:01 ` Andreas Müller
2017-09-06 23:41 ` [PATCH 00/31] Numerous patches to resolve yocto-compat-layer Mark Hatle
2017-09-06 23:49 ` Khem Raj
2017-09-06 23:59 ` Mark Hatle
2017-09-07 0:12 ` Khem Raj
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1504725809-12825-27-git-send-email-mark.hatle@windriver.com \
--to=mark.hatle@windriver.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox