Patchwork [2/4] cogl: further improvements

login
register
mail settings
Submitter Tomas Frydrych
Date May 21, 2013, 3:08 p.m.
Message ID <1369148923-20676-3-git-send-email-tf+lists.yocto@r-finger.com>
Download mbox | patch
Permalink /patch/50259/
State Accepted
Commit 7c178fc360a7d94e34027afb8dafdfb54cb7de64
Headers show

Comments

Tomas Frydrych - May 21, 2013, 3:08 p.m.
From: Tomas Frydrych <tomas@sleepfive.com>

 * Removed unnecessary gtk-doc related depends/configure options (handled in
   gtk-doc class)
 * Moved more configure options into PACKAGECONFIG
 * Fixed typo in RDEPENDS of PACKAGECONFIG[gl] setup
 * Removed no longer needed DOLT-related configure fragment

Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
 meta/recipes-graphics/cogl/cogl-1.0.inc |   24 ++++++++----------------
 1 file changed, 8 insertions(+), 16 deletions(-)
Martin Jansa - May 21, 2013, 4:31 p.m.
On Tue, May 21, 2013 at 04:08:41PM +0100, Tomas Frydrych wrote:
> From: Tomas Frydrych <tomas@sleepfive.com>
> 
>  * Removed unnecessary gtk-doc related depends/configure options (handled in
>    gtk-doc class)
> -	       	 ${@get_fpu_setting(bb, d)}	\

This should be applied before 1/4 or squash them.

Patch

diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index 17d8629..3a6de28 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -4,7 +4,7 @@  LICENSE = "LGPLv2.1+"
 
 inherit clutter
 
-DEPENDS = "gtk-doc-native pango glib-2.0 gdk-pixbuf"
+DEPENDS = "pango glib-2.0 gdk-pixbuf"
 PACKAGES =+ "${PN}-examples"
 AUTOTOOLS_AUXDIR = "${S}/build"
 
@@ -21,38 +21,30 @@  ERDEPENDS_GL    = "libgl"
 ERDEPENDS_GLES2 = "libgles2"
 
 EXTRA_OECONF += "--disable-introspection	\
-	       	 --disable-gtk-doc		\
-	       	 ${@get_fpu_setting(bb, d)}	\
 	       	 --enable-examples-install	\
 	       	 --enable-debug		 	\
-	       	 --disable-gl			\
 	       	 --disable-gles1		\
-	       	 --disable-gles2		\
-	       	 --disable-glx			\
 	    	"
 
 # GL flavours
-PACKAGECONFIG[gl] = "--enable-gl,,${EDEPENDS_GL},${ERDPENDS_GL}"
-PACKAGECONFIG[gles2] = "--enable-gles2,,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}"
+PACKAGECONFIG[gl] = "--enable-gl,--disable-gl,${EDEPENDS_GL},${ERDEPENDS_GL}"
+PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}"
 
 # egl backends
-PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,,${EDEPENDS_KMS}"
-PACKAGECONFIG[egl-null] = "--enable-null-egl-platform"
-PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,,${EDEPENDS_X11}"
+PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}"
+PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform"
+PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11}"
 
 # glx
-PACKAGECONFIG[glx] = "--enable-gl --enable-glx, ${EDEPENDS_GL} ${EDEPENDS_X11}"
+PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,${EDEPENDS_GL} ${EDEPENDS_X11}"
 
 # Default to GLX
-PACKAGECONFIG ??= "glx"
+PACKAGECONFIG ??= "gl glx"
 
 #Fix up some weirdness in the docs
 do_configure_prepend() {
         sed -i s:doc/reference/Makefile::g ${S}/configure.ac
         sed -i s:doc::g ${S}/Makefile.am
-
-	# Disable DOLT
-	sed -i -e 's/^DOLT//' ${S}/configure.ac
 }
 
 FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*"