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"
 # This is a list of packages that require a commercial license to ship
 # product. If shipped as part of an image these packages may have 
 # implications so they are disabled by default
-COMMERCIAL_LICENSE = "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp"
+COMMERCIAL_LICENSE ?= "lame gst-fluendo-mp3 libmad mpeg2dec ffmpeg qmmp"
+COMMERCIAL_AUDIO_PLUGINS ?= ""
+# COMMERCIAL_AUDIO_PLUGINS ?= "gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse"
+COMMERCIAL_VIDEO_PLUGINS ?= ""
+# COMMERCIAL_VIDEO_PLUGINS ?= "gst-plugins-ugly-mpeg2dec gst-plugins-ugly-mpegstream gst-plugins-bad-mpegvideoparse"
+COMMERCIAL_QT ?= ""
+# COMMERCIAL_QT ?= "qmmp"
+
 
 require conf/distro/include/world-broken.inc
 require 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 @@
 DESCRIPTION = "Gstreamer package groups"
 LICENSE = "MIT"
-DEPENDS = "gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad gst-plugins-ugly"
-PR = "r6"
+DEPENDS = "gstreamer gst-plugins-base gst-plugins-good gst-plugins-bad"
+
+PR = "r7"
 
 PACKAGES = "\
     gst-meta-base \
@@ -31,10 +32,9 @@ RDEPENDS_gst-meta-audio = "\
     gst-meta-base \
     gst-plugins-base-vorbis \
     gst-plugins-base-ogg \
-    gst-plugins-ugly-mad \
     gst-plugins-good-wavparse \
-    gst-plugins-ugly-mpegaudioparse \
-    gst-plugins-good-flac"
+    gst-plugins-good-flac \
+    ${COMMERCIAL_AUDIO_PLUGINS}"
 
 
 RDEPENDS_gst-meta-debug = "\
@@ -48,9 +48,7 @@ RDEPENDS_gst-meta-video = "\
     gst-meta-base \
     gst-plugins-good-avi \
     gst-plugins-good-matroska \
-    gst-plugins-ugly-mpeg2dec \
-    gst-plugins-ugly-mpegstream \
-    gst-plugins-bad-mpegvideoparse"
+    ${COMMERCIAL_VIDEO_PLUGINS}"
 
 RRECOMMENDS_gst-meta-video = "\
     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 = "\
 
 ALLOW_EMPTY = "1"
 
-QTDEMOS ?= "fotowall quicky qmmp"
+QTDEMOS ?= "fotowall quicky ${COMMERCIAL_QT}"
 QTDEMOS_mips ?= ""
 QTDEMOS_mipsel ?= ""
 
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 \
             gst-plugins-base-typefindfunctions \
             gst-plugins-base-playbin"
 
-RRECOMMENDS = "gst-plugins-ugly-mad \
-               gst-plugins-good-id3demux \
+RRECOMMENDS = "gst-plugins-good-id3demux \
                gst-plugins-base-vorbis \
                gst-plugins-base-alsa \
-               gst-plugins-base-ogg"
+               gst-plugins-base-ogg \
+               ${COMMERCIAL_AUDIO_PLUGINS}"
 
 PV = "0.0+svnr${SRCREV}"