* [PATCH 1/4] clutter.bbclass: removed unused function
2013-05-21 15:08 further colg/clutter improvements and fixes Tomas Frydrych
@ 2013-05-21 15:08 ` Tomas Frydrych
2013-05-21 15:08 ` [PATCH 2/4] cogl: further improvements Tomas Frydrych
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Tomas Frydrych @ 2013-05-21 15:08 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
Clutter and cogl no longer use --with-fpu configure option, so we no longer
require the get_fpu_settings() function.
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/classes/clutter.bbclass | 5 -----
1 file changed, 5 deletions(-)
diff --git a/meta/classes/clutter.bbclass b/meta/classes/clutter.bbclass
index 184fb44..0dc4850 100644
--- a/meta/classes/clutter.bbclass
+++ b/meta/classes/clutter.bbclass
@@ -13,11 +13,6 @@ VERMINOR = "${@get_minor_dir("${PV}")}"
REALNAME = "${@get_real_name("${BPN}")}"
FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/${REALNAME}-${PV}", "${FILE_DIRNAME}/${REALNAME}-${VERMINOR}", "${FILE_DIRNAME}/${REALNAME}", "${FILE_DIRNAME}/files"], d)}"
-def get_fpu_setting(bb, d):
- if d.getVar('TARGET_FPU', True) in [ 'soft' ]:
- return "--without-fpu"
- return ""
-
CLUTTER_SRC_FTP = "${GNOME_MIRROR}/${REALNAME}/${VERMINOR}/${REALNAME}-${PV}.tar.xz;name=archive"
CLUTTER_SRC_GIT = "git://git.gnome.org/${REALNAME};protocol=git"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] cogl: further improvements
2013-05-21 15:08 further colg/clutter improvements and fixes Tomas Frydrych
2013-05-21 15:08 ` [PATCH 1/4] clutter.bbclass: removed unused function Tomas Frydrych
@ 2013-05-21 15:08 ` Tomas Frydrych
2013-05-21 16:31 ` Martin Jansa
2013-05-21 15:08 ` [PATCH 3/4] clutter: " Tomas Frydrych
2013-05-21 15:08 ` [PATCH 4/4] clutter-gst: removed no longer required configure fragment Tomas Frydrych
3 siblings, 1 reply; 6+ messages in thread
From: Tomas Frydrych @ 2013-05-21 15:08 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
* 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
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/cogl/cogl-1.0.inc | 24 ++++++++----------------
1 file 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 17d8629..3a6de28 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+"
inherit clutter
-DEPENDS = "gtk-doc-native pango glib-2.0 gdk-pixbuf"
+DEPENDS = "pango glib-2.0 gdk-pixbuf"
PACKAGES =+ "${PN}-examples"
AUTOTOOLS_AUXDIR = "${S}/build"
@@ -21,38 +21,30 @@ ERDEPENDS_GL = "libgl"
ERDEPENDS_GLES2 = "libgles2"
EXTRA_OECONF += "--disable-introspection \
- --disable-gtk-doc \
- ${@get_fpu_setting(bb, d)} \
--enable-examples-install \
--enable-debug \
- --disable-gl \
--disable-gles1 \
- --disable-gles2 \
- --disable-glx \
"
# GL flavours
-PACKAGECONFIG[gl] = "--enable-gl,,${EDEPENDS_GL},${ERDPENDS_GL}"
-PACKAGECONFIG[gles2] = "--enable-gles2,,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}"
+PACKAGECONFIG[gl] = "--enable-gl,--disable-gl,${EDEPENDS_GL},${ERDEPENDS_GL}"
+PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2}"
# egl backends
-PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,,${EDEPENDS_KMS}"
-PACKAGECONFIG[egl-null] = "--enable-null-egl-platform"
-PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,,${EDEPENDS_X11}"
+PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}"
+PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform"
+PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11}"
# glx
-PACKAGECONFIG[glx] = "--enable-gl --enable-glx, ${EDEPENDS_GL} ${EDEPENDS_X11}"
+PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,${EDEPENDS_GL} ${EDEPENDS_X11}"
# Default to GLX
-PACKAGECONFIG ??= "glx"
+PACKAGECONFIG ??= "gl glx"
#Fix up some weirdness in the docs
do_configure_prepend() {
sed -i s:doc/reference/Makefile::g ${S}/configure.ac
sed -i s:doc::g ${S}/Makefile.am
-
- # Disable DOLT
- sed -i -e 's/^DOLT//' ${S}/configure.ac
}
FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*"
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 3/4] clutter: further improvements
2013-05-21 15:08 further colg/clutter improvements and fixes Tomas Frydrych
2013-05-21 15:08 ` [PATCH 1/4] clutter.bbclass: removed unused function Tomas Frydrych
2013-05-21 15:08 ` [PATCH 2/4] cogl: further improvements Tomas Frydrych
@ 2013-05-21 15:08 ` Tomas Frydrych
2013-05-21 15:08 ` [PATCH 4/4] clutter-gst: removed no longer required configure fragment Tomas Frydrych
3 siblings, 0 replies; 6+ messages in thread
From: Tomas Frydrych @ 2013-05-21 15:08 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
* 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>
---
meta/recipes-graphics/clutter/clutter-1.0.inc | 22 +++++++---------------
1 file 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 6710776..e1d3cf4 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
}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] clutter-gst: removed no longer required configure fragment
2013-05-21 15:08 further colg/clutter improvements and fixes Tomas Frydrych
` (2 preceding siblings ...)
2013-05-21 15:08 ` [PATCH 3/4] clutter: " Tomas Frydrych
@ 2013-05-21 15:08 ` Tomas Frydrych
3 siblings, 0 replies; 6+ messages in thread
From: Tomas Frydrych @ 2013-05-21 15:08 UTC (permalink / raw)
To: openembedded-core
From: Tomas Frydrych <tomas@sleepfive.com>
The current package no longer use DOLT, so the DOLT configure frament is no
longer required.
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
---
meta/recipes-graphics/clutter/clutter-gst-1.0.inc | 5 -----
1 file changed, 5 deletions(-)
diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0.inc b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc
index f79795c..b5edcae 100644
--- a/meta/recipes-graphics/clutter/clutter-gst-1.0.inc
+++ b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc
@@ -16,8 +16,3 @@ FILES_${PN} += "${libdir}/gstreamer-0.10/lib*.so"
FILES_${PN}-dev += "${libdir}/gstreamer-0.10/*.la"
FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug/lib*.so"
FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink"
-
-do_configure_prepend () {
- # Disable DOLT
- sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
--
1.7.10.4
^ permalink raw reply related [flat|nested] 6+ messages in thread