Patchwork [3/4] clutter: further improvements

login
register
mail settings
Submitter Tomas Frydrych
Date May 21, 2013, 3:08 p.m.
Message ID <1369148923-20676-4-git-send-email-tf+lists.yocto@r-finger.com>
Download mbox | patch
Permalink /patch/50263/
State Accepted
Commit a5d9c80fa35e9fd234f14c61b385d9c17f31132b
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 missing comma in PACKAGECONFIG[glx] setup,
 * Removed no longer required DOLT-related config fragment.

Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
 meta/recipes-graphics/clutter/clutter-1.0.inc |   22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

Patch

diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc
index 6710776..e1d3cf4 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-1.0.inc
@@ -6,7 +6,7 @@  inherit clutter
 
 SRC_URI += "file://enable_tests.patch"
 
-DEPENDS = "gtk-doc-native pango glib-2.0 json-glib atk udev cogl-1.0"
+DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0"
 PACKAGES =+ "${PN}-examples"
 AUTOTOOLS_AUXDIR = "${S}/build"
 
@@ -18,28 +18,23 @@  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		\
+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
 }