diff options
| author | Tomas Frydrych <tomas@sleepfive.com> | 2013-05-21 16:08:42 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-24 14:07:01 +0100 |
| commit | a5d9c80fa35e9fd234f14c61b385d9c17f31132b (patch) | |
| tree | acd8f74fa84d05f9c909ae8407463af43a196679 | |
| parent | ea59330c48cdb7d7106deea3f19c043ba60c23e4 (diff) | |
| download | openembedded-core-a5d9c80fa35e9fd234f14c61b385d9c17f31132b.tar.gz openembedded-core-a5d9c80fa35e9fd234f14c61b385d9c17f31132b.tar.bz2 openembedded-core-a5d9c80fa35e9fd234f14c61b385d9c17f31132b.zip | |
clutter: further improvements
* 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>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/recipes-graphics/clutter/clutter-1.0.inc | 22 |
1 files 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 6710776213..e1d3cf42cb 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 } |