summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorSaul Wold <Saul.Wold@intel.com>2010-10-07 23:39:04 -0700
committerRichard Purdie <rpurdie@linux.intel.com>2010-10-08 16:47:19 +0100
commit5f17c07331fd0bfcc5aba87587ede385bd896c47 (patch)
treeac21c49459a2830a110f8d432565d1afdafe826c /meta
parent7d429655652eb3ab5efa5473050b5270b098446e (diff)
downloadpoky-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')
-rw-r--r--meta/conf/distro/poky.conf9
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb14
-rw-r--r--meta/recipes-qt/tasks/task-poky-qt.bb2
-rw-r--r--meta/recipes-sato/gaku/gaku_svn.bb6
4 files changed, 18 insertions, 13 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
129COMMERCIAL_LICENSE = "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp" 129COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp"
130COMMERCIAL_AUDIO_PLUGINS ?= ""
131# COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"
132COMMERCIAL_VIDEO_PLUGINS ?= ""
133# COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"
134COMMERCIAL_QT ?= ""
135# COMMERCIAL_QT ?= "qmmp"
136
130 137
131require conf/distro/include/world-broken.inc 138require conf/distro/include/world-broken.inc
132require conf/distro/include/distro_tracking_fields.inc 139require conf/distro/include/distro_tracking_fields.inc
diff --git a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
index 50fcb6d7f8..30adf7a5cf 100644
--- a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
@@ -1,7 +1,8 @@
1DESCRIPTION = "Gstreamer package groups" 1DESCRIPTION = "Gstreamer package groups"
2LICENSE = "MIT" 2LICENSE = "MIT"
3DEPENDS = "gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly" 3DEPENDS = "gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad"
4PR = "r6" 4
5PR = "r7"
5 6
6PACKAGES = "\ 7PACKAGES = "\
7 gst-meta-base \ 8 gst-meta-base \
@@ -31,10 +32,9 @@ RDEPENDS_gst-meta-audio = "\
31 gst-meta-base \ 32 gst-meta-base \
32 gst-plugins-base-vorbis \ 33 gst-plugins-base-vorbis \
33 gst-plugins-base-ogg \ 34 gst-plugins-base-ogg \
34 gst-plugins-ugly-mad \
35 gst-plugins-good-wavparse \ 35 gst-plugins-good-wavparse \
36 gst-plugins-ugly-mpegaudioparse \ 36 gst-plugins-good-flac \
37 gst-plugins-good-flac" 37 ${COMMERCIAL_AUDIO_PLUGINS}"
38 38
39 39
40RDEPENDS_gst-meta-debug = "\ 40RDEPENDS_gst-meta-debug = "\
@@ -48,9 +48,7 @@ RDEPENDS_gst-meta-video = "\
48 gst-meta-base \ 48 gst-meta-base \
49 gst-plugins-good-avi \ 49 gst-plugins-good-avi \
50 gst-plugins-good-matroska \ 50 gst-plugins-good-matroska \
51 gst-plugins-ugly-mpeg2dec \ 51 ${COMMERCIAL_VIDEO_PLUGINS}"
52 gst-plugins-ugly-mpegstream \
53 gst-plugins-bad-mpegvideoparse"
54 52
55RRECOMMENDS_gst-meta-video = "\ 53RRECOMMENDS_gst-meta-video = "\
56 gst-meta-audio" 54 gst-meta-audio"
diff --git a/meta/recipes-qt/tasks/task-poky-qt.bb b/meta/recipes-qt/tasks/task-poky-qt.bb
index 5990d4df05..f357ca8337 100644
--- a/meta/recipes-qt/tasks/task-poky-qt.bb
+++ b/meta/recipes-qt/tasks/task-poky-qt.bb
@@ -14,7 +14,7 @@ PACKAGES = "\
14 14
15ALLOW_EMPTY = "1" 15ALLOW_EMPTY = "1"
16 16
17QTDEMOS ?= "fotowall quicky qmmp" 17QTDEMOS ?= "fotowall quicky ${COMMERCIAL_QT}"
18QTDEMOS_mips ?= "" 18QTDEMOS_mips ?= ""
19QTDEMOS_mipsel ?= "" 19QTDEMOS_mipsel ?= ""
20 20
diff --git a/meta/recipes-sato/gaku/gaku_svn.bb b/meta/recipes-sato/gaku/gaku_svn.bb
index a9a0b05552..a70863e6bc 100644
--- a/meta/recipes-sato/gaku/gaku_svn.bb
+++ b/meta/recipes-sato/gaku/gaku_svn.bb
@@ -9,11 +9,11 @@ RDEPENDS = "gst-plugins-base-audioconvert \
9 gst-plugins-base-typefindfunctions \ 9 gst-plugins-base-typefindfunctions \
10 gst-plugins-base-playbin" 10 gst-plugins-base-playbin"
11 11
12RRECOMMENDS = "gst-plugins-ugly-mad \ 12RRECOMMENDS = "gst-plugins-good-id3demux \
13 gst-plugins-good-id3demux \
14 gst-plugins-base-vorbis \ 13 gst-plugins-base-vorbis \
15 gst-plugins-base-alsa \ 14 gst-plugins-base-alsa \
16 gst-plugins-base-ogg" 15 gst-plugins-base-ogg \
16 ${COMMERCIAL_AUDIO_PLUGINS}"
17 17
18PV = "0.0+svnr${SRCREV}" 18PV = "0.0+svnr${SRCREV}"
19 19