summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/clutter/clutter-1.0.inc
diff options
context:
space:
mode:
authorTomas Frydrych <tomas@sleepfive.com>2013-05-21 16:08:42 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-24 14:14:44 +0100
commitb7caa5e5cc9aad71a62debf6d7fd9de60c9ccd5b (patch)
tree81b84f65283bb783365bb6f258b7d5f3b54b7fcd /meta/recipes-graphics/clutter/clutter-1.0.inc
parent32b4a4abd9437db81b0ea70a820b202d40b779e7 (diff)
downloadpoky-b7caa5e5cc9aad71a62debf6d7fd9de60c9ccd5b.tar.gz
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. (From OE-Core rev: a5d9c80fa35e9fd234f14c61b385d9c17f31132b) Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/clutter/clutter-1.0.inc')
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0.inc22
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
6 6
7SRC_URI += "file://enable_tests.patch" 7SRC_URI += "file://enable_tests.patch"
8 8
9DEPENDS = "gtk-doc-native pango glib-2.0 json-glib atk udev cogl-1.0" 9DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0"
10PACKAGES =+ "${PN}-examples" 10PACKAGES =+ "${PN}-examples"
11AUTOTOOLS_AUXDIR = "${S}/build" 11AUTOTOOLS_AUXDIR = "${S}/build"
12 12
@@ -18,28 +18,23 @@ EDEPENDS_EVDEV = "libxkbcommon"
18ERDEPENDS_EVDEV = "xkeyboard-config" 18ERDEPENDS_EVDEV = "xkeyboard-config"
19 19
20# Disable pretty much everything, override in platform specific set up 20# Disable pretty much everything, override in platform specific set up
21EXTRA_OECONF += "--disable-gtk-doc \ 21EXTRA_OECONF += "--disable-introspection \
22 ${@get_fpu_setting(bb, d)} \
23 --disable-introspection \
24 --disable-egl-backend \
25 --disable-quartz-backend \ 22 --disable-quartz-backend \
26 --disable-win32-backend \ 23 --disable-win32-backend \
27 --disable-x11-backend \
28 --disable-gdk-backend \ 24 --disable-gdk-backend \
29 --disable-wayland-backend \ 25 --disable-wayland-backend \
30 --disable-wayland-compositor \ 26 --disable-wayland-compositor \
31 --disable-cex100-backend \ 27 --disable-cex100-backend \
32 --disable-tslib-input \ 28 --disable-tslib-input \
33 --disable-evdev-input \
34 " 29 "
35 30
36PACKAGECONFIG[x11] = "--enable-x11-backend,,${EDEPENDS_X11}" 31PACKAGECONFIG[x11] = "--enable-x11-backend,--disable-x11-backend,${EDEPENDS_X11}"
37PACKAGECONFIG[glx] = "--enable-x11-backend,,${EDEPENDS_X11} ${EDEPENDS_GLX}" 32PACKAGECONFIG[glx] = ",,${EDEPENDS_X11} ${EDEPENDS_GLX}"
38PACKAGECONFIG[egl] = "--enable-egl-backend,,${EDEPENDS_EGL}" 33PACKAGECONFIG[egl] = "--enable-egl-backend,--disable-egl-backend,${EDEPENDS_EGL}"
39PACKAGECONFIG[evdev] = "--enable-evdev-input,,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}" 34PACKAGECONFIG[evdev] = "--enable-evdev-input,--disable-evdev-input,${EDEPENDS_EVDEV},${ERDEPENDS_EVDEV}"
40 35
41# Default configuration, distros might want to override 36# Default configuration, distros might want to override
42PACKAGECONFIG ??= "glx" 37PACKAGECONFIG ??= "x11 glx"
43 38
44FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png" 39FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
45 40
@@ -50,7 +45,4 @@ do_configure_prepend() {
50 45
51 # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this 46 # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this
52 touch -t 200001010000 po/clutter-1.0.pot 47 touch -t 200001010000 po/clutter-1.0.pot
53
54 # Disable DOLT
55 sed -i -e 's/^DOLT//' ${S}/configure.ac
56} 48}