summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0.inc8
-rw-r--r--meta/recipes-graphics/mx/mx.inc5
5 files changed, 11 insertions, 14 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
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index b56bfecefe..fc7cffee4b 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -2,7 +2,7 @@ SUMMARY = "Modern 3D graphics API with associated utility APIs"
2HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl" 2HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
3LICENSE = "MIT" 3LICENSE = "MIT"
4 4
5inherit clutter distro_features_check upstream-version-is-even 5inherit clutter distro_features_check upstream-version-is-even gobject-introspection
6# cogl-1.0 needs opengl to build 6# cogl-1.0 needs opengl to build
7REQUIRED_DISTRO_FEATURES ?= "opengl" 7REQUIRED_DISTRO_FEATURES ?= "opengl"
8 8
@@ -26,8 +26,7 @@ ERDEPENDS_GL = "libgl"
26ERDEPENDS_GLES2 = "libgles2" 26ERDEPENDS_GLES2 = "libgles2"
27 27
28# GLESv1 is rarely tested, so disable it 28# GLESv1 is rarely tested, so disable it
29EXTRA_OECONF += "--disable-introspection \ 29EXTRA_OECONF += "--enable-examples-install \
30 --enable-examples-install \
31 --enable-debug \ 30 --enable-debug \
32 --disable-gles1 \ 31 --disable-gles1 \
33 --disable-cairo \ 32 --disable-cairo \
@@ -58,6 +57,9 @@ PACKAGECONFIG ??= "cogl-pango gles2 \
58 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx egl-x11', '', d)} \ 57 ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx egl-x11', '', d)} \
59 " 58 "
60 59
60do_compile_prepend() {
61 export GIR_EXTRA_LIBS_PATH="${B}/cogl/.libs"
62}
61 63
62FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" 64FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*"
63FILES_libcogl = "${libdir}/libcogl${SOLIBS}" 65FILES_libcogl = "${libdir}/libcogl${SOLIBS}"
diff --git a/meta/recipes-graphics/mx/mx.inc b/meta/recipes-graphics/mx/mx.inc
index aa4915d25c..4f1095793d 100644
--- a/meta/recipes-graphics/mx/mx.inc
+++ b/meta/recipes-graphics/mx/mx.inc
@@ -1,7 +1,7 @@
1SUMMARY = "Clutter based UI widget library" 1SUMMARY = "Clutter based UI widget library"
2LICENSE = "LGPLv2.1" 2LICENSE = "LGPLv2.1"
3 3
4inherit clutter autotools-brokensep distro_features_check 4inherit clutter autotools-brokensep distro_features_check gobject-introspection
5# depends on clutter-1.0 which depends on cogl-1.0 5# depends on clutter-1.0 which depends on cogl-1.0
6REQUIRED_DISTRO_FEATURES = "opengl" 6REQUIRED_DISTRO_FEATURES = "opengl"
7 7
@@ -9,8 +9,7 @@ DEPENDS = "clutter-1.0 dbus-glib gdk-pixbuf"
9 9
10SRC_URI = "http://source.clutter-project.org/sources/mx/${@get_verdir("${PV}")}/mx-${PV}.tar.xz" 10SRC_URI = "http://source.clutter-project.org/sources/mx/${@get_verdir("${PV}")}/mx-${PV}.tar.xz"
11 11
12EXTRA_OECONF = "--disable-introspection \ 12EXTRA_OECONF = "--disable-gtk-doc \
13 --disable-gtk-doc \
14 --disable-gtk-widgets \ 13 --disable-gtk-widgets \
15 --with-dbus \ 14 --with-dbus \
16 --with-winsys=none \ 15 --with-winsys=none \