* [PATCH] ffmpeg: fix build when DISTRO_FEATURES doesn't contain x11 @ 2016-02-26 10:52 Jonathan Liu 2016-02-26 11:04 ` Martin Jansa 0 siblings, 1 reply; 7+ messages in thread From: Jonathan Liu @ 2016-02-26 10:52 UTC (permalink / raw) To: openembedded-core If avdevice is enabled, libxv is used if it is detected by configure for the XV outdev. However, we can't depend on libxv for avdevice when DISTRO_FEATURES doesn't contain x11 as this will result in an error. Fix this by adding a libxv dependency only when the avdevice PACKAGECONFIG is enabled and DISTRO_FEATURES contains x11. XV outdev is only one of many that are supported by avdevice so it is still useful to enable avdevice even if libxv is not available. Signed-off-by: Jonathan Liu <net147@gmail.com> --- meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb index 72393b3..f29c05e 100644 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb @@ -23,11 +23,12 @@ SRC_URI[sha256sum] = "25bcedbdafadac3d09c325c1d46a51f53d858b26a260d5aed6b4f17fea PROVIDES = "libav libpostproc" DEPENDS = "alsa-lib zlib libogg yasm-native" +DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'avdevice', bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxv', '', d), '', d)}" inherit autotools pkgconfig PACKAGECONFIG ??= "avdevice avfilter gpl theora x264 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" -PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice, libxv" +PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice" PACKAGECONFIG[avfilter] = "--enable-avfilter,--disable-avfilter" PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac" PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl" -- 2.7.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] ffmpeg: fix build when DISTRO_FEATURES doesn't contain x11 2016-02-26 10:52 [PATCH] ffmpeg: fix build when DISTRO_FEATURES doesn't contain x11 Jonathan Liu @ 2016-02-26 11:04 ` Martin Jansa 2016-02-26 11:17 ` Jonathan Liu 0 siblings, 1 reply; 7+ messages in thread From: Martin Jansa @ 2016-02-26 11:04 UTC (permalink / raw) To: Jonathan Liu; +Cc: openembedded-core [-- Attachment #1: Type: text/plain, Size: 2291 bytes --] On Fri, Feb 26, 2016 at 09:52:25PM +1100, Jonathan Liu wrote: > If avdevice is enabled, libxv is used if it is detected by configure > for the XV outdev. However, we can't depend on libxv for avdevice when > DISTRO_FEATURES doesn't contain x11 as this will result in an error. > > Fix this by adding a libxv dependency only when the avdevice > PACKAGECONFIG is enabled and DISTRO_FEATURES contains x11. XV outdev > is only one of many that are supported by avdevice so it is still > useful to enable avdevice even if libxv is not available. > > Signed-off-by: Jonathan Liu <net147@gmail.com> > --- > meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb > index 72393b3..f29c05e 100644 > --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb > +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb > @@ -23,11 +23,12 @@ SRC_URI[sha256sum] = "25bcedbdafadac3d09c325c1d46a51f53d858b26a260d5aed6b4f17fea > PROVIDES = "libav libpostproc" > > DEPENDS = "alsa-lib zlib libogg yasm-native" > +DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'avdevice', bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxv', '', d), '', d)}" > > inherit autotools pkgconfig > > PACKAGECONFIG ??= "avdevice avfilter gpl theora x264 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" > -PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice, libxv" > +PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice" bb.utils.contains didn't work in PACKAGECONFIG? Why not PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice, ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxv', '', d)" > PACKAGECONFIG[avfilter] = "--enable-avfilter,--disable-avfilter" > PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac" > PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl" > -- > 2.7.1 > > -- > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 188 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ffmpeg: fix build when DISTRO_FEATURES doesn't contain x11 2016-02-26 11:04 ` Martin Jansa @ 2016-02-26 11:17 ` Jonathan Liu 2016-02-26 12:33 ` Burton, Ross 0 siblings, 1 reply; 7+ messages in thread From: Jonathan Liu @ 2016-02-26 11:17 UTC (permalink / raw) To: Martin Jansa; +Cc: openembedded-core Hi Martin, It doesn't work in PACKAGECONFIG..... that is the first thing I tried. Regards, Jonathan On 26 February 2016 at 22:04, Martin Jansa <martin.jansa@gmail.com> wrote: > On Fri, Feb 26, 2016 at 09:52:25PM +1100, Jonathan Liu wrote: >> If avdevice is enabled, libxv is used if it is detected by configure >> for the XV outdev. However, we can't depend on libxv for avdevice when >> DISTRO_FEATURES doesn't contain x11 as this will result in an error. >> >> Fix this by adding a libxv dependency only when the avdevice >> PACKAGECONFIG is enabled and DISTRO_FEATURES contains x11. XV outdev >> is only one of many that are supported by avdevice so it is still >> useful to enable avdevice even if libxv is not available. >> >> Signed-off-by: Jonathan Liu <net147@gmail.com> >> --- >> meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb | 3 ++- >> 1 file changed, 2 insertions(+), 1 deletion(-) >> >> diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb >> index 72393b3..f29c05e 100644 >> --- a/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb >> +++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_2.8.6.bb >> @@ -23,11 +23,12 @@ SRC_URI[sha256sum] = "25bcedbdafadac3d09c325c1d46a51f53d858b26a260d5aed6b4f17fea >> PROVIDES = "libav libpostproc" >> >> DEPENDS = "alsa-lib zlib libogg yasm-native" >> +DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'avdevice', bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxv', '', d), '', d)}" >> >> inherit autotools pkgconfig >> >> PACKAGECONFIG ??= "avdevice avfilter gpl theora x264 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" >> -PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice, libxv" >> +PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice" > > bb.utils.contains didn't work in PACKAGECONFIG? > > Why not > PACKAGECONFIG[avdevice] = "--enable-avdevice,--disable-avdevice, ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'libxv', '', d)" > >> PACKAGECONFIG[avfilter] = "--enable-avfilter,--disable-avfilter" >> PACKAGECONFIG[faac] = "--enable-libfaac,--disable-libfaac,faac" >> PACKAGECONFIG[gpl] = "--enable-gpl,--disable-gpl" >> -- >> 2.7.1 >> >> -- >> _______________________________________________ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > -- > Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ffmpeg: fix build when DISTRO_FEATURES doesn't contain x11 2016-02-26 11:17 ` Jonathan Liu @ 2016-02-26 12:33 ` Burton, Ross 2016-02-26 13:29 ` Jonathan Liu 0 siblings, 1 reply; 7+ messages in thread From: Burton, Ross @ 2016-02-26 12:33 UTC (permalink / raw) To: Jonathan Liu; +Cc: openembedded-core [-- Attachment #1: Type: text/plain, Size: 295 bytes --] On 26 February 2016 at 11:17, Jonathan Liu <net147@gmail.com> wrote: > It doesn't work in PACKAGECONFIG..... that is the first thing I tried. > I'd call that a bug, and should be simple to resolve (pass expand=True when fetching getVarFlags in the PACKAGECONFIG handling code). Ross [-- Attachment #2: Type: text/html, Size: 705 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ffmpeg: fix build when DISTRO_FEATURES doesn't contain x11 2016-02-26 12:33 ` Burton, Ross @ 2016-02-26 13:29 ` Jonathan Liu 2016-02-26 14:43 ` alexander.kanavin 0 siblings, 1 reply; 7+ messages in thread From: Jonathan Liu @ 2016-02-26 13:29 UTC (permalink / raw) To: Burton, Ross; +Cc: openembedded-core On 26 February 2016 at 23:33, Burton, Ross <ross.burton@intel.com> wrote: > > On 26 February 2016 at 11:17, Jonathan Liu <net147@gmail.com> wrote: >> >> It doesn't work in PACKAGECONFIG..... that is the first thing I tried. > > > I'd call that a bug, and should be simple to resolve (pass expand=True when > fetching getVarFlags in the PACKAGECONFIG handling code). > > Ross Feel free to submit a patch to handle the PACKAGECONFIG expansion and then I can update the fix. Regards, Jonathan ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ffmpeg: fix build when DISTRO_FEATURES doesn't contain x11 2016-02-26 13:29 ` Jonathan Liu @ 2016-02-26 14:43 ` alexander.kanavin 2016-02-26 14:05 ` Jonathan Liu 0 siblings, 1 reply; 7+ messages in thread From: alexander.kanavin @ 2016-02-26 14:43 UTC (permalink / raw) To: Jonathan Liu; +Cc: openembedded-core >> I'd call that a bug, and should be simple to resolve (pass expand=True >> when >> fetching getVarFlags in the PACKAGECONFIG handling code). >> >> Ross > > Feel free to submit a patch to handle the PACKAGECONFIG expansion and > then I can update the fix. I think you need to solve this in a different way altogether. Write a patch for the upstream code that turns a floating, implicit xv dependency into something that can be explicitly turned on and off, and then add a PACKAGECONFIG option for it to the recipe. Alex ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ffmpeg: fix build when DISTRO_FEATURES doesn't contain x11 2016-02-26 14:43 ` alexander.kanavin @ 2016-02-26 14:05 ` Jonathan Liu 0 siblings, 0 replies; 7+ messages in thread From: Jonathan Liu @ 2016-02-26 14:05 UTC (permalink / raw) To: alexander.kanavin; +Cc: openembedded-core On 27 February 2016 at 01:43, <alexander.kanavin@linux.intel.com> wrote: >>> I'd call that a bug, and should be simple to resolve (pass expand=True >>> when >>> fetching getVarFlags in the PACKAGECONFIG handling code). >>> >>> Ross >> >> Feel free to submit a patch to handle the PACKAGECONFIG expansion and >> then I can update the fix. > > I think you need to solve this in a different way altogether. Write a > patch for the upstream code that turns a floating, implicit xv dependency > into something that can be explicitly turned on and off, and then add a > PACKAGECONFIG option for it to the recipe. > > Alex Okay. Please disregard this patch. I will rework into a new patch. Regards, Jonathan ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2016-02-26 14:05 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2016-02-26 10:52 [PATCH] ffmpeg: fix build when DISTRO_FEATURES doesn't contain x11 Jonathan Liu 2016-02-26 11:04 ` Martin Jansa 2016-02-26 11:17 ` Jonathan Liu 2016-02-26 12:33 ` Burton, Ross 2016-02-26 13:29 ` Jonathan Liu 2016-02-26 14:43 ` alexander.kanavin 2016-02-26 14:05 ` Jonathan Liu
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.