* [Buildroot] [PATCH] cairo: Build with GLESv2 and VG backends if possible @ 2013-12-17 1:17 Paul Cercueil 2013-12-19 21:06 ` Peter Korsgaard 2013-12-20 7:48 ` Peter Korsgaard 0 siblings, 2 replies; 7+ messages in thread From: Paul Cercueil @ 2013-12-17 1:17 UTC (permalink / raw) To: buildroot Signed-Off-By: Paul Cercueil <paul@crapouillou.net> --- package/cairo/cairo.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk index 347bb75..aa03a27 100644 --- a/package/cairo/cairo.mk +++ b/package/cairo/cairo.mk @@ -54,6 +54,20 @@ else CAIRO_CONF_OPT += --disable-directfb endif +ifeq ($(BR2_PACKAGE_HAS_OPENGL_ES),y) + CAIRO_CONF_OPT += --enable-glesv2 + CAIRO_DEPENDENCIES += libgles +else + CAIRO_CONF_OPT += --disable-glesv2 +endif + +ifeq ($(BR2_PACKAGE_HAS_OPENVG),y) + CAIRO_CONF_OPT += --enable-vg + CAIRO_DEPENDENCIES += libopenvg +else + CAIRO_CONF_OPT += --disable-vg +endif + ifeq ($(BR2_PACKAGE_XORG7),y) CAIRO_CONF_OPT += --enable-xlib --enable-xcb --with-x CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext -- 1.8.5.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH] cairo: Build with GLESv2 and VG backends if possible 2013-12-17 1:17 [Buildroot] [PATCH] cairo: Build with GLESv2 and VG backends if possible Paul Cercueil @ 2013-12-19 21:06 ` Peter Korsgaard 2013-12-20 7:48 ` Peter Korsgaard 1 sibling, 0 replies; 7+ messages in thread From: Peter Korsgaard @ 2013-12-19 21:06 UTC (permalink / raw) To: buildroot >>>>> "Paul" == Paul Cercueil <paul@crapouillou.net> writes: > Signed-Off-By: Paul Cercueil <paul@crapouillou.net> Committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH] cairo: Build with GLESv2 and VG backends if possible 2013-12-17 1:17 [Buildroot] [PATCH] cairo: Build with GLESv2 and VG backends if possible Paul Cercueil 2013-12-19 21:06 ` Peter Korsgaard @ 2013-12-20 7:48 ` Peter Korsgaard 2013-12-20 11:54 ` Paul Cercueil 2013-12-20 13:39 ` Paul Cercueil 1 sibling, 2 replies; 7+ messages in thread From: Peter Korsgaard @ 2013-12-20 7:48 UTC (permalink / raw) To: buildroot >>>>> "Paul" == Paul Cercueil <paul@crapouillou.net> writes: > Signed-Off-By: Paul Cercueil <paul@crapouillou.net> > --- > package/cairo/cairo.mk | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk > index 347bb75..aa03a27 100644 > --- a/package/cairo/cairo.mk > +++ b/package/cairo/cairo.mk > @@ -54,6 +54,20 @@ else > CAIRO_CONF_OPT += --disable-directfb > endif > +ifeq ($(BR2_PACKAGE_HAS_OPENGL_ES),y) > + CAIRO_CONF_OPT += --enable-glesv2 > + CAIRO_DEPENDENCIES += libgles > +else > + CAIRO_CONF_OPT += --disable-glesv2 > +endif > + > +ifeq ($(BR2_PACKAGE_HAS_OPENVG),y) > + CAIRO_CONF_OPT += --enable-vg > + CAIRO_DEPENDENCIES += libopenvg > +else > + CAIRO_CONF_OPT += --disable-vg > +endif What openvg / gles providers did you test against? We seem to have a number of autobuild failures with the rpi provider: http://autobuild.buildroot.net/results/b7f/b7f71cd412e5a7f801e81140a02c7da04694151f/build-end.log http://autobuild.buildroot.net/results/f70/f7012c1e09d75dd103b61da364272f6385d2dc7b/build-end.log http://autobuild.buildroot.net/results/ec5/ec550547f6465b52ba552ca757c9bbeac17cd1c6/build-end.log http://autobuild.buildroot.net/results/81a/81ae93018ca6d7a61460e0c78d5a60e6a5531dbc/build-end.log -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH] cairo: Build with GLESv2 and VG backends if possible 2013-12-20 7:48 ` Peter Korsgaard @ 2013-12-20 11:54 ` Paul Cercueil 2013-12-20 13:39 ` Paul Cercueil 1 sibling, 0 replies; 7+ messages in thread From: Paul Cercueil @ 2013-12-20 11:54 UTC (permalink / raw) To: buildroot On 20/12/2013 08:48, Peter Korsgaard wrote: >>>>>> "Paul" == Paul Cercueil <paul@crapouillou.net> writes: > > Signed-Off-By: Paul Cercueil <paul@crapouillou.net> > > --- > > package/cairo/cairo.mk | 14 ++++++++++++++ > > 1 file changed, 14 insertions(+) > > > diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk > > index 347bb75..aa03a27 100644 > > --- a/package/cairo/cairo.mk > > +++ b/package/cairo/cairo.mk > > @@ -54,6 +54,20 @@ else > > CAIRO_CONF_OPT += --disable-directfb > > endif > > > +ifeq ($(BR2_PACKAGE_HAS_OPENGL_ES),y) > > + CAIRO_CONF_OPT += --enable-glesv2 > > + CAIRO_DEPENDENCIES += libgles > > +else > > + CAIRO_CONF_OPT += --disable-glesv2 > > +endif > > + > > +ifeq ($(BR2_PACKAGE_HAS_OPENVG),y) > > + CAIRO_CONF_OPT += --enable-vg > > + CAIRO_DEPENDENCIES += libopenvg > > +else > > + CAIRO_CONF_OPT += --disable-vg > > +endif > > What openvg / gles providers did you test against? We seem to have a > number of autobuild failures with the rpi provider: > > http://autobuild.buildroot.net/results/b7f/b7f71cd412e5a7f801e81140a02c7da04694151f/build-end.log > > http://autobuild.buildroot.net/results/f70/f7012c1e09d75dd103b61da364272f6385d2dc7b/build-end.log > > http://autobuild.buildroot.net/results/ec5/ec550547f6465b52ba552ca757c9bbeac17cd1c6/build-end.log > > http://autobuild.buildroot.net/results/81a/81ae93018ca6d7a61460e0c78d5a60e6a5531dbc/build-end.log > I am testing against Mesa. I believe your target does not have Xorg, that would explain why 'None' is reported as undefined: it's defined in <X11/X.h>. I can perfectly reproduce the issue if I disable Xorg. The source code uses 'None' even if targeting EGL and not GLX, I can address that with another patch. The second issue with 'GLchar' is surprising, since it's defined in <GLES2/gl2.h> here. I cannot even reproduce the issue. ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH] cairo: Build with GLESv2 and VG backends if possible 2013-12-20 7:48 ` Peter Korsgaard 2013-12-20 11:54 ` Paul Cercueil @ 2013-12-20 13:39 ` Paul Cercueil 2013-12-20 14:52 ` Peter Korsgaard 1 sibling, 1 reply; 7+ messages in thread From: Paul Cercueil @ 2013-12-20 13:39 UTC (permalink / raw) To: buildroot On 20/12/2013 08:48, Peter Korsgaard wrote: >>>>>> "Paul" == Paul Cercueil <paul@crapouillou.net> writes: > > Signed-Off-By: Paul Cercueil <paul@crapouillou.net> > > --- > > package/cairo/cairo.mk | 14 ++++++++++++++ > > 1 file changed, 14 insertions(+) > > > diff --git a/package/cairo/cairo.mk b/package/cairo/cairo.mk > > index 347bb75..aa03a27 100644 > > --- a/package/cairo/cairo.mk > > +++ b/package/cairo/cairo.mk > > @@ -54,6 +54,20 @@ else > > CAIRO_CONF_OPT += --disable-directfb > > endif > > > +ifeq ($(BR2_PACKAGE_HAS_OPENGL_ES),y) > > + CAIRO_CONF_OPT += --enable-glesv2 > > + CAIRO_DEPENDENCIES += libgles > > +else > > + CAIRO_CONF_OPT += --disable-glesv2 > > +endif > > + > > +ifeq ($(BR2_PACKAGE_HAS_OPENVG),y) > > + CAIRO_CONF_OPT += --enable-vg > > + CAIRO_DEPENDENCIES += libopenvg > > +else > > + CAIRO_CONF_OPT += --disable-vg > > +endif > > What openvg / gles providers did you test against? We seem to have a > number of autobuild failures with the rpi provider: > > http://autobuild.buildroot.net/results/b7f/b7f71cd412e5a7f801e81140a02c7da04694151f/build-end.log > > http://autobuild.buildroot.net/results/f70/f7012c1e09d75dd103b61da364272f6385d2dc7b/build-end.log > > http://autobuild.buildroot.net/results/ec5/ec550547f6465b52ba552ca757c9bbeac17cd1c6/build-end.log > > http://autobuild.buildroot.net/results/81a/81ae93018ca6d7a61460e0c78d5a60e6a5531dbc/build-end.log > The following patch addresses the first issue. I reported it upstream. [PATCH] cairo: Patch to fix OpenVG backend on X11-less platforms Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- package/cairo/cairo-002-openvg-build-fix.patch | 28 ++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 package/cairo/cairo-002-openvg-build-fix.patch diff --git a/package/cairo/cairo-002-openvg-build-fix.patch b/package/cairo/cairo-002-openvg-build-fix.patch new file mode 100644 index 0000000..6614934 --- /dev/null +++ b/package/cairo/cairo-002-openvg-build-fix.patch @@ -0,0 +1,28 @@ +Fix build of OpenVG backend on platforms without X11 + +https://bugs.freedesktop.org/show_bug.cgi?id=72911 + +Signed-off-by: Paul Cercueil <paul@crapouillou.net> + +Index: b/boilerplate/cairo-boilerplate-vg.c +=================================================================== +--- a/boilerplate/cairo-boilerplate-vg.c ++++ b/boilerplate/cairo-boilerplate-vg.c +@@ -215,7 +215,7 @@ _cairo_boilerplate_vg_create_surface_egl (const char *name, + EGL_ALPHA_SIZE, 8, + EGL_SURFACE_TYPE, EGL_PBUFFER_BIT, + EGL_RENDERABLE_TYPE, EGL_OPENVG_BIT, +- None ++ EGL_NONE + }; + int rgb_attribs[] = { + EGL_RED_SIZE, 8, +@@ -225,7 +225,7 @@ _cairo_boilerplate_vg_create_surface_egl (const char *name, + EGL_VG_ALPHA_FORMAT, EGL_VG_ALPHA_FORMAT_PRE_BIT, + EGL_SURFACE_TYPE, EGL_PBUFFER_BIT, + EGL_RENDERABLE_TYPE, EGL_OPENVG_BIT, +- None ++ EGL_NONE + }; + int dummy_attribs[] = { + EGL_WIDTH, 8, EGL_HEIGHT, 8, -- ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH] cairo: Build with GLESv2 and VG backends if possible 2013-12-20 13:39 ` Paul Cercueil @ 2013-12-20 14:52 ` Peter Korsgaard 2013-12-20 14:54 ` Paul Cercueil 0 siblings, 1 reply; 7+ messages in thread From: Peter Korsgaard @ 2013-12-20 14:52 UTC (permalink / raw) To: buildroot >>>>> "Paul" == Paul Cercueil <paul@crapouillou.net> writes: Hi, > The following patch addresses the first issue. I reported it upstream. > [PATCH] cairo: Patch to fix OpenVG backend on X11-less platforms > Signed-off-by: Paul Cercueil <paul@crapouillou.net> Your mailer had screwed up whitespace in your patch pretty badly, but I've fixed it up and committed, thanks. -- Bye, Peter Korsgaard ^ permalink raw reply [flat|nested] 7+ messages in thread
* [Buildroot] [PATCH] cairo: Build with GLESv2 and VG backends if possible 2013-12-20 14:52 ` Peter Korsgaard @ 2013-12-20 14:54 ` Paul Cercueil 0 siblings, 0 replies; 7+ messages in thread From: Paul Cercueil @ 2013-12-20 14:54 UTC (permalink / raw) To: buildroot On 20/12/2013 15:52, Peter Korsgaard wrote: >>>>>> "Paul" == Paul Cercueil <paul@crapouillou.net> writes: > Hi, > > > The following patch addresses the first issue. I reported it upstream. > > > > [PATCH] cairo: Patch to fix OpenVG backend on X11-less platforms > > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > > Your mailer had screwed up whitespace in your patch pretty badly, but > I've fixed it up and committed, thanks. > > Ugh, sorry about that. Thank you! ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2013-12-20 14:54 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2013-12-17 1:17 [Buildroot] [PATCH] cairo: Build with GLESv2 and VG backends if possible Paul Cercueil 2013-12-19 21:06 ` Peter Korsgaard 2013-12-20 7:48 ` Peter Korsgaard 2013-12-20 11:54 ` Paul Cercueil 2013-12-20 13:39 ` Paul Cercueil 2013-12-20 14:52 ` Peter Korsgaard 2013-12-20 14:54 ` Paul Cercueil
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox