From patchwork Fri Dec 20 13:39:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 304074 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 4DD832C007C for ; Sat, 21 Dec 2013 00:39:41 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A468D8AF90; Fri, 20 Dec 2013 13:39:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zqLWd-RtTFeq; Fri, 20 Dec 2013 13:39:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id DEBEF88628; Fri, 20 Dec 2013 13:39:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D1FA21BF837 for ; Fri, 20 Dec 2013 13:39:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CEBE78C174 for ; Fri, 20 Dec 2013 13:39:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id H3OsCLKu4L9f for ; Fri, 20 Dec 2013 13:39:38 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from marvin.crapouillou.net (rev33.vpn.fdn.fr [80.67.179.33]) by whitealder.osuosl.org (Postfix) with ESMTPS id 07D598C047 for ; Fri, 20 Dec 2013 13:39:38 +0000 (UTC) Received: from acaen-252-1-185-247.w90-62.abo.wanadoo.fr ([90.62.173.247] helo=[192.168.1.36]) by marvin.crapouillou.net with esmtpsa (TLS1.0:DHE_RSA_CAMELLIA_256_CBC_SHA1:256) (Exim 4.80) (envelope-from ) id 1Vu0Ie-0005uA-V0; Fri, 20 Dec 2013 14:39:33 +0100 Message-ID: <52B44888.4070608@crapouillou.net> Date: Fri, 20 Dec 2013 14:39:20 +0100 From: Paul Cercueil User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20131005 Icedove/17.0.9 MIME-Version: 1.0 To: Peter Korsgaard References: <1387243053-5281-1-git-send-email-paul@crapouillou.net> <878uvgklnw.fsf@dell.be.48ers.dk> In-Reply-To: <878uvgklnw.fsf@dell.be.48ers.dk> Cc: buildroot@busybox.net Subject: Re: [Buildroot] [PATCH] cairo: Build with GLESv2 and VG backends if possible X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net On 20/12/2013 08:48, Peter Korsgaard wrote: >>>>>> "Paul" == Paul Cercueil writes: > > Signed-Off-By: Paul Cercueil > > --- > > 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 --- 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 + int dummy_attribs[] = { + EGL_WIDTH, 8, EGL_HEIGHT, 8, 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 + +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 + };