summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics
diff options
context:
space:
mode:
authorTomas Frydrych <tomas@sleepfive.com>2013-05-21 16:08:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-24 14:14:43 +0100
commit7c178fc360a7d94e34027afb8dafdfb54cb7de64 (patch)
treed9e009eb50ab7385f5408f0523219787dd9874af /meta/recipes-graphics
parent4462df6a515300c37370c18772bdbbe1c4cf1c17 (diff)
downloadpoky-7c178fc360a7d94e34027afb8dafdfb54cb7de64.tar.gz
cogl: further improvements
* Removed unnecessary gtk-doc related depends/configure options (handled in gtk-doc class) * Moved more configure options into PACKAGECONFIG * Fixed typo in RDEPENDS of PACKAGECONFIG[gl] setup * Removed no longer needed DOLT-related configure fragment (From OE-Core rev: 356e00b198608080495641270f4a1634ddc6ff85) 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')
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0.inc24
1 files changed, 8 insertions, 16 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index 17d8629eb9..3a6de282b8 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1+"
4 4
5inherit clutter 5inherit clutter
6 6
7DEPENDS = "gtk-doc-native pango glib-2.0 gdk-pixbuf" 7DEPENDS = "pango glib-2.0 gdk-pixbuf"
8PACKAGES =+ "${PN}-examples" 8PACKAGES =+ "${PN}-examples"
9AUTOTOOLS_AUXDIR = "${S}/build" 9AUTOTOOLS_AUXDIR = "${S}/build"
10 10
@@ -21,38 +21,30 @@ ERDEPENDS_GL = "libgl"
21ERDEPENDS_GLES2 = "libgles2" 21ERDEPENDS_GLES2 = "libgles2"
22 22
23EXTRA_OECONF += "--disable-introspection \ 23EXTRA_OECONF += "--disable-introspection \
24 --disable-gtk-doc \
25 ${@get_fpu_setting(bb, d)} \
26 --enable-examples-install \ 24 --enable-examples-install \
27 --enable-debug \ 25 --enable-debug \
28 --disable-gl \
29 --disable-gles1 \ 26 --disable-gles1 \
30 --disable-gles2 \
31 --disable-glx \
32 " 27 "
33 28
34# GL flavours 29# GL flavours
35PACKAGECONFIG[gl] = "--enable-gl,,${EDEPENDS_GL},${ERDPENDS_GL}" 30PACKAGECONFIG[gl] = "--enable-gl,--disable-gl,${EDEPENDS_GL},${ERDEPENDS_GL}"
36PACKAGECONFIG[gles2] = "--enable-gles2,,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}" 31PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}"
37 32
38# egl backends 33# egl backends
39PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,,${EDEPENDS_KMS}" 34PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}"
40PACKAGECONFIG[egl-null] = "--enable-null-egl-platform" 35PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform"
41PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,,${EDEPENDS_X11}" 36PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11}"
42 37
43# glx 38# glx
44PACKAGECONFIG[glx] = "--enable-gl --enable-glx, ${EDEPENDS_GL} ${EDEPENDS_X11}" 39PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,${EDEPENDS_GL} ${EDEPENDS_X11}"
45 40
46# Default to GLX 41# Default to GLX
47PACKAGECONFIG ??= "glx" 42PACKAGECONFIG ??= "gl glx"
48 43
49#Fix up some weirdness in the docs 44#Fix up some weirdness in the docs
50do_configure_prepend() { 45do_configure_prepend() {
51 sed -i s:doc/reference/Makefile::g ${S}/configure.ac 46 sed -i s:doc/reference/Makefile::g ${S}/configure.ac
52 sed -i s:doc::g ${S}/Makefile.am 47 sed -i s:doc::g ${S}/Makefile.am
53
54 # Disable DOLT
55 sed -i -e 's/^DOLT//' ${S}/configure.ac
56} 48}
57 49
58FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" 50FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*"