aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-multimedia
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2013-06-22 13:28:35 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-06-27 18:52:23 +0200
commit03a98cad3dfdc3eefef66be791493385b3500676 (patch)
tree22f447fab27ea64c2ce43d558b5cbe60b8841197 /meta-oe/recipes-multimedia
parentf8cb5783072ab34757fe6d4d3117fd5399f6753a (diff)
downloadmeta-openembedded-03a98cad3dfdc3eefef66be791493385b3500676.tar.gz
libsdl-mixer: replace ENTERPRISE_DISTRO with PACKAGECONFIG options
Signed-off-by: Paul Barker <paul@paulbarker.me.uk> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-multimedia')
-rw-r--r--meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb6
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 00c7ec8c06..5307535d93 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.