diff options
author | Gary Thomas <gary@mlbassoc.com> | 2015-02-12 17:54:18 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-02-27 09:42:00 +0100 |
commit | 9a6775585c7e82b96109c9f9adc4e16b2f5d6cc3 (patch) | |
tree | 8ba1243965efc2117c2477f65fe13c1022c7b49e /meta-oe | |
parent | a79ccdacc2cbd2d1732e2b8f5cd3814d20ba376d (diff) | |
download | meta-openembedded-9a6775585c7e82b96109c9f9adc4e16b2f5d6cc3.tar.gz |
mplayer2: Remove blacklist
mplayer2 no longer needs to be blacklisted as OE-core has moved
to libav_9.16.
[v2-v3] Also update build dependencies to quash QA warnings, using
PACKAGECONFIG for most optional features.
Signed-off-by: Gary Thomas <gary@mlbassoc.com>
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 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb index 7c04ff178..2de26b0a4 100644 --- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb +++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb | |||
@@ -3,7 +3,7 @@ SECTION = "multimedia" | |||
3 | HOMEPAGE = "http://www.mplayerhq.hu/" | 3 | HOMEPAGE = "http://www.mplayerhq.hu/" |
4 | DEPENDS = "libvpx libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \ | 4 | DEPENDS = "libvpx 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 libxscrnsaver" |
7 | 7 | ||
8 | RDEPENDS_${PN} = "mplayer-common" | 8 | RDEPENDS_${PN} = "mplayer-common" |
9 | PROVIDES = "mplayer" | 9 | PROVIDES = "mplayer" |
@@ -13,8 +13,6 @@ RCONFLICTS_${PN} = "mplayer" | |||
13 | LICENSE = "GPLv3" | 13 | LICENSE = "GPLv3" |
14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" | 14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504" |
15 | 15 | ||
16 | PNBLACKLIST[mplayer2] ?= "Requires newer libav which has negative D_P" | ||
17 | |||
18 | SRC_URI = "git://repo.or.cz/mplayer.git \ | 16 | SRC_URI = "git://repo.or.cz/mplayer.git \ |
19 | file://0001-configure-don-t-disable-ASS-support-when-explicitly-.patch \ | 17 | file://0001-configure-don-t-disable-ASS-support-when-explicitly-.patch \ |
20 | " | 18 | " |
@@ -109,9 +107,14 @@ EXTRA_OECONF = " \ | |||
109 | EXTRA_OECONF_append_armv6 = " --enable-armv6" | 107 | EXTRA_OECONF_append_armv6 = " --enable-armv6" |
110 | EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon" | 108 | EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon" |
111 | 109 | ||
110 | PACKAGECONFIG ??= "vorbis postproc" | ||
112 | PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" | 111 | PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad" |
113 | PACKAGECONFIG[a52] = "--enable-liba52,--disable-liba52,liba52" | 112 | PACKAGECONFIG[a52] = "--enable-liba52,--disable-liba52,liba52" |
114 | PACKAGECONFIG[lame] = ",,lame" | 113 | PACKAGECONFIG[lame] = ",,lame" |
114 | PACKAGECONFIG[postproc] = ",--disable-libpostproc,libpostproc" | ||
115 | PACKAGECONFIG[vorbis] = ",--disable-libvorbis,libvorbis" | ||
116 | PACKAGECONFIG[portaudio] = ",--disable-portaudio,portaudio-v19" | ||
117 | PACKAGECONFIG[mpg123] = ",--disable-mpg123,mpg123" | ||
115 | 118 | ||
116 | FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math" | 119 | FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math" |
117 | BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" | 120 | BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}" |