Patchwork [meta-oe,meta-multimedia,meta-efl,RFC,5/6] mpd: replace ENTERPRISE_DISTRO with PACKAGECONFIG options

login
register
mail settings
Submitter Paul Barker
Date June 22, 2013, 1:28 p.m.
Message ID <1371907719-8868-6-git-send-email-paul@paulbarker.me.uk>
Download mbox | patch
Permalink /patch/52229/
State Accepted, archived
Commit 673d4ee87d13db24edf0f25cd320516f111700b6
Headers show

Comments

Paul Barker - June 22, 2013, 1:28 p.m.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
 meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Patch

diff --git a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
index a6b8898..6f2a912 100644
--- a/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
+++ b/meta-multimedia/recipes-multimedia/musicpd/mpd_0.17.1.bb
@@ -3,8 +3,7 @@  LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 HOMEPAGE ="http://sourceforge.net/projects/musicpd"
 
-DEPENDS = "alsa-lib libsamplerate0 libsndfile1 libvorbis libogg faad2 ffmpeg curl sqlite bzip2 pulseaudio \
-           ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad lame libid3tag', d)}"
+DEPENDS = "alsa-lib libsamplerate0 libsndfile1 libvorbis libogg faad2 ffmpeg curl sqlite bzip2 pulseaudio"
 
 PR = "r4"
 
@@ -21,6 +20,10 @@  inherit autotools useradd systemd
 EXTRA_OECONF = "enable_bzip2=yes"
 EXTRA_OECONF += "${@base_contains('DISTRO_FEATURES', 'systemd', '--with-systemdsystemunitdir=${systemd_unitdir}/system/', '--without-systemdsystemunitdir', d)}"
 
+PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
+PACKAGECONFIG[id3tag] = "--enable-id3,--disable-id3,libid3tag"
+PACKAGECONFIG[lame] = "--enable-lame-encoder,--disable-lame-encoder,lame"
+
 do_install_append() {
     install -d ${D}/${localstatedir}/lib/mpd/music
     chmod 775 ${D}/${localstatedir}/lib/mpd/music