Patchwork [meta-oe,meta-multimedia,meta-efl,RFC,2/6] libsdl-mixer: 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-3-git-send-email-paul@paulbarker.me.uk>
Download mbox | patch
Permalink /patch/52223/
State Accepted, archived
Commit 03a98cad3dfdc3eefef66be791493385b3500676
Headers show

Comments

Paul Barker - June 22, 2013, 1:28 p.m.
Signed-off-by: Paul Barker <paul@paulbarker.me.uk>
---
 meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Patch

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.