Patchwork [WIP,06/20] libmatchbox: Add PACKAGECONFIG for png

login
register
mail settings
Submitter Martin Jansa
Date Aug. 29, 2013, 4:02 p.m.
Message ID <e6abe1f4e6a41cf4ac4070971b6ec1757d79b9ab.1377792006.git.Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/56945/
State New
Headers show

Comments

Martin Jansa - Aug. 29, 2013, 4:02 p.m.
* enable it by default, because it's more likely that people were
  building libmatchbox after libpng than before
* with png disabled it also fails, because of missing csetjmp include
  | mbpixbuf.c:128:3: error: unknown type name 'jmp_buf'
  |    jmp_buf setjmp_buffer; /* for return to caller */

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb | 3 +++
 1 file changed, 3 insertions(+)
Ross Burton - Sept. 2, 2013, 2:01 p.m.
On 29 August 2013 17:02, Martin Jansa <martin.jansa@gmail.com> wrote:
> * with png disabled it also fails, because of missing csetjmp include
>   | mbpixbuf.c:128:3: error: unknown type name 'jmp_buf'
>   |    jmp_buf setjmp_buffer; /* for return to caller */

FWIW, I've just fixed this in libmatchbox.

Ross
Ross Burton - Sept. 2, 2013, 2:02 p.m.
On 29 August 2013 17:02, Martin Jansa <martin.jansa@gmail.com> wrote:
> +PACKAGECONFIG ??= "png"

For completeness consider adding "jpeg", although I doubt anyone
actually uses the JPEG support...

Ross
Martin Jansa - Sept. 3, 2013, 6:29 p.m.
On Mon, Sep 02, 2013 at 03:02:39PM +0100, Burton, Ross wrote:
> On 29 August 2013 17:02, Martin Jansa <martin.jansa@gmail.com> wrote:
> > +PACKAGECONFIG ??= "png"
> 
> For completeness consider adding "jpeg", although I doubt anyone
> actually uses the JPEG support...

jpeg is already in DEPENDS

> 
> Ross
Ross Burton - Sept. 3, 2013, 6:46 p.m.
On 3 September 2013 19:29, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Mon, Sep 02, 2013 at 03:02:39PM +0100, Burton, Ross wrote:
>> On 29 August 2013 17:02, Martin Jansa <martin.jansa@gmail.com> wrote:
>> > +PACKAGECONFIG ??= "png"
>>
>> For completeness consider adding "jpeg", although I doubt anyone
>> actually uses the JPEG support...
>
> jpeg is already in DEPENDS

I meant as a PACKAGECONFIG option as it's an optional dependency (and
to be honest, jpeg could probably default to disabled).

Ross

Patch

diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
index 244a495..932e484 100644
--- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
+++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb
@@ -16,4 +16,7 @@  SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534
 
 inherit autotools pkgconfig
 
+PACKAGECONFIG ??= "png"
+PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
+
 EXTRA_OECONF = "--enable-jpeg --enable-expat --enable-xsettings --enable-startup-notification"