[OE-core] [PATCH 4/4] cairo: Add pkgconfig for opengl support

[Burton, Ross]

Breaks the no-x11 builder:
https://autobuilder.yoctoproject.org/main/builders/nightly-no-x11/builds/543/steps/BuildImages/logs/stdio

Ross

On 9 August 2017 at 19:11, Khem Raj <raj.khem at gmail.com> wrote:

> On 8/9/17 8:41 AM, Andre McCurdy wrote:
> > On Wed, Aug 9, 2017 at 7:19 AM, Khem Raj <raj.khem at gmail.com> wrote:
> >> Signed-off-by: Khem Raj <raj.khem at gmail.com>
> >
> > Any explanation? Was this previously non-deterministic? If so, how far
> > back does the problem go?
>
> it isnt non-deterministic atleast not after RSS. However, we need this
> enabled when we have openGL/X11 enabled.
>
> >
> >> ---
> >>  meta/recipes-graphics/cairo/cairo.inc | 4 +++-
> >>  1 file changed, 3 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/meta/recipes-graphics/cairo/cairo.inc
> b/meta/recipes-graphics/cairo/cairo.inc
> >> index 8e1e2e1b88..fd376951bd 100644
> >> --- a/meta/recipes-graphics/cairo/cairo.inc
> >> +++ b/meta/recipes-graphics/cairo/cairo.inc
> >> @@ -22,7 +22,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
> >>  DEPENDS = "libpng fontconfig pixman glib-2.0 zlib"
> >>
> >>  PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11',
> 'x11 xcb', '', d)} \
> >> -           ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)}"
> >> +           ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \
> >> +           ${@bb.utils.filter('DISTRO_FEATURES', 'opengl', d)}"
> >>
> >>  PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no
> --disable-xlib,${X11DEPENDS}"
> >>  PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
> >> @@ -30,6 +31,7 @@ PACKAGECONFIG[directfb] = "--enable-directfb=yes,,
> directfb"
> >>  PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--
> disable-valgrind,valgrind"
> >>  PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl"
> >>  PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable-
> glesv2,virtual/libgles2"
> >> +PACKAGECONFIG[opengl] = "--enable-gl,--disable-gl,virtual/libgl"
> >
> > Since the opengl distro feature can imply either OpenGL or OpenGL ES
> > support, it doesn't seem right to use it to select one over the other
> > (ie for recipes which support both, shouldn't the choice between
> > OpenGL or OpenGL ES be independent of the opengl distro feature) ?
>
> at some point we differentiated between opengl and gles at distro level
> atleast for RDK, but I agree that marking opengl as a distro feature
> encompassing all OpenGL implementations is better. Although, in this
> particular case all openGL implementations can be enabled simultaneously
> so may be we can enable egl and gles too with same knob. Alternatively
> We can leave the packageconfig knob disabled which will make it same
> defaults effectively ( which is disabled)
>
> >
> >>
> >>  #check for TARGET_FPU=soft and inform configure of the result so it
> can disable some floating points
> >>  require cairo-fpu.inc
> >> --
> >> 2.14.0
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-core mailing list
> >> Openembedded-core at lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20170809/6089f2a7/attachment-0002.html>