fso-[illume-]image: bring back gst-plugin-sid from the ENTERPRISE_DISTRO nirvana :)

diff --git a/packages/images/fso-illume-image.bb b/packages/images/fso-illume-image.bb
index 1984ca55af2c8a9eb4f888362be970ea6483bd52..45af87b7f5bbda0451201a56a3a5b96051f653d6 100644 (file)
--- a/packages/images/fso-illume-image.bb
+++ b/packages/images/fso-illume-image.bb
@@ -40,7 +40,8 @@ AUDIO_INSTALL = "\
   alsa-utils-amixer \
   gst-meta-audio \
   gst-plugin-modplug \
-  ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-sid', d)} \
+  gst-plugin-sid \
+  ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad', d)} \
   fso-sounds \
 "
 

diff --git a/packages/images/fso-image.bb b/packages/images/fso-image.bb
index a7552122f3aff5b6c8587090d3250e3a6ce4845c..3f72b18c2e265d0030fa70c92f65b890de8da0ef 100644 (file)
--- a/packages/images/fso-image.bb
+++ b/packages/images/fso-image.bb
@@ -38,11 +38,13 @@ AUDIO_INSTALL = "\
   alsa-utils-amixer \
   gst-meta-audio \
   gst-plugin-modplug \
-  ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad gst-plugin-sid', d)} \
+  gst-plugin-sid \
+  ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugin-mad', d)} \
   fso-sounds \
 "
 
 GTK_INSTALL = "\
+  hicolor-icon-theme \
   tango-icon-theme \
   openmoko-calculator2 \
   vala-terminal \