From c6d8367699aeada928d12673ce12b1e4bc0043aa Mon Sep 17 00:00:00 2001 From: Paul Barker Date: Sat, 22 Jun 2013 13:28:35 +0000 Subject: [PATCH] libsdl-mixer: replace ENTERPRISE_DISTRO with PACKAGECONFIG options (From meta-openembedded rev: 03a98cad3dfdc3eefef66be791493385b3500676) Signed-off-by: Paul Barker Signed-off-by: Martin Jansa Signed-off-by: Patrick Ohly --- .../meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb b/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb index 00c7ec8..5307535 100644 --- a/meta-openembedded/meta-oe/recipes-multimedia/libsdl-mixer/libsdl-mixer_1.2.12.bb +++ b/meta-openembedded/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. -- 2.7.4