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

[git at git.openembedded.org]

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

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

libsdl-mixer: 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>

---

 .../libsdl-mixer/libsdl-mixer_1.2.12.bb            |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb
index 00c7ec8..5307535 100644
--- a/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb
+++ b/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb
@@ -1,6 +1,6 @@
 DESCRIPTION = "Simple DirectMedia Layer mixer library."
 SECTION = "libs"
-DEPENDS = "virtual/libsdl flac libmikmod libvorbis  ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad', d)}"
+DEPENDS = "virtual/libsdl flac libmikmod libvorbis"
 LICENSE = "zlib"
 LIC_FILES_CHKSUM = "file://COPYING;md5=a37a47a0e579e461474cd03b9e05199d"
 
@@ -16,7 +16,9 @@ S = "${WORKDIR}/SDL_mixer-${PV}"
 inherit autotools
 
 EXTRA_AUTORECONF += "--include=acinclude"
-EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor ${@base_conditional('ENTERPRISE_DISTRO', '1', '', '--enable-music-mp3-mad-gpl', d)} LIBS=-L${STAGING_LIBDIR}"
+EXTRA_OECONF = "--disable-music-mp3 --enable-music-ogg --enable-music-ogg-tremor LIBS=-L${STAGING_LIBDIR}"
+
+PACKAGECONFIG[mad] = "--enable-music-mp3-mad-gpl,--disable-music-mp3-mad-gpl,libmad"
 
 do_configure () {
     # Remove old libtool macros.