Skip to contentSkip to conversation

cairo: Build with GLESv2 and VG backends if possible

PATCH New Paul Cercueil 2 participants 7 messages Dec 17, 2013 – Dec 20, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 cairo: Build with GLESv2 and VG backends if possible

---
 package/cairo/cairo.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
package/cairo/cairo.mk +14 -0
index 347bb75..aa03a27 100644
@@ -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
Signature · 1 line
1.8.5.1
#2 lore raw

PATCH 1/1 cairo: Build with GLESv2 and VG backends if possible

In reply to Paul Cercueil
Quoted 18 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Paul" == Paul Cercueil <[email protected]> writes:

---
 package/cairo/cairo.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
package/cairo/cairo.mk +3 -0
index 347bb75..aa03a27 100644
@@ -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

package/cairo/cairo.mk else · line 69

Quoted 10 lines
package/cairo/cairo.mk +10 -0
+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

Signature · 1 line
Bye, Peter Korsgaard
#3 lore raw

PATCH 1/1 cairo: Build with GLESv2 and VG backends if possible

Quoted 31 lines · Peter Korsgaard
Quoted 17 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Paul" == Paul Cercueil <[email protected]> writes:

---
 package/cairo/cairo.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
package/cairo/cairo.mk +3 -0
index 347bb75..aa03a27 100644
@@ -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

package/cairo/cairo.mk else · line 69

Quoted 10 lines
package/cairo/cairo.mk +10 -0
+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:

Quoted 8 lines

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.

#4 lore raw

PATCH 1/1 cairo: Build with GLESv2 and VG backends if possible

In reply to Peter Korsgaard
Quoted 31 lines · Peter Korsgaard
Quoted 17 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Paul" == Paul Cercueil <[email protected]> writes:

---
 package/cairo/cairo.mk | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
package/cairo/cairo.mk +3 -0
index 347bb75..aa03a27 100644
@@ -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

package/cairo/cairo.mk else · line 69

Quoted 10 lines
package/cairo/cairo.mk +10 -0
+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:

Quoted 8 lines

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

---
  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

(quoted diff) +0 -0

b/package/cairo/cairo-002-openvg-build-fix.patch
new file mode 100644
index 0000000..6614934

package/cairo/cairo-002-openvg-build-fix.patch new file +11 -0
@@ -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 <[email protected]>
+
+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,
#5 lore raw

PATCH 1/1 cairo: Build with GLESv2 and VG backends if possible

Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Paul" == Paul Cercueil <[email protected]> writes:

Hi,

Quoted 6 lines

The following patch addresses the first issue. I reported it upstream.

[PATCH] cairo: Patch to fix OpenVG backend on X11-less platforms

Your mailer had screwed up whitespace in your patch pretty badly, but I've fixed it up and committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#6 lore raw

PATCH 1/1 cairo: Build with GLESv2 and VG backends if possible

Quoted 6 lines · Peter Korsgaard
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Paul" == Paul Cercueil <[email protected]> writes:

Hi,

Quoted 1 line

The following patch addresses the first issue. I reported it upstream.

Quoted 8 lines
Quoted 3 lines

[PATCH] cairo: Patch to fix OpenVG backend on X11-less platforms

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!