diff options
author | Paul Barker <paul@paulbarker.me.uk> | 2013-06-22 13:28:34 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2013-06-27 18:52:23 +0200 |
commit | f8cb5783072ab34757fe6d4d3117fd5399f6753a (patch) | |
tree | 3f2ea559e4aab4776282526d3662242665b1add2 /meta-oe | |
parent | cb092cc4ea867cc7cccba59eabcdcea9e5d895b2 (diff) | |
download | meta-openembedded-f8cb5783072ab34757fe6d4d3117fd5399f6753a.tar.gz |
mplayer2: 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')
-rw-r--r-- | meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb index 2e04d3c73a..7c1357b01c 100644 --- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | |||
@@ -3,8 +3,7 @@ SECTION = "multimedia" | |||
3 | HOMEPAGE = "http://www.mplayerhq.hu/" | 3 | HOMEPAGE = "http://www.mplayerhq.hu/" |
4 | DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \ | 4 | DEPENDS = "libvpx live555 libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \ |
5 | libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \ | 5 | libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \ |
6 | libxv virtual/libx11 libass speex faad2 \ | 6 | libxv virtual/libx11 libass speex faad2" |
7 | ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad liba52 lame', d)}" | ||
8 | 7 | ||
9 | RDEPENDS_${PN} = "mplayer-common" | 8 | RDEPENDS_${PN} = "mplayer-common" |
10 | PROVIDES = "mplayer" | 9 | PROVIDES = "mplayer" |
@@ -132,6 +131,10 @@ EXTRA_OECONF = " \ | |||
132 | EXTRA_OECONF_append_armv6 = " --enable-armv6" | 131 | EXTRA_OECONF_append_armv6 = " --enable-armv6" |
133 | EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon" | 132 | EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon" |
134 | 133 | ||
134 | PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" | ||
135 | PACKAGECONFIG[a52] = "--enable-liba52,--disable-liba52,liba52" | ||
136 | PACKAGECONFIG[lame] = ",,lame" | ||
137 | |||
135 | FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math" | 138 | FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math" |
136 | BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" | 139 | BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" |
137 | 140 | ||