* [PATCH 0/1] Fix implicit dependencies in cairo @ 2015-05-15 13:37 Joshua Lock 2015-05-15 13:37 ` [PATCH 1/1] cairo: make xlib and libxcb dependencies explicit Joshua Lock 0 siblings, 1 reply; 5+ messages in thread From: Joshua Lock @ 2015-05-15 13:37 UTC (permalink / raw) To: openembedded-core The following changes since commit 90861b8908d254154f4d1d613471070df8013da8: base: Avoid find race (2015-05-14 15:22:42 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib joshuagl/cairo http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=joshuagl/cairo Joshua Lock (1): cairo: make xlib and libxcb dependencies explicit meta/recipes-graphics/cairo/cairo.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.4.0 ^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/1] cairo: make xlib and libxcb dependencies explicit 2015-05-15 13:37 [PATCH 0/1] Fix implicit dependencies in cairo Joshua Lock @ 2015-05-15 13:37 ` Joshua Lock 2015-05-15 15:50 ` Andreas Oberritter 0 siblings, 1 reply; 5+ messages in thread From: Joshua Lock @ 2015-05-15 13:37 UTC (permalink / raw) To: openembedded-core Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> --- meta/recipes-graphics/cairo/cairo.inc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index 98add5a..1e45318 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc @@ -17,9 +17,11 @@ LICENSE_${PN}-perf-utils = "GPLv3+" X11DEPENDS = "virtual/libx11 libsm libxrender libxext" DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" -PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" + +PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}" +PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb" PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind" PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl" -- 2.4.0 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] cairo: make xlib and libxcb dependencies explicit 2015-05-15 13:37 ` [PATCH 1/1] cairo: make xlib and libxcb dependencies explicit Joshua Lock @ 2015-05-15 15:50 ` Andreas Oberritter 2015-05-15 16:01 ` Burton, Ross 2015-05-15 16:03 ` Joshua Lock 0 siblings, 2 replies; 5+ messages in thread From: Andreas Oberritter @ 2015-05-15 15:50 UTC (permalink / raw) To: openembedded-core Hi Joshua, On 15.05.2015 15:37, Joshua Lock wrote: > Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> > --- > meta/recipes-graphics/cairo/cairo.inc | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc > index 98add5a..1e45318 100644 > --- a/meta/recipes-graphics/cairo/cairo.inc > +++ b/meta/recipes-graphics/cairo/cairo.inc > @@ -17,9 +17,11 @@ LICENSE_${PN}-perf-utils = "GPLv3+" > X11DEPENDS = "virtual/libx11 libsm libxrender libxext" > DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" > > -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ > +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ > ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" > -PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" > + > +PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}" > +PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" your patch adds a dependency on xcb by default, which you didn't mention. Cairo has more floating dependencies. I have a similar but more complete patch which I haven't tested on master yet. See below. Regards, Andreas From 1a1057b89c7c7d5ebd7087ac9a2cba98bb183ec0 Mon Sep 17 00:00:00 2001 From: Andreas Oberritter <obi@opendreambox.org> Date: Fri, 27 Mar 2015 23:23:01 +0100 Subject: [PATCH] cairo: improve packageconfig options Fixes floating dependencies on various x11 libs and directfb. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> --- meta/recipes-graphics/cairo/cairo.inc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc index cd37559..fd217e6 100644 --- a/meta/recipes-graphics/cairo/cairo.inc +++ b/meta/recipes-graphics/cairo/cairo.inc @@ -10,16 +10,19 @@ HOMEPAGE = "http://cairographics.org" BUGTRACKER = "http://bugs.freedesktop.org" SECTION = "libs" LICENSE = "MPL-1 & LGPLv2.1" -X11DEPENDS = "virtual/libx11 libsm libxrender libxext" DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xlib xlib-xrender', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" -PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" -PACKAGECONFIG[directfb] = "--enable-directfb=yes,,directfb" -PACKAGECONFIG[valgrind] = "--enable-valgrind=yes,--disable-valgrind,valgrind" +PACKAGECONFIG[directfb] = "--enable-directfb,--disable-directfb,directfb" PACKAGECONFIG[egl] = "--enable-egl=yes,--disable-egl,virtual/egl" PACKAGECONFIG[glesv2] = "--enable-glesv2,--disable-glesv2,virtual/libgles2" +PACKAGECONFIG[valgrind] = "--enable-valgrind,--disable-valgrind,valgrind" +PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" +PACKAGECONFIG[xcb-shm] = "--enable-xcb-shm,--disable-xcb-shm,libxcb" +PACKAGECONFIG[xlib-xcb] = "--enable-xlib-xcb,--disable-xlib-xcb,virtual/libx11" +PACKAGECONFIG[xlib] = "--enable-xlib,--disable-xlib,virtual/libx11 libxext" +PACKAGECONFIG[xlib-xrender] = "--enable-xlib-xrender,--disable-xlib-xrender,libxrender" #check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points require cairo-fpu.inc -- 1.9.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] cairo: make xlib and libxcb dependencies explicit 2015-05-15 15:50 ` Andreas Oberritter @ 2015-05-15 16:01 ` Burton, Ross 2015-05-15 16:03 ` Joshua Lock 1 sibling, 0 replies; 5+ messages in thread From: Burton, Ross @ 2015-05-15 16:01 UTC (permalink / raw) To: Andreas Oberritter; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 462 bytes --] On 15 May 2015 at 16:50, Andreas Oberritter <obi@opendreambox.org> wrote: > your patch adds a dependency on xcb by default, which you didn't > mention. > Considering libx11 depends on xcb, this is in practise enabled by default. I'll take Josh's patch, but extending Cairo's detection would be good. I'm not sure I agree with splitting the X11 packageconfigs to finely - in practise everyone using libx11 will want shm/render enabled too. Ross [-- Attachment #2: Type: text/html, Size: 951 bytes --] ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] cairo: make xlib and libxcb dependencies explicit 2015-05-15 15:50 ` Andreas Oberritter 2015-05-15 16:01 ` Burton, Ross @ 2015-05-15 16:03 ` Joshua Lock 1 sibling, 0 replies; 5+ messages in thread From: Joshua Lock @ 2015-05-15 16:03 UTC (permalink / raw) To: openembedded-core Hi Andreas, On 15/05/15 16:50, Andreas Oberritter wrote: > Hi Joshua, > > On 15.05.2015 15:37, Joshua Lock wrote: >> Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> >> --- >> meta/recipes-graphics/cairo/cairo.inc | 6 ++++-- >> 1 file changed, 4 insertions(+), 2 deletions(-) >> >> diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc >> index 98add5a..1e45318 100644 >> --- a/meta/recipes-graphics/cairo/cairo.inc >> +++ b/meta/recipes-graphics/cairo/cairo.inc >> @@ -17,9 +17,11 @@ LICENSE_${PN}-perf-utils = "GPLv3+" >> X11DEPENDS = "virtual/libx11 libsm libxrender libxext" >> DEPENDS = "libpng fontconfig pixman glib-2.0 zlib" >> >> -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ >> +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \ >> ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}" >> -PACKAGECONFIG[x11] = "--with-x=yes,--without-x,${X11DEPENDS}" >> + >> +PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}" >> +PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb" > > your patch adds a dependency on xcb by default, which you didn't > mention. That's true, however I believe xcb is picked up in a default build of the current recipe (by virtue of it being a dependency of libx11) and thus I included it in the default PACKAGECONFIG so as to make current behaviour explicit. > Cairo has more floating dependencies. I have a similar but more > complete patch which I haven't tested on master yet. See below. That is indeed a more complete fix, I'd be happy to see it land instead of my proposed change. Regards, Joshua ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-05-15 16:03 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2015-05-15 13:37 [PATCH 0/1] Fix implicit dependencies in cairo Joshua Lock 2015-05-15 13:37 ` [PATCH 1/1] cairo: make xlib and libxcb dependencies explicit Joshua Lock 2015-05-15 15:50 ` Andreas Oberritter 2015-05-15 16:01 ` Burton, Ross 2015-05-15 16:03 ` Joshua Lock
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox