Patchwork [v3,4/8] fix clutter

login
register
mail settings
Submitter Tomas Frydrych
Date May 21, 2013, 11:04 a.m.
Message ID <1369134259-12091-5-git-send-email-tf+lists.yocto@r-finger.com>
Download mbox | patch
Permalink /patch/50237/
State New
Headers show

Comments

Tomas Frydrych - May 21, 2013, 11:04 a.m.
From: Tomas Frydrych <tomas@sleepfive.com>


Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
 meta/recipes-graphics/clutter/clutter-1.0.inc |   22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)
Phil Blundell - May 21, 2013, 11:20 a.m.
On Tue, 2013-05-21 at 12:04 +0100, Tomas Frydrych wrote:
> -# Disable pretty much everything, override in platform specific set up
> -EXTRA_OECONF += "--disable-gtk-doc		\
> -	     	 ${@get_fpu_setting(bb, d)}	\
> -             	 --disable-introspection	\
> -	     	 --disable-egl-backend		\
> +# Disable backends we do not currently support building
> +EXTRA_OECONF += "--disable-introspection	\

Was this supposed to have been squashed with 3/8?

p.
Tomas Frydrych - May 21, 2013, 12:36 p.m.
On 21/05/13 12:20, Phil Blundell wrote:
> On Tue, 2013-05-21 at 12:04 +0100, Tomas Frydrych wrote:
>> -# Disable pretty much everything, override in platform specific set up
>> -EXTRA_OECONF += "--disable-gtk-doc		\
>> -	     	 ${@get_fpu_setting(bb, d)}	\
>> -             	 --disable-introspection	\
>> -	     	 --disable-egl-backend		\
>> +# Disable backends we do not currently support building
>> +EXTRA_OECONF += "--disable-introspection	\
> 
> Was this supposed to have been squashed with 3/8?

Yes, sorry :( I think Richard already pushed the previous version as well.

Tomas

Patch

diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc
index 6710776..9b4b169 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-1.0.inc
@@ -17,29 +17,24 @@  EDEPENDS_EGL = "virtual/egl"
 EDEPENDS_EVDEV = "libxkbcommon"
 ERDEPENDS_EVDEV = "xkeyboard-config"
 
-# Disable pretty much everything, override in platform specific set up
-EXTRA_OECONF += "--disable-gtk-doc		\
-	     	 ${@get_fpu_setting(bb, d)}	\
-             	 --disable-introspection	\
-	     	 --disable-egl-backend		\
+# Disable backends we do not currently support building
+EXTRA_OECONF += "--disable-introspection	\
 	     	 --disable-quartz-backend	\
 	     	 --disable-win32-backend	\
-	     	 --disable-x11-backend		\
 	     	 --disable-gdk-backend		\
 	     	 --disable-wayland-backend	\
 	     	 --disable-wayland-compositor	\
 	     	 --disable-cex100-backend	\
 	     	 --disable-tslib-input		\
-	     	 --disable-evdev-input		\
 	    	"
 
-PACKAGECONFIG[x11] = "--enable-x11-backend,,${EDEPENDS_X11}"
-PACKAGECONFIG[glx] = "--enable-x11-backend,,${EDEPENDS_X11} ${EDEPENDS_GLX}"
-PACKAGECONFIG[egl] = "--enable-egl-backend,,${EDEPENDS_EGL}"
-PACKAGECONFIG[evdev] = "--enable-evdev-input,,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}"
+PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}"
+PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}"
+PACKAGECONFIG[egl] = "--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}"
+PACKAGECONFIG[evdev] = "--enable-evdev-input,--disable-evdev-input,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}"
 
 # Default configuration, distros might want to override
-PACKAGECONFIG ??= "glx"
+PACKAGECONFIG ??= "x11 glx"
 
 FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
 
@@ -50,7 +45,4 @@  do_configure_prepend() {
 
 	# see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this
 	touch -t 200001010000 po/clutter-1.0.pot
-
-	# Disable DOLT
-	sed -i -e 's/^DOLT//' ${S}/configure.ac
 }