summaryrefslogtreecommitdiffstats
path: root/meta-multimedia/recipes-multimedia/vlc
diff options
context:
space:
mode:
authorPaul Barker <paul@paulbarker.me.uk>2013-06-22 13:28:37 +0000
committerMartin Jansa <Martin.Jansa@gmail.com>2013-06-27 18:52:24 +0200
commit29c257312532f9f7ae0e3228cebc2888e1aefe1b (patch)
treee84aef3f17bf59e5cdd00cc363c746b247f80415 /meta-multimedia/recipes-multimedia/vlc
parentaa3d3ce3ae31009dc39d2f4f029ad7b312dd9869 (diff)
downloadmeta-openembedded-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/recipes-multimedia/vlc')
-rw-r--r--meta-multimedia/recipes-multimedia/vlc/vlc.inc10
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 531a018ef..f3d8a03fa 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"
3LICENSE = "GPLv2" 3LICENSE = "GPLv2"
4SECTION = "multimedia" 4SECTION = "multimedia"
5 5
6DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth alsa-lib \ 6DEPENDS = "libfribidi libtool libgcrypt gst-plugins-bad virtual/libsdl qt4-x11-free dbus libxml2 gnutls tremor faad2 ffmpeg flac libxpm fluidsynth alsa-lib"
7 ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag liba52 mpeg2dec', d)}"
8 7
9SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2" 8SRC_URI = "http://download.videolan.org/pub/videolan/vlc/${PV}/vlc-${PV}.tar.bz2"
10 9
@@ -65,11 +64,12 @@ EXTRA_OECONF = "\
65 ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \ 64 ac_cv_path_MOC=${STAGING_BINDIR_NATIVE}/moc4 \
66 ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \ 65 ac_cv_path_RCC=${STAGING_BINDIR_NATIVE}/rcc4 \
67 ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \ 66 ac_cv_path_UIC=${STAGING_BINDIR_NATIVE}/uic4 \
68 ${@base_conditional('ENTERPRISE_DISTRO', '1', \
69 '--disable-mad --disable-id3tag --disable-a52 --disable-libmpeg2', \
70 '--enable-mad --enable-id3tag --enable-a52 --enable-libmpeg2', d)} \
71" 67"
72 68
69PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
70PACKAGECONFIG[id3tag] = "--enable-id3tag,--disable-id3tag,libid3tag"
71PACKAGECONFIG[a52] = "--enable-a52,--disable-a52,liba52"
72PACKAGECONFIG[mpeg2dec] = "--enable-mpeg2dec,--disable-mpeg2dec,mpeg2dec"
73 73
74do_configure() { 74do_configure() {
75 cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/ 75 cp ${STAGING_DATADIR}/aclocal/libgcrypt.m4 ${S}/m4/