[oe-commits] Paul Barker : enjoy: replace ENTERPRISE_DISTRO with PACKAGECONFIG options

[git at git.openembedded.org]

Module: meta-openembedded.git
Branch: master
Commit: 9e0823c4e81fe20a735b1eff39a8b0328a638eea
URL:    http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=9e0823c4e81fe20a735b1eff39a8b0328a638eea

Author: Paul Barker <paul at paulbarker.me.uk>
Date:   Sat Jun 22 13:28:39 2013 +0000

enjoy: replace ENTERPRISE_DISTRO with PACKAGECONFIG options

Signed-off-by: Paul Barker <paul at paulbarker.me.uk>
Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 meta-efl/recipes-efl/e17/enjoy_svn.bb |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/meta-efl/recipes-efl/e17/enjoy_svn.bb b/meta-efl/recipes-efl/e17/enjoy_svn.bb
index bdbe471..2e1a8a2 100644
--- a/meta-efl/recipes-efl/e17/enjoy_svn.bb
+++ b/meta-efl/recipes-efl/e17/enjoy_svn.bb
@@ -1,11 +1,10 @@
 DESCRIPTION = "Enjoy music player"
 LICENSE = "LGPLv3"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6a6a8e020838b23406c81b19c1d46df6"
-DEPENDS = "evas ecore edje elementary emotion lightmediascanner edbus2"
+DEPENDS = "evas ecore edje elementary emotion lightmediascanner edbus2 gst-plugins-good"
 SRCREV = "${EFL_SRCREV}"
 PV = "0.0+svnr${SRCPV}"
 
-DEPENDS += "gst-plugins-good ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly', d)}"
 
 #1st needed for all formats
 #2nd needed for mp3 playback
@@ -14,7 +13,6 @@ DEPENDS += "gst-plugins-good ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '
 #5th needed binary to create db
 RDEPENDS_${PN} += "\
        gst-plugins-base-typefindfunctions gst-plugins-base-playbin gst-plugins-base-volume gst-plugins-base-decodebin2 gst-plugins-good-autodetect \
-       ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'gst-plugins-ugly-mad gst-plugins-good-id3demux', d)} \
        gst-plugins-base-ogg gst-plugins-base-ivorbisdec \
        gst-plugins-good-flac \
        lightmediascanner-test \
@@ -35,6 +33,9 @@ EXTRA_OECONF = "\
     --with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc \
 "
 
+PACKAGECONFIG[mad] = ",,gst-plugins-ugly,gst-plugins-ugly-mad"
+PACKAGECONFIG[id3demux] = ",,,gst-plugins-good-id3demux"
+
 do_configure_prepend() {
     autopoint || touch config.rpath
 }