diff options
| author |   Paul Barker <paul@paulbarker.me.uk> | 2013-06-22 13:28:37 +0000 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2013-06-27 18:52:24 +0200 |
| commit | 29c257312532f9f7ae0e3228cebc2888e1aefe1b (patch) | |
| tree | e84aef3f17bf59e5cdd00cc363c746b247f80415 /meta-multimedia | |
| parent | aa3d3ce3ae31009dc39d2f4f029ad7b312dd9869 (diff) | |
| download | meta-openembedded-contrib-29c257312532f9f7ae0e3228cebc2888e1aefe1b.tar.gz | |
vlc: 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-multimedia')
| -rw-r--r-- | meta-multimedia/recipes-multimedia/vlc/vlc.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta-multimedia/recipes-multimedia/vlc/vlc.inc b/meta-multimedia/recipes-multimedia/vlc/vlc.inc index 531a018efa..f3d8a03faa 100644 --- a/meta-multimedia/recipes-multimedia/vlc/vlc.inc +++ b/meta-multimedia/recipes-multimedia/vlc/vlc.inc @@ -3,8 +3,7 @@ HOMEPAGE = "http://www.videolan.org" LICENSE = "GPLv2" SECTION = "multimedia" -DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth alsa-lib \ - ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}" +DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth alsa-lib" SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2" @@ -65,11 +64,12 @@ EXTRA_OECONF = "\ ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \ ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \ ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ - ${@base_conditional('ENTERPRISE_DISTRO', '1', \ - '--disable-mad --disable-id3tag --disable-a52 --disable-libmpeg2', \ - '--enable-mad --enable-id3tag --enable-a52 --enable-libmpeg2', d)} \ " +PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" +PACKAGECONFIG[id3tag] = "--enable-id3tag,--disable-id3tag,libid3tag" +PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52" +PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec" do_configure() { cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/ |