diff options
author | Saul Wold <Saul.Wold@intel.com> | 2010-10-07 23:39:04 -0700 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-10-08 16:47:19 +0100 |
commit | 5f17c07331fd0bfcc5aba87587ede385bd896c47 (patch) | |
tree | ac21c49459a2830a110f8d432565d1afdafe826c /meta/conf | |
parent | 7d429655652eb3ab5efa5473050b5270b098446e (diff) | |
download | poky-5f17c07331fd0bfcc5aba87587ede385bd896c47.tar.gz |
gststream commercial: modified recipes and tasks to add commercial identifier
Modified DEPENDS and RDEPENDS in these recipes and tasks to make packages
which have potential license implications opt in through options in
poky/local.conf.
Signed-off-by: Saul Wold <Saul.Wold@intel.com>
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/distro/poky.conf | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 89d1b5acb6..699ad0d9a6 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf | |||
@@ -126,7 +126,14 @@ GPLv3_LGPLv2_WHITELIST = "libassuan gnutls libtasn1 libidn" | |||
126 | # This is a list of packages that require a commercial license to ship | 126 | # This is a list of packages that require a commercial license to ship |
127 | # product. If shipped as part of an image these packages may have | 127 | # product. If shipped as part of an image these packages may have |
128 | # implications so they are disabled by default | 128 | # implications so they are disabled by default |
129 | COMMERCIAL_LICENSE = "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp" | 129 | COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp" |
130 | COMMERCIAL_AUDIO_PLUGINS ?= "" | ||
131 | # COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse" | ||
132 | COMMERCIAL_VIDEO_PLUGINS ?= "" | ||
133 | # COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse" | ||
134 | COMMERCIAL_QT ?= "" | ||
135 | # COMMERCIAL_QT ?= "qmmp" | ||
136 | |||
130 | 137 | ||
131 | require conf/distro/include/world-broken.inc | 138 | require conf/distro/include/world-broken.inc |
132 | require conf/distro/include/distro_tracking_fields.inc | 139 | require conf/distro/include/distro_tracking_fields.inc |