[OE-core] [PATCH v3 4/8] fix clutter
Tomas Frydrych
tf+lists.yocto at r-finger.com
Tue May 21 11:04:15 UTC 2013
From: Tomas Frydrych <tomas at sleepfive.com>
Signed-off-by: Tomas Frydrych <tomas at sleepfive.com>
---
meta/recipes-graphics/clutter/clutter-1.0.inc | 22 +++++++---------------
1 file changed, 7 insertions(+), 15 deletions(-)
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
}
--
1.7.10.4
More information about the Openembedded-core
mailing list