[oe] [meta-oe][PATCH v3] mplayer2: Remove blacklist
Gary Thomas
gary at mlbassoc.com
Fri Feb 20 14:02:22 UTC 2015
On 2015-02-20 06:43, Martin Jansa wrote:
> On Thu, Feb 12, 2015 at 07:01:17PM -0700, Gary Thomas wrote:
>> On 2015-02-12 18:08, Martin Jansa wrote:
>>> Does it have --enable-* options for the new PACKAGECONFIGs? If yes then it should specify them as well (advantage at least in some projects is that when it explicitly asking for
>>> foo and foo is unusable it will end with fatal error instead of ignoring broken foo dependency.
>>
>> No, those are auto-discover and only have disable options.
>
> Please add REQUIRED_DISTRO_FEATURES = "x11"
> because it depends on couple of recipes which aren't available without
> x11: xsp, libxv, virtual/libx11, libxscrnsaver
>
> and it should set LICENSE_FLAGS like libpostproc has to resolve:
> ERROR: Nothing PROVIDES 'libpostproc' (but meta-oe/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb DEPENDS on or otherwise requires it)
> ERROR: libpostproc was skipped: because it has a restricted license not whitelisted in LICENSE_FLAGS_WHITELIST
Is there a way to make these conditional? For example, you could build
without libpostproc and the result would not need the commercial license.
There may also be a way to build without X11, but I've not investigated
that yet.
>
>>> On Fri, Feb 13, 2015 at 1:54 AM, Gary Thomas <gary at mlbassoc.com <mailto:gary at mlbassoc.com>> wrote:
>>>
>>> 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 at mlbassoc.com <mailto:gary at mlbassoc.com>>
>>> ---
>>> meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb <http://mplayer2_git.bb> | 9 ++++++---
>>> 1 file changed, 6 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb <http://mplayer2_git.bb> b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb <http://mplayer2_git.bb>
>>> index 7c04ff1..2de26b0 100644
>>> --- a/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb <http://mplayer2_git.bb>
>>> +++ b/meta-oe/recipes-multimedia/mplayer/mplayer2_git.bb <http://mplayer2_git.bb>
>>> @@ -3,7 +3,7 @@ SECTION = "multimedia"
>>> HOMEPAGE = "http://www.mplayerhq.hu/"
>>> DEPENDS = "libvpx libdvdread libtheora virtual/libsdl ffmpeg xsp zlib \
>>> libpng jpeg liba52 freetype fontconfig alsa-lib lzo ncurses \
>>> - libxv virtual/libx11 libass speex faad2"
>>> + libxv virtual/libx11 libass speex faad2 libxscrnsaver"
>>>
>>> RDEPENDS_${PN} = "mplayer-common"
>>> PROVIDES = "mplayer"
>>> @@ -13,8 +13,6 @@ RCONFLICTS_${PN} = "mplayer"
>>> LICENSE = "GPLv3"
>>> LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504"
>>>
>>> -PNBLACKLIST[mplayer2] ?= "Requires newer libav which has negative D_P"
>>> -
>>> SRC_URI = "git://repo.or.cz/mplayer.git <http://repo.or.cz/mplayer.git> \
>>> file://0001-configure-don-t-disable-ASS-support-when-explicitly-.patch \
>>> "
>>> @@ -109,9 +107,14 @@ EXTRA_OECONF = " \
>>> EXTRA_OECONF_append_armv6 = " --enable-armv6"
>>> EXTRA_OECONF_append_armv7a = " --enable-armv6 --enable-neon"
>>>
>>> +PACKAGECONFIG ??= "vorbis postproc"
>>> PACKAGECONFIG[mad] = "--enable-mad,--disable-mad,libmad"
>>> PACKAGECONFIG[a52] = "--enable-liba52,--disable-liba52,liba52"
>>> PACKAGECONFIG[lame] = ",,lame"
>>> +PACKAGECONFIG[postproc] = ",--disable-libpostproc,libpostproc"
>>> +PACKAGECONFIG[vorbis] = ",--disable-libvorbis,libvorbis"
>>> +PACKAGECONFIG[portaudio] = ",--disable-portaudio,portaudio-v19"
>>> +PACKAGECONFIG[mpg123] = ",--disable-mpg123,mpg123"
>>>
>>> FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O4 -ffast-math"
>>> BUILD_OPTIMIZATION = "${FULL_OPTIMIZATION}"
>>> --
>>> 1.9.1
>>>
>>> --
>>> _______________________________________________
>>> Openembedded-devel mailing list
>>> Openembedded-devel at lists.openembedded.org <mailto:Openembedded-devel at lists.openembedded.org>
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>>
>>>
>>
>> --
>> ------------------------------------------------------------
>> Gary Thomas | Consulting for the
>> MLB Associates | Embedded world
>> ------------------------------------------------------------
>
--
------------------------------------------------------------
Gary Thomas | Consulting for the
MLB Associates | Embedded world
------------------------------------------------------------
More information about the Openembedded-devel
mailing list