summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/clutter
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2016-03-09 17:02:00 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-12 22:11:45 +0000
commitc1d67e459d24c47ec8728123ba628e1cceae2140 (patch)
treefe211903efd28c5718332e17c355b4c7d01770d6 /meta/recipes-graphics/clutter
parent0ec412b09dc8b1bd3a003e11c7077e1d59194882 (diff)
downloadpoky-c1d67e459d24c47ec8728123ba628e1cceae2140.tar.gz
clutter: enable gobject introspection
(From OE-Core rev: e364deddafaec1f1f6b58ac41542dfc91d5145a4) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/clutter')
-rw-r--r--meta/recipes-graphics/clutter/clutter-1.0.inc5
-rw-r--r--meta/recipes-graphics/clutter/clutter-gst-3.0.inc4
-rw-r--r--meta/recipes-graphics/clutter/clutter-gtk-1.0.inc3
3 files changed, 4 insertions, 8 deletions
diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc
index 0ace1ce624..c6ecd0804c 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-1.0.inc
@@ -2,7 +2,7 @@ SUMMARY = "Graphics library for creating hardware-accelerated user interfaces"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPLv2.1+" 3LICENSE = "LGPLv2.1+"
4 4
5inherit clutter ptest-gnome distro_features_check upstream-version-is-even 5inherit clutter ptest-gnome distro_features_check upstream-version-is-even gobject-introspection
6# depends on cogl-1.0 which needs opengl 6# depends on cogl-1.0 which needs opengl
7REQUIRED_DISTRO_FEATURES ?= "opengl" 7REQUIRED_DISTRO_FEATURES ?= "opengl"
8 8
@@ -19,8 +19,7 @@ EDEPENDS_EVDEV = "libxkbcommon"
19ERDEPENDS_EVDEV = "xkeyboard-config" 19ERDEPENDS_EVDEV = "xkeyboard-config"
20 20
21# Disable pretty much everything, override in platform specific set up 21# Disable pretty much everything, override in platform specific set up
22EXTRA_OECONF += "--disable-introspection \ 22EXTRA_OECONF += "--disable-quartz-backend \
23 --disable-quartz-backend \
24 --disable-win32-backend \ 23 --disable-win32-backend \
25 --disable-gdk-backend \ 24 --disable-gdk-backend \
26 --disable-cex100-backend \ 25 --disable-cex100-backend \
diff --git a/meta/recipes-graphics/clutter/clutter-gst-3.0.inc b/meta/recipes-graphics/clutter/clutter-gst-3.0.inc
index 4f7b4a3c00..4c877982b7 100644
--- a/meta/recipes-graphics/clutter/clutter-gst-3.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-gst-3.0.inc
@@ -2,7 +2,7 @@ SUMMARY = "GStreamer integration library for Clutter"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPLv2+" 3LICENSE = "LGPLv2+"
4 4
5inherit clutter distro_features_check upstream-version-is-even 5inherit clutter distro_features_check upstream-version-is-even gobject-introspection
6# depends on clutter-1.0 which depends on cogl-1.0 6# depends on clutter-1.0 which depends on cogl-1.0
7REQUIRED_DISTRO_FEATURES ?= "opengl" 7REQUIRED_DISTRO_FEATURES ?= "opengl"
8 8
@@ -12,8 +12,6 @@ DEPENDS = "gstreamer1.0-plugins-base gstreamer1.0-plugins-bad clutter-1.0 libgud
12RDEPENDS_${PN} += "gstreamer1.0-meta-base" 12RDEPENDS_${PN} += "gstreamer1.0-meta-base"
13PACKAGES =+ "${PN}-examples" 13PACKAGES =+ "${PN}-examples"
14 14
15EXTRA_OECONF += "--disable-introspection"
16
17FILES_${PN} += "${libdir}/gstreamer-1.0/lib*.so" 15FILES_${PN} += "${libdir}/gstreamer-1.0/lib*.so"
18FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" 16FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la"
19FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink" 17FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink"
diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
index b07d3b941d..05c4e5f5ca 100644
--- a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc
@@ -2,7 +2,7 @@ SUMMARY = "Library for embedding a Clutter canvas in a GTK+ application"
2HOMEPAGE = "http://www.clutter-project.org/" 2HOMEPAGE = "http://www.clutter-project.org/"
3LICENSE = "LGPLv2+" 3LICENSE = "LGPLv2+"
4 4
5inherit clutter distro_features_check upstream-version-is-even 5inherit clutter distro_features_check upstream-version-is-even gobject-introspection
6# depends on clutter-1.0 which depends on cogl-1.0 6# depends on clutter-1.0 which depends on cogl-1.0
7REQUIRED_DISTRO_FEATURES ?= "opengl" 7REQUIRED_DISTRO_FEATURES ?= "opengl"
8# depends on gtk+3 8# depends on gtk+3
@@ -12,5 +12,4 @@ DEPENDS = "clutter-1.0 gtk+3"
12PACKAGES =+ "${PN}-examples" 12PACKAGES =+ "${PN}-examples"
13AUTOTOOLS_AUXDIR = "${S}/build" 13AUTOTOOLS_AUXDIR = "${S}/build"
14 14
15EXTRA_OECONF += "--disable-introspection"
16 15