Patchwork [2/3] cogl-1.0: make building cogl-pango optional

login
register
mail settings
Submitter Andreas Oberritter
Date July 11, 2013, 12:56 a.m.
Message ID <1373504197-9550-2-git-send-email-obi@opendreambox.org>
Download mbox | patch
Permalink /patch/53473/
State Accepted
Commit 7d013f32abce0961cebd65b3530fc2904fdfda7d
Headers show

Comments

Andreas Oberritter - July 11, 2013, 12:56 a.m.
Add a 'cogl-pango' PACKAGECONFIG option and enable it by default.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---
 meta/recipes-graphics/cogl/cogl-1.0.inc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
Ross Burton - July 11, 2013, 8:56 a.m.
On 11 July 2013 01:56, Andreas Oberritter <obi@opendreambox.org> wrote:
> Add a 'cogl-pango' PACKAGECONFIG option and enable it by default.

Really picky, but can we call this just "pango"?

Ross
Tomas Frydrych - July 11, 2013, 9:18 a.m.
On 11/07/13 09:56, Burton, Ross wrote:
> On 11 July 2013 01:56, Andreas Oberritter <obi@opendreambox.org> wrote:
>> Add a 'cogl-pango' PACKAGECONFIG option and enable it by default.
> 
> Really picky, but can we call this just "pango"?

+1 for that; otherwise, these patches makes good sense to me.

Tomas
Andreas Oberritter - July 11, 2013, 10:59 a.m.
On 11.07.2013 10:56, Burton, Ross wrote:
> On 11 July 2013 01:56, Andreas Oberritter <obi@opendreambox.org> wrote:
>> Add a 'cogl-pango' PACKAGECONFIG option and enable it by default.
> 
> Really picky, but can we call this just "pango"?

I prefer cogl-pango, because I think it's more useful to derive the name
from the configure option rather than from the dependency. This way it
won't conflict with a future option --enable-pango or
--enable-something-else-which-depends-on-pango. If you look at
--enable-gles2 vs. --enable-cogl-gles2, this just seems to be the right
thing to do.

Regards,
Andreas

Patch

diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index 8400668..c0d410e 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -8,7 +8,7 @@  SRC_URI += "file://cogl_fixed_mul-constraint.patch \
 
 inherit clutter
 
-DEPENDS = "pango glib-2.0 gdk-pixbuf"
+DEPENDS = "glib-2.0 gdk-pixbuf"
 PACKAGES =+ "${PN}-examples \
              libcogl libcogl-dev \
              libcogl-gles2 libcogl-gles2-dev \
@@ -34,6 +34,8 @@  EXTRA_OECONF += "--disable-introspection	\
 	       	 --disable-gles1		\
 	    	"
 
+PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango"
+
 # GL flavours
 PACKAGECONFIG[gl] = "--enable-gl,--disable-gl,${EDEPENDS_GL},${ERDEPENDS_GL}"
 PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}"
@@ -52,7 +54,7 @@  PACKAGECONFIG[wayland-server] = "--enable-wayland-egl-server,--disable-wayland-e
 
 # Respect the DISTRO_FEATURES to pull in GLX or Wayland as appropriate by
 # default.
-PACKAGECONFIG ??= "gl \
+PACKAGECONFIG ??= "cogl-pango gl \
                    ${@base_contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \
                    ${@base_contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}"