Re: [OE-core] meta-gir issues and maintenance
Martin, On 12/03/15 14:35, Martin Jansa wrote: I was trying to use meta-gir in Dizzy release and found out that last commit in this layer is 16 months ago and many .bbappends no longer match with their recipes. Was this layer superseded by something else or you just didn't have time to update it for newer Yocto releases? Unfortunately, life has been getting in the way of working on this layer (as well as meta-guacamayo), and it is not going to change in the foreseeable future. :-( It's a pity, as the gir stuff is useful/necessary for things like python bindings to gobject and related. If someone wanted to take over, it would make sense to move the repo somewhere more central (yocto, oe) as well. Tomas -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] OE gcc-cross with builtin sysroot, BUG?
Hi, On 11/09/13 11:29, Nicolas Dechesne wrote: To me the problem is that gcc-cross 'embedds' some $MACHINE data in its package, but it is not marked as 'machine specific, but arch specific. So several machines will end up sharing the same gcc-cross package. The cross compiler should not be machine specific, that makes no sense. It seems to me that your problem comes entirely from the introduction of the machine element into the location of the *architecture* sysroot, which is not how the OE system is designed to work -- if your sysroot (i.e., the tmp dir) is in different place for different builds, then they are entirely separate builds, you should not share sstate between them. If you want to share the sstate, you need to share the sysroot. But it might be worth having some sort of sanity checker to catch this kind of misconfiguration. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] glib-2.0: fix a host contamination issue
On 03/09/13 12:16, Robert Yang wrote: On 09/03/2013 05:51 PM, Burton, Ross wrote: On 3 September 2013 08:52, Robert Yang liezhi.y...@windriver.com wrote: +sed -i -e 's/^\(ABS_GLIB_RUNTIME_LIBDIR=.*readlink\) -f/\1 -m/' ${S}/configure.ac Please do this as a patch instead of a sed. It seems that sed command is preferred ? For example, we don't have to port the patch once we upgrade glib-2.0. Having to port a patch when it fails to apply ensures we are still doing the right thing. In contrast, these sed snippets don't generate errors when they fail, and they remain in recipes for years when no longer working/needed. Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] cogl-1.0: make building cogl-pango optional
On 11/07/13 09:56, Burton, Ross wrote: On 11 July 2013 01:56, Andreas Oberritter o...@opendreambox.org wrote: Add a 'cogl-pango' PACKAGECONFIG option and enable it by default. Really picky, but can we call this just pango? +1 for that; otherwise, these patches makes good sense to me. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] init-live.sh: allow users to choose the boot action
Hi, On 10/07/13 08:12, qi.c...@windriver.com wrote: From: Chen Qi qi.c...@windriver.com Previously, the boot action for live images was totally determined by the LABEL value in the boot parameters (/proc/cmdline). This behavior is not very convenient for users. The user may just want to drop to a shell for troubleshooting the live image, or the user may want to try to install the live image while the LABEL value is 'boot'. We should provide the users a chance to choose the boot action when the live image starts up. I am not entirely clear on why this is needed, the LABEL kernel cmdline parameter is set up by syslinux, and its value can be specified by the user from the syslinux prompt. If what you want is a more user friendly menu, then I think the correct solution would be to tweak the syslinux config, rather than to create a duplicate boot menu in the init script. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/4] Allow xuser to shutdown
On 03/07/13 17:19, Martin Jansa wrote: Shouldn't we create separate recipe for xuser or any other default user and add it to connman and xserver-nodm-init RDEPENDS? I know there is some overhead from having one more package installed on image, but it would be a bit easier if we later decide that xuser also needs some file to be installed in his home or something like that. Yes, please; the current situation makes it rather awkward if you need to tweak some of the xuser parameters in a distro specific way. But perhaps it should be called something other than xuser? Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 2/5] xuser-account: create separate recipe for xuser creation
On 04/07/13 12:29, Burton, Ross wrote: On 4 July 2013 11:58, Laurentiu Palcu laurentiu.pa...@intel.com wrote: +USERADD_PARAM_${PN} = --create-home \ + --groups video,tty,audio,input,shutdown \ + --user-group xuser I'm not liking the name xuser but unless someone has a much better idea right now we can change that later. oeuser? Thinking about places where the xuser is used in other recipes (i.e. connman for ACLs), can anyone see a problem with adding xuser to the users group so those ACLS can use group membership instead of user name? Yes, I think group would be preferred option. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 5/5] shutdown-desktop: give entire path in Exec field
On 04/07/13 16:39, Laurentiu Palcu wrote: On 07/04/2013 05:58 PM, Burton, Ross wrote: On 4 July 2013 11:58, Laurentiu Palcu laurentiu.pa...@intel.com wrote: Even though the change you're proposing is OK, involves changing the desktop file to add the @SBIN@ pattern and move the sed line to do_install(). Compared to having one single line added in the postinstall... I would choose the latter, unless you elaborate on what do you actually mean by nasty. Post install scripts should be avoided whenever possible and used only for things that cannot be done at build or install time. This clearly can be done at install time, so it should. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] cogl: remove documentation hacks
On 30/05/13 14:22, Ross Burton wrote: These sed lines disable the documentation and appear to be historical, building works fine without them. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-graphics/cogl/cogl-1.0.inc |6 -- 1 file changed, 6 deletions(-) diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc index 9dc47f8..a44e6c4 100644 --- a/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -41,10 +41,4 @@ PACKAGECONFIG[glx] = --enable-glx,--disable-glx,${EDEPENDS_GL} ${EDEPENDS_X11} # Default to 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 -} - FILES_${PN}-examples = ${bindir}/* ${datadir}/cogl/examples-data/* Acked-by: Tomas Frydrych to...@sleepfive.com -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] clutter: remove documentation hacks
On 30/05/13 14:22, Ross Burton wrote: These sed lines disable the documentation and appear to be historical, building works fine without them. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-graphics/clutter/clutter-1.0.inc |4 1 file changed, 4 deletions(-) diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc index e1d3cf4..68cb22b 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -39,10 +39,6 @@ PACKAGECONFIG ??= x11 glx FILES_${PN}-examples = ${bindir}/test-* ${pkgdatadir}/redhand.png do_configure_prepend() { -# Fix up some weirdness in the docs -sed -i s:doc/reference/Makefile::g ${S}/configure.ac -sed -i s:doc::g ${S}/Makefile.am - # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this touch -t 2101 po/clutter-1.0.pot } Acked-by: Tomas Frydrych to...@sleepfive.com -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 1/8] clutter.bbclass: helper class for clutter and friends
On 21/05/13 17:51, Paul Eggleton wrote: On Tuesday 21 May 2013 12:19:36 Phil Blundell wrote: On Tue, 2013-05-21 at 12:04 +0100, Tomas Frydrych wrote: meta/classes/clutter.bbclass | 23 +++ 1 file changed, 23 insertions(+) create mode 100644 meta/classes/clutter.bbclass Do we really need a new class for this? Can it be merged with gnomebase somehow, perhaps? If clutter really does need its own specialised logic then maybe clutter and cogl should both stay in recipes-graphics/clutter and just share an .inc file. It seems a bit sad to clutter (no pun intended) the global classes directory with this sort of thing. Have to say I agree; given that this set has been merged we could take this as an additional patch if it works for Tomas? The clutter class is used by cogl, clutter and mx (only the version parsing logic in the latter); it is also used by the mutter package in meta-clutter. But if you prefer includes in oecore, that's fine by me. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 3/8] New cogl recipe (1.14.0)
On 21/05/13 11:01, Burton, Ross wrote: On Monday, 20 May 2013, Tomas Frydrych wrote: GL flavour: 'gl' for big GL or 'gles2' for GLES2 (GLES1 is availabe in cogl, but not supporeted here at present.) Does this support enabling both GL and GLES2 in the same build? (at which point the choice of backend becomes someone else's problem, but that's fine) Yes, the PACKAGECONFIG options are additive. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] updates for cogl, clutter and mx v3
Fixes per Ross' comments: * Removed unused/unnecessary configure options * Reworked PACKAGECONFIG for cogl and clutter * Removed unnecessary configure framment's from cogl/clutter/clutter-gst [PATCH v3 1/8] clutter.bbclass: helper class for clutter and friends [PATCH v3 2/8] New cogl recipe (1.14.0) [PATCH v3 3/8] New clutter recipe (1.14.4) [PATCH v3 4/8] fix clutter [PATCH v3 5/8] New clutter-gst recipe (1.6.0) [PATCH v3 6/8] New clutter-gtk recipe (1.4.2) [PATCH v3 7/8] New mx recipe (1.4.7) [PATCH v3 8/8] packagegroup-core-clutter: use clutter-1.0 packages ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 1/8] clutter.bbclass: helper class for clutter and friends
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/classes/clutter.bbclass | 23 +++ 1 file changed, 23 insertions(+) create mode 100644 meta/classes/clutter.bbclass diff --git a/meta/classes/clutter.bbclass b/meta/classes/clutter.bbclass new file mode 100644 index 000..0dc4850 --- /dev/null +++ b/meta/classes/clutter.bbclass @@ -0,0 +1,23 @@ + +def get_minor_dir(v): +import re +m = re.match(^([0-9]+)\.([0-9]+), v) +return %s.%s % (m.group(1), m.group(2)) + +def get_real_name(n): +import re +m = re.match(^([a-z]+(-[a-z]+)?)(-[0-9]+\.[0-9]+)?, n) +return %s % (m.group(1)) + +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)} + +CLUTTER_SRC_FTP = ${GNOME_MIRROR}/${REALNAME}/${VERMINOR}/${REALNAME}-${PV}.tar.xz;name=archive + +CLUTTER_SRC_GIT = git://git.gnome.org/${REALNAME};protocol=git + +SRC_URI = ${CLUTTER_SRC_FTP} +S = ${WORKDIR}/${REALNAME}-${PV} + +inherit autotools pkgconfig gtk-doc gettext -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 2/8] New cogl recipe (1.14.0)
From: Tomas Frydrych to...@sleepfive.com The package has been renamed to cogl-1.0 instead of cogl-vmajor.vminor, keeping up with the upstream versioning policy (e.g., all 1.x packages install cogl-1.0 pc file and headers and are backward compatible), and to simplify dependency management (worth noting that since the 1.x development files are not parallel installable, it is not possible to use two versions of cogl 1.x at the same time anyway). Package configuration is provided via PACKAGECONFIG options as follows: GL flavour: 'gl' for big GL or 'gles2' for GLES2 (GLES1 is availabe in cogl, but not supporeted here at present.) EGL platform: 'egl-null' -- PVR-style null platform 'egl-kms' -- kms platform provide by Mesa 'egl-x11' -- egl over xlib platform (Additional EGL platforms, e.g., Wayland are supported by cogl, but not supported here at present.) GLX: 'glx' for the GLX extension support (implies 'gl') Default configuration is 'glx'; typical configuration providing 'native' egl on embedded HW would be 'gles2 egl-null'. Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/cogl/cogl-1.0.inc | 50 + meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb |7 2 files changed, 57 insertions(+) create mode 100644 meta/recipes-graphics/cogl/cogl-1.0.inc create mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc new file mode 100644 index 000..611d8fc --- /dev/null +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -0,0 +1,50 @@ +DESCRIPTION = a modern 3D graphics API with associated utility APIs +HOMEPAGE = http://wiki.clutter-project.org/wiki/Cogl; +LICENSE = LGPLv2.1+ + +inherit clutter + +DEPENDS = pango glib-2.0 gdk-pixbuf +PACKAGES =+ ${PN}-examples +AUTOTOOLS_AUXDIR = ${S}/build + +# Extra DEPENDS for PACKAGECONFIG +EDEPENDS_GL= virtual/libgl libdrm +EDEPENDS_GLES2 = virtual/libgles2 +EDEPENDS_KMS = libdrm virtual/egl +EDEPENDS_EGL = virtual/egl +EDEPENDS_X11 = virtual/libx11 libxcomposite libxfixes libxi + +# Extra RDEPENDS for PACKAGECONFIG +# This has to be explictly listed, because cogl dlopens the backends +ERDEPENDS_GL= libgl +ERDEPENDS_GLES2 = libgles2 + +EXTRA_OECONF += --disable-introspection \ +--enable-examples-install \ +--enable-debug \ +--disable-gles1\ + + +# GL flavours +PACKAGECONFIG[gl] = --enable-gl,--disable-gl,${EDEPENDS_GL},${ERDEPENDS_GL} +PACKAGECONFIG[gles2] = --enable-gles2,,${EDEPENDS_GLES2}, ${ERDEPENDS_GLES2} + +# egl backends +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-glx,--disable-glx, ${EDEPENDS_X11} + +# Default to 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 +} + +FILES_${PN}-examples = ${bindir}/* ${datadir}/cogl/examples-data/* diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb new file mode 100644 index 000..0f40c59 --- /dev/null +++ b/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb @@ -0,0 +1,7 @@ + +require cogl-1.0.inc + +LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c + +SRC_URI[archive.md5sum] = 7eabaf4241c0b87cc9e3b0fa23fd0315 +SRC_URI[archive.sha256sum] = 276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8 -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 3/8] New clutter recipe (1.14.4)
From: Tomas Frydrych to...@sleepfive.com The package has been renamed to clutter-1.0 instead of clutter-vmajor.vminor, keeping up with the upstream versioning policy (all 1.x packages install clutter-1.0 pc file and headers and are backward compatible), and to simplify dependency management (worth noting that since the 1.x development files are not parall installable, it is not possible to use two versions of clutter 1.x at the same time anyway). Package configuration is provided via PACKAGECONFIG options as follows: 'x11' : enable X11 backend, 'glx' : enable GLX backend, 'egl' : enable EGL backend, 'evdev': enable evdev input backend Default configuration is 'glx'; typical configuration for embedded HW using 'native' EGL would be 'egl evdev'. Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/clutter/clutter-1.0.inc | 56 .../recipes-graphics/clutter/clutter-1.0_1.14.4.bb |7 +++ .../clutter/clutter-1.14/enable_tests.patch| 36 + 3 files changed, 99 insertions(+) create mode 100644 meta/recipes-graphics/clutter/clutter-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb create mode 100644 meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc new file mode 100644 index 000..6710776 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -0,0 +1,56 @@ +DESCRIPTION = Clutter graphics library +HOMEPAGE = http://www.clutter-project.org/; +LICENSE = LGPLv2.1+ + +inherit clutter + +SRC_URI += file://enable_tests.patch + +DEPENDS = gtk-doc-native pango glib-2.0 json-glib atk udev cogl-1.0 +PACKAGES =+ ${PN}-examples +AUTOTOOLS_AUXDIR = ${S}/build + +EDEPENDS_X11 = virtual/libx11 libxi libxfixes +EDEPENDS_GLX = virtual/libgl +EDEPENDS_EGL = virtual/egl + +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 \ +--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} + +# Default configuration, distros might want to override +PACKAGECONFIG ??= glx + +FILES_${PN}-examples = ${bindir}/test-* ${pkgdatadir}/redhand.png + +do_configure_prepend() { +# Fix up some weirdness in the docs +sed -i s:doc/reference/Makefile::g ${S}/configure.ac +sed -i s:doc::g ${S}/Makefile.am + + # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this + touch -t 2101 po/clutter-1.0.pot + + # Disable DOLT + sed -i -e 's/^DOLT//' ${S}/configure.ac +} diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb new file mode 100644 index 000..35824c6 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb @@ -0,0 +1,7 @@ + +require clutter-1.0.inc + +LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c + +SRC_URI[archive.md5sum] = c072e4c27e69368f2b877ea4f6da2cdf +SRC_URI[archive.sha256sum] = c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c diff --git a/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch new file mode 100644 index 000..f97d598 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch @@ -0,0 +1,36 @@ +Make tests installable + +The test applications are useful for image testing. + +Imported from clutter 1.8 package, git://git.openembedded.org/openembedded, +commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated patch header. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Tomas Frydrych to...@sleepfive.com + +Index: git/tests/interactive/Makefile.am +=== +--- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.0 + git/tests/interactive/Makefile.am 2009-11-30 17:42:30.0 + +@@ -88,7 +88,7 @@ + + common_ldadd
[OE-core] [PATCH v3 4/8] fix clutter
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@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..9b4b169 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -17,29 +17,24 @@ EDEPENDS_EGL = virtual/egl 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 \ +# Disable backends we do not currently support building +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 2101 po/clutter-1.0.pot - - # Disable DOLT - sed -i -e 's/^DOLT//' ${S}/configure.ac } -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 5/8] New clutter-gst recipe (1.6.0)
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/clutter/clutter-gst-1.0.inc | 19 .../clutter/clutter-gst-1.0_1.6.0.bb |9 .../clutter/clutter-gst-1.6/cogl-1.14.patch| 48 .../clutter/clutter-gst/enable-tests.patch | 23 ++ 4 files changed, 99 insertions(+) create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0.inc b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc new file mode 100644 index 000..eebfd09 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc @@ -0,0 +1,19 @@ +DESCRIPTION = Clutter GStreamer +HOMEPAGE = http://www.clutter-project.org/; +LICENSE = LGPLv2+ + +inherit clutter + +SRC_URI += file://enable-tests.patch + +DEPENDS = gst-plugins-base gst-plugins-bad clutter-1.0 +RDEPENDS_${PN} += gst-meta-base +PACKAGES =+ ${PN}-examples + +EXTRA_OECONF += --disable-introspection + +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 + diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb b/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb new file mode 100644 index 000..dc5cc13 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb @@ -0,0 +1,9 @@ +require clutter-gst-1.0.inc + +SRC_URI += file://cogl-1.14.patch + +LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4 + +SRC_URI[archive.md5sum] = d60ab0118730cecd5dd9988ad7da034b +SRC_URI[archive.sha256sum] = abc879cdd562f1640a825131405f4327a427bfe65b805ebc25d0c78909c8c622 diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch b/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch new file mode 100644 index 000..a46b448 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch @@ -0,0 +1,48 @@ +From 1ae4c3e7b1e2c33892590f9ac7bf0e892a5bcbd5 Mon Sep 17 00:00:00 2001 +From: Tomas Frydrych to...@sleepfive.com +Date: Thu, 11 Oct 2012 08:53:03 +0100 +Subject: [PATCH] ClutterGstVideoSink: fix includes so we can build against + cogl-1.14 + +Cogl 1.14 exposes various GL types through the public API but it does not +pull in the GL type definitions through its public headers; specifically +compilation will fail due to undefined GL_TEXTURE_2D. So include the headers +the hard way. + +Upstream-status: Submitted @ https://bugzilla.gnome.org/show_bug.cgi?id=700509 +Signed-off-by: Tomas Frydrych to...@sleepfive.com +--- + clutter-gst/clutter-gst-video-sink.c | 17 + + 1 file changed, 17 insertions(+) + +diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c +index 9b4b53c..f092581 100644 +--- a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c +@@ -42,6 +42,23 @@ + #include config.h + #endif + ++/* ++ * cogl-1.14 exposes generic GL types in the API, but not the actual includes. ++ */ ++#include cogl/cogl.h ++ ++#ifdef COGL_HAS_GLES1 ++#include GLES/gl.h ++#include GLES/glext.h ++#elif COGL_HAS_GLES2 ++#include GLES2/gl2.h ++#include GLES2/gl2ext.h ++#elif COGL_HAS_GL ++#include GL/gl.h ++#else ++#error Unknown cogl configuration ++#endif ++ + #include clutter-gst-video-sink.h + #include clutter-gst-util.h + #include clutter-gst-private.h +-- +1.7.10.4 + diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch b/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch new file mode 100644 index 000..b3aec39 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch @@ -0,0 +1,23 @@ +Install example binary needed for core-image-clutter + +Signed-off-by: Zhai Edwin edwin.z...@intel.com + +Upstream-Status: Inappropriate [configuration] + +Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded, +commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 1.6 + +Signed-off-by: Tomas Frydrych to...@sleepfive.com + +Index: git/examples/Makefile.am +=== +--- git.orig/examples/Makefile.am 2011-01-31 10:14:23.0 +0800 git/examples/Makefile.am 2011-01-31 10:14:34.0 +0800 +@@ -1,6 +1,6 @@ + NULL = # + +-noinst_PROGRAMS = video-player video-sink video-sink-navigation ++bin_PROGRAMS = video-player video-sink video-sink
[OE-core] [PATCH v3 6/8] New clutter-gtk recipe (1.4.2)
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/clutter/clutter-gtk-1.0.inc | 12 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb |6 ++ 2 files changed, 18 insertions(+) create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc new file mode 100644 index 000..3717f48 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc @@ -0,0 +1,12 @@ +DESCRIPTION = ClutterGtk +HOMEPAGE = http://www.clutter-project.org/; +LICENSE = LGPLv2+ + +inherit clutter + +DEPENDS = clutter-1.0 gtk+3 +PACKAGES =+ ${PN}-examples +AUTOTOOLS_AUXDIR = ${S}/build + +EXTRA_OECONF += --disable-introspection + diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb new file mode 100644 index 000..64eb70c --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb @@ -0,0 +1,6 @@ +require clutter-gtk-1.0.inc + +LIC_FILES_CHKSUM = file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 + +SRC_URI[archive.md5sum] = 842601b584daf4447a46799a4ba88df6 +SRC_URI[archive.sha256sum] = dc3ec6e90bc742c8a68ed7fa4c0d25b9b376828f1a7f013c363fbaf14f3a6974 -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 7/8] New mx recipe (1.4.7)
From: Tomas Frydrych to...@sleepfive.com The package has been renamed to mx-1.0, keeping up with the upstream versioning policy. The 1.14.7 tag does not build with clutter 1.14, so git revision 9b1db6b8060bd00b121a692f942404a24ae2960f from the 1.14 branch is used instead. Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/mx/mx-1.0_1.4.7.bb | 14 ++ .../recipes-graphics/mx/mx-1.4/fix-build-dir.patch | 46 meta/recipes-graphics/mx/mx.inc| 21 + .../recipes-graphics/mx/mx/fix-test-includes.patch | 20 + meta/recipes-graphics/mx/mx_1.4.7.bb | 18 5 files changed, 101 insertions(+), 18 deletions(-) create mode 100644 meta/recipes-graphics/mx/mx-1.0_1.4.7.bb create mode 100644 meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch create mode 100644 meta/recipes-graphics/mx/mx.inc create mode 100644 meta/recipes-graphics/mx/mx/fix-test-includes.patch delete mode 100644 meta/recipes-graphics/mx/mx_1.4.7.bb diff --git a/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb new file mode 100644 index 000..4c4c8eb --- /dev/null +++ b/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb @@ -0,0 +1,14 @@ +require mx.inc + +# The 1.4.7 tag does not build against cogl 1.14, pull in a revision with a fix +SRCREV = 9b1db6b8060bd00b121a692f942404a24ae2960f +PV = 1.4.7+git${SRCPV} + +SRC_URI = git://github.com/clutter-project/mx.git;protocol=git \ + file://fix-build-dir.patch \ + file://fix-test-includes.patch \ + +S = ${WORKDIR}/git + +LIC_FILES_CHKSUM = file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \ + file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879 diff --git a/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch b/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch new file mode 100644 index 000..e7481e9 --- /dev/null +++ b/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch @@ -0,0 +1,46 @@ +Fix build for S != B + +This patch is specific to version 1.4.x +Upstream-status: Submitted @ https://github.com/clutter-project/mx/issues/81 +Signed-off-by: Tomas Frydrych to...@sleepfive.com +-- +Index: git/docs/reference/libmx-gtk/Makefile.am +=== +--- git.orig/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:07:02.027154788 +0100 git/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:14:33.684318650 +0100 +@@ -1,3 +1,6 @@ ++EXTRA_DIST= ++CLEANFILES= ++ + ## Process this file with automake to produce Makefile.in + + # We require automake 1.6 at least. +@@ -77,7 +80,7 @@ + GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la + + # This includes the standard gtk-doc make rules, copied by gtkdocize. +-include $(top_srcdir)/gtk-doc.make ++include $(top_builddir)/gtk-doc.make + + # Other files to distribute + EXTRA_DIST += version.xml.in +Index: git/docs/reference/libmx/Makefile.am +=== +--- git.orig/docs/reference/libmx/Makefile.am 2013-05-08 15:07:02.027154788 +0100 git/docs/reference/libmx/Makefile.am 2013-05-08 15:14:24.456378135 +0100 +@@ -1,3 +1,6 @@ ++EXTRA_DIST= ++CLEANFILES= ++ + ## Process this file with automake to produce Makefile.in + + # We require automake 1.6 at least. +@@ -106,7 +109,7 @@ + GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx/libmx-$(MX_API_VERSION).la + + # This includes the standard gtk-doc make rules, copied by gtkdocize. +-include $(top_srcdir)/gtk-doc.make ++include $(top_builddir)/gtk-doc.make + + # Other files to distribute + EXTRA_DIST += version.xml.in diff --git a/meta/recipes-graphics/mx/mx.inc b/meta/recipes-graphics/mx/mx.inc new file mode 100644 index 000..e3b4b15 --- /dev/null +++ b/meta/recipes-graphics/mx/mx.inc @@ -0,0 +1,21 @@ +DESCRIPTION = Clutter based widget library +LICENSE = LGPLv2.1 + +inherit clutter + +DEPENDS = clutter-1.0 dbus-glib gdk-pixbuf + +SRC_URI = http://source.clutter-project.org/sources/mx/${@get_verdir(${PV})}/mx-${PV}.tar.xz + +EXTRA_OECONF = --disable-introspection\ + --disable-gtk-doc \ + --disable-gtk-widgets \ + --with-dbus \ + --with-winsys=none \ + --without-clutter-imcontext \ + --without-clutter-gesture \ + --without-startup-notification \ + --without-glade \ + + +FILES_${PN} += ${datadir} diff --git a/meta/recipes-graphics/mx/mx/fix-test-includes.patch b/meta/recipes-graphics/mx/mx/fix-test-includes.patch new file mode 100644 index 000..c6496a9 --- /dev/null +++ b/meta/recipes-graphics/mx/mx/fix-test-includes.patch @@ -0,0 +1,20 @@ +Fix missing include directory when building tests + +This patch
[OE-core] [PATCH v3 8/8] packagegroup-core-clutter: use clutter-1.0 packages
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- .../packagegroups/packagegroup-core-clutter.bb |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb index 7b1cedc..cb2aba0 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb @@ -5,7 +5,7 @@ SUMMARY = Clutter package groups LICENSE = MIT -PR = r5 +PR = r6 inherit packagegroup @@ -20,7 +20,7 @@ RCONFLICTS_${PN}-core = task-core-clutter-core SUMMARY_${PN}-core = Clutter graphics library RDEPENDS_${PN}-core = \ -clutter-1.8 \ -clutter-gst-1.8 \ -clutter-gtk-1.8 \ +clutter-1.0 \ +clutter-gst-1.0 \ +clutter-gtk-1.0 \ -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3 4/8] fix clutter
On 21/05/13 12:20, Phil Blundell wrote: On Tue, 2013-05-21 at 12:04 +0100, Tomas Frydrych wrote: -# 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 \ +# Disable backends we do not currently support building +EXTRA_OECONF += --disable-introspection\ Was this supposed to have been squashed with 3/8? Yes, sorry :( I think Richard already pushed the previous version as well. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] further colg/clutter improvements and fixes
These patches take on board Ross feedback on the previous patch set, removing unnecessary gtk-doc bits from the receipes, as well as the configure fragments related to DOLT. Also, more of the configure parameters have been moved into the PACKAGECONFIG definitions. While modifying the PACKAGECONFIG, I noticed a typo in the cogl recipe that effected the RDEPENDS setup for the 'gl' option, and also a missing comma in the 'glx' setup for clutter, so these are fixed as well. [PATCH 1/4] clutter.bbclass: removed unused function [PATCH 2/4] cogl: further improvements [PATCH 3/4] clutter: further improvements [PATCH 4/4] clutter-gst: removed no longer required configure ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/4] clutter.bbclass: removed unused function
From: Tomas Frydrych to...@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 to...@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 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/4] cogl: further improvements
From: Tomas Frydrych to...@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 to...@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 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/4] clutter: further improvements
From: Tomas Frydrych to...@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 to...@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 2101 po/clutter-1.0.pot - - # Disable DOLT - sed -i -e 's/^DOLT//' ${S}/configure.ac } -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/4] clutter-gst: removed no longer required configure fragment
From: Tomas Frydrych to...@sleepfive.com The current package no longer use DOLT, so the DOLT configure frament is no longer required. Signed-off-by: Tomas Frydrych to...@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 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] updates for cogl, clutter and mx
There are some issues with this patch set, some of the included patches either do not have Upstream-Status or Signed-off-by tags, please review that. Updated the various patch headers in v.2. Also, I want to confirm that these are all new recipes and will not cause backward PRs (ie do you need PE bumps to these)? I renamed the mx recipe also to mx-1.0 for consistency, so yes, these are all different packages now. Finally, I think you need to update the packagegroup-core-clutter recipe. Done. Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/8] clutter.bbclass: helper class for clutter and friends
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/classes/clutter.bbclass | 28 1 file changed, 28 insertions(+) create mode 100644 meta/classes/clutter.bbclass diff --git a/meta/classes/clutter.bbclass b/meta/classes/clutter.bbclass new file mode 100644 index 000..184fb44 --- /dev/null +++ b/meta/classes/clutter.bbclass @@ -0,0 +1,28 @@ + +def get_minor_dir(v): +import re +m = re.match(^([0-9]+)\.([0-9]+), v) +return %s.%s % (m.group(1), m.group(2)) + +def get_real_name(n): +import re +m = re.match(^([a-z]+(-[a-z]+)?)(-[0-9]+\.[0-9]+)?, n) +return %s % (m.group(1)) + +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 + +SRC_URI = ${CLUTTER_SRC_FTP} +S = ${WORKDIR}/${REALNAME}-${PV} + +inherit autotools pkgconfig gtk-doc gettext -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 1/8] Remove old clutter recipes
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 23 --- meta/recipes-graphics/clutter/clutter-1.8_git.bb | 20 -- meta/recipes-graphics/clutter/clutter-fpu.inc |6 -- .../clutter/clutter-gst-1.8_1.4.6.bb | 22 --- meta/recipes-graphics/clutter/clutter-gst.inc | 13 .../clutter/clutter-gst/enable_tests-1.4.patch | 18 -- .../clutter/clutter-gst/enable_tests-1.8.patch | 17 - .../clutter/clutter-gst/enable_tests.patch | 18 -- .../clutter/clutter-gtk-1.8_0.11.4.bb | 11 meta/recipes-graphics/clutter/clutter-gtk.inc | 14 .../clutter/clutter-gtk/disable_deprecated.patch | 21 -- .../clutter/clutter-gtk/enable_tests.patch | 18 -- meta/recipes-graphics/clutter/clutter-package.inc |2 - meta/recipes-graphics/clutter/clutter.inc | 23 --- .../clutter/clutter/build-fix.patch| 18 -- .../clutter/clutter/enable_tests-0.6.patch | 42 .../clutter/clutter/enable_tests-0.8.patch | 52 --- .../clutter/clutter/enable_tests-1.0.patch | 34 -- .../clutter/clutter/enable_tests-1.4.patch | 15 - ...-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch | 34 -- .../clutter/clutter/enable_tests.patch | 34 -- .../clutter/clutter/symconflict.patch | 33 -- .../clutter/clutter/test-conformance-fix.patch | 68 .../clutter/update_gettext_macro_version.patch | 32 - meta/recipes-graphics/clutter/cogl.inc | 22 --- .../clutter/cogl/build_for_armv4t.patch| 23 --- .../clutter/cogl/macro-versions.patch | 28 meta/recipes-graphics/clutter/cogl_1.8.2.bb| 12 meta/recipes-graphics/clutter/cogl_git.bb | 16 - 29 files changed, 689 deletions(-) delete mode 100644 meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-1.8_git.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-fpu.inc delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.6.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-gst.inc delete mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk.inc delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-package.inc delete mode 100644 meta/recipes-graphics/clutter/clutter.inc delete mode 100644 meta/recipes-graphics/clutter/clutter/build-fix.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/symconflict.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch delete mode 100644 meta/recipes-graphics/clutter/cogl.inc delete mode 100644 meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch delete mode 100644 meta/recipes-graphics/clutter/cogl/macro-versions.patch delete mode 100644 meta/recipes-graphics/clutter/cogl_1.8.2.bb delete mode 100644 meta/recipes-graphics/clutter/cogl_git.bb diff --git a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb b/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb deleted file mode 100644 index aceef96..000 --- a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb +++ /dev/null @@ -1,23 +0,0 @@ -require recipes-graphics/clutter/clutter.inc -require recipes-graphics/clutter/clutter-package.inc - -PR = r2 - -# We're API/ABI compatible and this may make things easier for layers -PROVIDES += clutter-1.6 - -PACKAGES =+ ${PN}-examples -FILES_${PN}-examples = ${bindir}/test-* ${pkgdatadir}/redhand.png - -SRC_URI = http://source.clutter-project.org/sources/clutter/1.8/clutter-${PV}.tar.bz2 \ - file://enable_tests
[OE-core] [PATCH v2 3/8] New cogl recipe (1.14.0)
From: Tomas Frydrych to...@sleepfive.com The package has been renamed to cogl-1.0 instead of cogl-vmajor.vminor, keeping up with the upstream versioning policy (e.g., all 1.x packages install cogl-1.0 pc file and headers and are backward compatible), and to simplify dependency management (worth noting that since the 1.x development files are not parallel installable, it is not possible to use two versions of cogl 1.x at the same time anyway). Package configuration is provided via PACKAGECONFIG options as follows: GL flavour: 'gl' for big GL or 'gles2' for GLES2 (GLES1 is availabe in cogl, but not supporeted here at present.) EGL platform: 'egl-null' -- PVR-style null platform 'egl-kms' -- kms platform provide by Mesa 'egl-x11' -- egl over xlib platform (Additional EGL platforms, e.g., Wayland are supported by cogl, but not supported here at present.) GLX: 'glx' for the GLX extension support (implies 'gl') Default configuration is 'glx'; typical configuration providing 'native' egl on embedded HW would be 'gles2 egl-null'. Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/cogl/cogl-1.0.inc | 58 + meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb |7 +++ 2 files changed, 65 insertions(+) create mode 100644 meta/recipes-graphics/cogl/cogl-1.0.inc create mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc new file mode 100644 index 000..17d8629 --- /dev/null +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -0,0 +1,58 @@ +DESCRIPTION = a modern 3D graphics API with associated utility APIs +HOMEPAGE = http://wiki.clutter-project.org/wiki/Cogl; +LICENSE = LGPLv2.1+ + +inherit clutter + +DEPENDS = gtk-doc-native pango glib-2.0 gdk-pixbuf +PACKAGES =+ ${PN}-examples +AUTOTOOLS_AUXDIR = ${S}/build + +# Extra DEPENDS for PACKAGECONFIG +EDEPENDS_GL= virtual/libgl libdrm +EDEPENDS_GLES2 = virtual/libgles2 +EDEPENDS_KMS = libdrm virtual/egl +EDEPENDS_EGL = virtual/egl +EDEPENDS_X11 = virtual/libx11 libxcomposite libxfixes libxi + +# Extra RDEPENDS for PACKAGECONFIG +# This has to be explictly listed, because cogl dlopens the backends +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} + +# 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} + +# glx +PACKAGECONFIG[glx] = --enable-gl --enable-glx, ${EDEPENDS_GL} ${EDEPENDS_X11} + +# Default to GLX +PACKAGECONFIG ??= 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/* diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb new file mode 100644 index 000..0f40c59 --- /dev/null +++ b/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb @@ -0,0 +1,7 @@ + +require cogl-1.0.inc + +LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c + +SRC_URI[archive.md5sum] = 7eabaf4241c0b87cc9e3b0fa23fd0315 +SRC_URI[archive.sha256sum] = 276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8 -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 4/8] New clutter recipe (1.14.4)
From: Tomas Frydrych to...@sleepfive.com The package has been renamed to clutter-1.0 instead of clutter-vmajor.vminor, keeping up with the upstream versioning policy (all 1.x packages install clutter-1.0 pc file and headers and are backward compatible), and to simplify dependency management (worth noting that since the 1.x development files are not parall installable, it is not possible to use two versions of clutter 1.x at the same time anyway). Package configuration is provided via PACKAGECONFIG options as follows: 'x11' : enable X11 backend, 'glx' : enable GLX backend, 'egl' : enable EGL backend, 'evdev': enable evdev input backend Default configuration is 'glx'; typical configuration for embedded HW using 'native' EGL would be 'egl evdev'. Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/clutter/clutter-1.0.inc | 56 .../recipes-graphics/clutter/clutter-1.0_1.14.4.bb |7 +++ .../clutter/clutter-1.14/enable_tests.patch| 36 + 3 files changed, 99 insertions(+) create mode 100644 meta/recipes-graphics/clutter/clutter-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb create mode 100644 meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc new file mode 100644 index 000..6710776 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -0,0 +1,56 @@ +DESCRIPTION = Clutter graphics library +HOMEPAGE = http://www.clutter-project.org/; +LICENSE = LGPLv2.1+ + +inherit clutter + +SRC_URI += file://enable_tests.patch + +DEPENDS = gtk-doc-native pango glib-2.0 json-glib atk udev cogl-1.0 +PACKAGES =+ ${PN}-examples +AUTOTOOLS_AUXDIR = ${S}/build + +EDEPENDS_X11 = virtual/libx11 libxi libxfixes +EDEPENDS_GLX = virtual/libgl +EDEPENDS_EGL = virtual/egl + +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 \ +--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} + +# Default configuration, distros might want to override +PACKAGECONFIG ??= glx + +FILES_${PN}-examples = ${bindir}/test-* ${pkgdatadir}/redhand.png + +do_configure_prepend() { +# Fix up some weirdness in the docs +sed -i s:doc/reference/Makefile::g ${S}/configure.ac +sed -i s:doc::g ${S}/Makefile.am + + # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this + touch -t 2101 po/clutter-1.0.pot + + # Disable DOLT + sed -i -e 's/^DOLT//' ${S}/configure.ac +} diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb new file mode 100644 index 000..35824c6 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb @@ -0,0 +1,7 @@ + +require clutter-1.0.inc + +LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c + +SRC_URI[archive.md5sum] = c072e4c27e69368f2b877ea4f6da2cdf +SRC_URI[archive.sha256sum] = c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c diff --git a/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch new file mode 100644 index 000..f97d598 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch @@ -0,0 +1,36 @@ +Make tests installable + +The test applications are useful for image testing. + +Imported from clutter 1.8 package, git://git.openembedded.org/openembedded, +commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated patch header. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Tomas Frydrych to...@sleepfive.com + +Index: git/tests/interactive/Makefile.am +=== +--- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.0 + git/tests/interactive/Makefile.am 2009-11-30 17:42:30.0 + +@@ -88,7 +88,7 @@ + + common_ldadd
[OE-core] [PATCH v2 6/8] New clutter-gtk recipe (1.4.2)
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/clutter/clutter-gtk-1.0.inc | 12 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb |6 ++ 2 files changed, 18 insertions(+) create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc new file mode 100644 index 000..3717f48 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc @@ -0,0 +1,12 @@ +DESCRIPTION = ClutterGtk +HOMEPAGE = http://www.clutter-project.org/; +LICENSE = LGPLv2+ + +inherit clutter + +DEPENDS = clutter-1.0 gtk+3 +PACKAGES =+ ${PN}-examples +AUTOTOOLS_AUXDIR = ${S}/build + +EXTRA_OECONF += --disable-introspection + diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb new file mode 100644 index 000..64eb70c --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb @@ -0,0 +1,6 @@ +require clutter-gtk-1.0.inc + +LIC_FILES_CHKSUM = file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 + +SRC_URI[archive.md5sum] = 842601b584daf4447a46799a4ba88df6 +SRC_URI[archive.sha256sum] = dc3ec6e90bc742c8a68ed7fa4c0d25b9b376828f1a7f013c363fbaf14f3a6974 -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 8/8] packagegroup-core-clutter: use clutter-1.0 packages
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- .../packagegroups/packagegroup-core-clutter.bb |8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb index 7b1cedc..cb2aba0 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb @@ -5,7 +5,7 @@ SUMMARY = Clutter package groups LICENSE = MIT -PR = r5 +PR = r6 inherit packagegroup @@ -20,7 +20,7 @@ RCONFLICTS_${PN}-core = task-core-clutter-core SUMMARY_${PN}-core = Clutter graphics library RDEPENDS_${PN}-core = \ -clutter-1.8 \ -clutter-gst-1.8 \ -clutter-gtk-1.8 \ +clutter-1.0 \ +clutter-gst-1.0 \ +clutter-gtk-1.0 \ -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 5/8] New clutter-gst recipe (1.6.0)
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/clutter/clutter-gst-1.0.inc | 23 ++ .../clutter/clutter-gst-1.0_1.6.0.bb |9 .../clutter/clutter-gst-1.6/cogl-1.14.patch| 48 .../clutter/clutter-gst/enable-tests.patch | 23 ++ 4 files changed, 103 insertions(+) create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0.inc b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc new file mode 100644 index 000..f79795c --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc @@ -0,0 +1,23 @@ +DESCRIPTION = Clutter GStreamer +HOMEPAGE = http://www.clutter-project.org/; +LICENSE = LGPLv2+ + +inherit clutter + +SRC_URI += file://enable-tests.patch + +DEPENDS = gst-plugins-base gst-plugins-bad clutter-1.0 +RDEPENDS_${PN} += gst-meta-base +PACKAGES =+ ${PN}-examples + +EXTRA_OECONF += --disable-introspection + +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 +} diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb b/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb new file mode 100644 index 000..dc5cc13 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb @@ -0,0 +1,9 @@ +require clutter-gst-1.0.inc + +SRC_URI += file://cogl-1.14.patch + +LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4 + +SRC_URI[archive.md5sum] = d60ab0118730cecd5dd9988ad7da034b +SRC_URI[archive.sha256sum] = abc879cdd562f1640a825131405f4327a427bfe65b805ebc25d0c78909c8c622 diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch b/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch new file mode 100644 index 000..a46b448 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch @@ -0,0 +1,48 @@ +From 1ae4c3e7b1e2c33892590f9ac7bf0e892a5bcbd5 Mon Sep 17 00:00:00 2001 +From: Tomas Frydrych to...@sleepfive.com +Date: Thu, 11 Oct 2012 08:53:03 +0100 +Subject: [PATCH] ClutterGstVideoSink: fix includes so we can build against + cogl-1.14 + +Cogl 1.14 exposes various GL types through the public API but it does not +pull in the GL type definitions through its public headers; specifically +compilation will fail due to undefined GL_TEXTURE_2D. So include the headers +the hard way. + +Upstream-status: Submitted @ https://bugzilla.gnome.org/show_bug.cgi?id=700509 +Signed-off-by: Tomas Frydrych to...@sleepfive.com +--- + clutter-gst/clutter-gst-video-sink.c | 17 + + 1 file changed, 17 insertions(+) + +diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c +index 9b4b53c..f092581 100644 +--- a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c +@@ -42,6 +42,23 @@ + #include config.h + #endif + ++/* ++ * cogl-1.14 exposes generic GL types in the API, but not the actual includes. ++ */ ++#include cogl/cogl.h ++ ++#ifdef COGL_HAS_GLES1 ++#include GLES/gl.h ++#include GLES/glext.h ++#elif COGL_HAS_GLES2 ++#include GLES2/gl2.h ++#include GLES2/gl2ext.h ++#elif COGL_HAS_GL ++#include GL/gl.h ++#else ++#error Unknown cogl configuration ++#endif ++ + #include clutter-gst-video-sink.h + #include clutter-gst-util.h + #include clutter-gst-private.h +-- +1.7.10.4 + diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch b/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch new file mode 100644 index 000..b3aec39 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch @@ -0,0 +1,23 @@ +Install example binary needed for core-image-clutter + +Signed-off-by: Zhai Edwin edwin.z...@intel.com + +Upstream-Status: Inappropriate [configuration] + +Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded, +commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 1.6 + +Signed-off-by: Tomas Frydrych to...@sleepfive.com + +Index: git/examples/Makefile.am +=== +--- git.orig/examples/Makefile.am 2011-01-31 10:14:23.0 +0800 git/examples/Makefile.am 2011-01-31 10:14:34.0 +0800 +@@ -1,6 +1,6 @@ + NULL
[OE-core] [PATCH 2/7] clutter.bbclass: helper class for clutter and friends
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/classes/clutter.bbclass | 28 1 file changed, 28 insertions(+) create mode 100644 meta/classes/clutter.bbclass diff --git a/meta/classes/clutter.bbclass b/meta/classes/clutter.bbclass new file mode 100644 index 000..184fb44 --- /dev/null +++ b/meta/classes/clutter.bbclass @@ -0,0 +1,28 @@ + +def get_minor_dir(v): +import re +m = re.match(^([0-9]+)\.([0-9]+), v) +return %s.%s % (m.group(1), m.group(2)) + +def get_real_name(n): +import re +m = re.match(^([a-z]+(-[a-z]+)?)(-[0-9]+\.[0-9]+)?, n) +return %s % (m.group(1)) + +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 + +SRC_URI = ${CLUTTER_SRC_FTP} +S = ${WORKDIR}/${REALNAME}-${PV} + +inherit autotools pkgconfig gtk-doc gettext -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] updates for cogl, clutter and mx
The following set of patches updates clutter and friends; the recipes were completely reworked and use PACKAGECONFIG to facilitate easy reconfiguration to match distro / machine needs. Clutter and Cogl packages are renamed to use a '-1.0' suffix instead of the '-vmajor.vminor' suffix of the old recipes, in keeping up with the upstream versioning policy, and to simplify dependency maintenance (note that dev files for the 1.x series are not parallel installable anyway); the '-1.0' suffix is with a view toward the '2.0' series which are on the horizon. The Cogl recipe is moved into a subdirectory of its own, this seemed appropriate as Cogl is now a seprate project in its own right. The new versions are: cogl 1.4.0, clutter 1.14.4, clutter-gst 1.6.0, clutter-gtk 1.4.2. The mx recipe is fixed up to build against the updated cogl and clutter. [PATCH 1/7] Remove old clutter recipes [PATCH 2/7] clutter.bbclass: helper class for clutter and friends [PATCH 3/7] New cogl recipe (1.14.0) [PATCH 4/7] New clutter recipe (1.14.4) [PATCH 5/7] New clutter gst recipe (1.6.0) [PATCH 6/7] New clutter-gtk recipe (1.4.2) [PATCH 7/7] Update mx recipe to build with clutter 1.14.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/7] New clutter recipe (1.14.4)
From: Tomas Frydrych to...@sleepfive.com The package has been renamed to clutter-1.0 instead of clutter-vmajor.vminor, keeping up with the upstream versioning policy (all 1.x packages install clutter-1.0 pc file and headers and are backward compatible), and to simplify dependency management (worth noting that since the 1.x development files are not parall installable, it is not possible to use two versions of clutter 1.x at the same time anyway). Package configuration is provided via PACKAGECONFIG options as follows: 'x11' : enable X11 backend, 'glx' : enable GLX backend, 'egl' : enable EGL backend, 'evdev': enable evdev input backend Default configuration is 'glx'; typical configuration for embedded HW using 'native' EGL would be 'egl evdev'. Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/clutter/clutter-1.0.inc | 56 .../recipes-graphics/clutter/clutter-1.0_1.14.4.bb |7 +++ .../clutter/clutter-1.14/enable_tests.patch| 34 3 files changed, 97 insertions(+) create mode 100644 meta/recipes-graphics/clutter/clutter-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb create mode 100644 meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc new file mode 100644 index 000..6710776 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -0,0 +1,56 @@ +DESCRIPTION = Clutter graphics library +HOMEPAGE = http://www.clutter-project.org/; +LICENSE = LGPLv2.1+ + +inherit clutter + +SRC_URI += file://enable_tests.patch + +DEPENDS = gtk-doc-native pango glib-2.0 json-glib atk udev cogl-1.0 +PACKAGES =+ ${PN}-examples +AUTOTOOLS_AUXDIR = ${S}/build + +EDEPENDS_X11 = virtual/libx11 libxi libxfixes +EDEPENDS_GLX = virtual/libgl +EDEPENDS_EGL = virtual/egl + +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 \ +--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} + +# Default configuration, distros might want to override +PACKAGECONFIG ??= glx + +FILES_${PN}-examples = ${bindir}/test-* ${pkgdatadir}/redhand.png + +do_configure_prepend() { +# Fix up some weirdness in the docs +sed -i s:doc/reference/Makefile::g ${S}/configure.ac +sed -i s:doc::g ${S}/Makefile.am + + # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this + touch -t 2101 po/clutter-1.0.pot + + # Disable DOLT + sed -i -e 's/^DOLT//' ${S}/configure.ac +} diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb new file mode 100644 index 000..35824c6 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0_1.14.4.bb @@ -0,0 +1,7 @@ + +require clutter-1.0.inc + +LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c + +SRC_URI[archive.md5sum] = c072e4c27e69368f2b877ea4f6da2cdf +SRC_URI[archive.sha256sum] = c996d91fff6fff24d9e23dcd545439ebc6b999fb1cf9ee44c28ca54c49c0ee1c diff --git a/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch b/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch new file mode 100644 index 000..480b208 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.14/enable_tests.patch @@ -0,0 +1,34 @@ +--- + tests/Makefile.am |7 ++- + tests/test-actors.c |2 +- + tests/test-text.c |2 +- + 3 files changed, 8 insertions(+), 3 deletions(-) + +Upstream-Status: Inappropriate [configuration] + +Index: git/tests/interactive/Makefile.am +=== +--- git.orig/tests/interactive/Makefile.am 2009-11-30 17:39:46.0 + git/tests/interactive/Makefile.am 2009-11-30 17:42:30.0 + +@@ -88,7 +88,7 @@ + + common_ldadd = $(top_builddir)/clutter/libclutter-@CLUTTER_WINSYS@-@CLUTTER_API_VERSION@.la + +-noinst_PROGRAMS = test-interactive ++bin_PROGRAMS
[OE-core] [PATCH 3/7] New cogl recipe (1.14.0)
From: Tomas Frydrych to...@sleepfive.com The package has been renamed to cogl-1.0 instead of cogl-vmajor.vminor, keeping up with the upstream versioning policy (e.g., all 1.x packages install cogl-1.0 pc file and headers and are backward compatible), and to simplify dependency management (worth noting that since the 1.x development files are not parallel installable, it is not possible to use two versions of cogl 1.x at the same time anyway). Package configuration is provided via PACKAGECONFIG options as follows: GL flavour: 'gl' for big GL or 'gles2' for GLES2 (GLES1 is availabe in cogl, but not supporeted here at present.) EGL platform: 'egl-null' -- PVR-style null platform 'egl-kms' -- kms platform provide by Mesa 'egl-x11' -- egl over xlib platform (Additional EGL platforms, e.g., Wayland are supported by cogl, but not supported here at present.) GLX: 'glx' for the GLX extension support (implies 'gl') Default configuration is 'glx'; typical configuration providing 'native' egl on embedded HW would be 'gles2 egl-null'. Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/cogl/cogl-1.0.inc | 58 + meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb |7 +++ 2 files changed, 65 insertions(+) create mode 100644 meta/recipes-graphics/cogl/cogl-1.0.inc create mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc new file mode 100644 index 000..17d8629 --- /dev/null +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -0,0 +1,58 @@ +DESCRIPTION = a modern 3D graphics API with associated utility APIs +HOMEPAGE = http://wiki.clutter-project.org/wiki/Cogl; +LICENSE = LGPLv2.1+ + +inherit clutter + +DEPENDS = gtk-doc-native pango glib-2.0 gdk-pixbuf +PACKAGES =+ ${PN}-examples +AUTOTOOLS_AUXDIR = ${S}/build + +# Extra DEPENDS for PACKAGECONFIG +EDEPENDS_GL= virtual/libgl libdrm +EDEPENDS_GLES2 = virtual/libgles2 +EDEPENDS_KMS = libdrm virtual/egl +EDEPENDS_EGL = virtual/egl +EDEPENDS_X11 = virtual/libx11 libxcomposite libxfixes libxi + +# Extra RDEPENDS for PACKAGECONFIG +# This has to be explictly listed, because cogl dlopens the backends +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} + +# 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} + +# glx +PACKAGECONFIG[glx] = --enable-gl --enable-glx, ${EDEPENDS_GL} ${EDEPENDS_X11} + +# Default to GLX +PACKAGECONFIG ??= 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/* diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb new file mode 100644 index 000..0f40c59 --- /dev/null +++ b/meta/recipes-graphics/cogl/cogl-1.0_1.14.0.bb @@ -0,0 +1,7 @@ + +require cogl-1.0.inc + +LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c + +SRC_URI[archive.md5sum] = 7eabaf4241c0b87cc9e3b0fa23fd0315 +SRC_URI[archive.sha256sum] = 276e8c9f5ff0fcd57c1eaf74cc245f41ad469a95a18ac831fac2d5960baa5ae8 -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/7] Remove old clutter recipes
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb | 23 --- meta/recipes-graphics/clutter/clutter-1.8_git.bb | 20 -- meta/recipes-graphics/clutter/clutter-fpu.inc |6 -- .../clutter/clutter-gst-1.8_1.4.6.bb | 22 --- meta/recipes-graphics/clutter/clutter-gst.inc | 13 .../clutter/clutter-gst/enable_tests-1.4.patch | 18 -- .../clutter/clutter-gst/enable_tests-1.8.patch | 17 - .../clutter/clutter-gst/enable_tests.patch | 18 -- .../clutter/clutter-gtk-1.8_0.11.4.bb | 11 meta/recipes-graphics/clutter/clutter-gtk.inc | 14 .../clutter/clutter-gtk/disable_deprecated.patch | 21 -- .../clutter/clutter-gtk/enable_tests.patch | 18 -- meta/recipes-graphics/clutter/clutter-package.inc |2 - meta/recipes-graphics/clutter/clutter.inc | 23 --- .../clutter/clutter/build-fix.patch| 18 -- .../clutter/clutter/enable_tests-0.6.patch | 42 .../clutter/clutter/enable_tests-0.8.patch | 52 --- .../clutter/clutter/enable_tests-1.0.patch | 34 -- .../clutter/clutter/enable_tests-1.4.patch | 15 - ...-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch | 34 -- .../clutter/clutter/enable_tests.patch | 34 -- .../clutter/clutter/symconflict.patch | 33 -- .../clutter/clutter/test-conformance-fix.patch | 68 .../clutter/update_gettext_macro_version.patch | 32 - meta/recipes-graphics/clutter/cogl.inc | 22 --- .../clutter/cogl/build_for_armv4t.patch| 23 --- .../clutter/cogl/macro-versions.patch | 28 meta/recipes-graphics/clutter/cogl_1.8.2.bb| 12 meta/recipes-graphics/clutter/cogl_git.bb | 16 - 29 files changed, 689 deletions(-) delete mode 100644 meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-1.8_git.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-fpu.inc delete mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.6.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-gst.inc delete mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk.inc delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk/disable_deprecated.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch delete mode 100644 meta/recipes-graphics/clutter/clutter-package.inc delete mode 100644 meta/recipes-graphics/clutter/clutter.inc delete mode 100644 meta/recipes-graphics/clutter/clutter/build-fix.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/enable_tests.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/symconflict.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/test-conformance-fix.patch delete mode 100644 meta/recipes-graphics/clutter/clutter/update_gettext_macro_version.patch delete mode 100644 meta/recipes-graphics/clutter/cogl.inc delete mode 100644 meta/recipes-graphics/clutter/cogl/build_for_armv4t.patch delete mode 100644 meta/recipes-graphics/clutter/cogl/macro-versions.patch delete mode 100644 meta/recipes-graphics/clutter/cogl_1.8.2.bb delete mode 100644 meta/recipes-graphics/clutter/cogl_git.bb diff --git a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb b/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb deleted file mode 100644 index aceef96..000 --- a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb +++ /dev/null @@ -1,23 +0,0 @@ -require recipes-graphics/clutter/clutter.inc -require recipes-graphics/clutter/clutter-package.inc - -PR = r2 - -# We're API/ABI compatible and this may make things easier for layers -PROVIDES += clutter-1.6 - -PACKAGES =+ ${PN}-examples -FILES_${PN}-examples = ${bindir}/test-* ${pkgdatadir}/redhand.png - -SRC_URI = http://source.clutter-project.org/sources/clutter/1.8/clutter-${PV}.tar.bz2 \ - file://enable_tests
[OE-core] [PATCH 6/7] New clutter-gtk recipe (1.4.2)
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/clutter/clutter-gtk-1.0.inc | 12 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb |6 ++ 2 files changed, 18 insertions(+) create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc new file mode 100644 index 000..3717f48 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc @@ -0,0 +1,12 @@ +DESCRIPTION = ClutterGtk +HOMEPAGE = http://www.clutter-project.org/; +LICENSE = LGPLv2+ + +inherit clutter + +DEPENDS = clutter-1.0 gtk+3 +PACKAGES =+ ${PN}-examples +AUTOTOOLS_AUXDIR = ${S}/build + +EXTRA_OECONF += --disable-introspection + diff --git a/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb new file mode 100644 index 000..64eb70c --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.4.2.bb @@ -0,0 +1,6 @@ +require clutter-gtk-1.0.inc + +LIC_FILES_CHKSUM = file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 + +SRC_URI[archive.md5sum] = 842601b584daf4447a46799a4ba88df6 +SRC_URI[archive.sha256sum] = dc3ec6e90bc742c8a68ed7fa4c0d25b9b376828f1a7f013c363fbaf14f3a6974 -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/7] New clutter gst recipe (1.6.0)
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-graphics/clutter/clutter-gst-1.0.inc | 23 ++ .../clutter/clutter-gst-1.0_1.6.0.bb |9 .../clutter/clutter-gst-1.6/cogl-1.14.patch| 45 .../clutter/clutter-gst/enable-tests.patch | 17 4 files changed, 94 insertions(+) create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0.inc create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0.inc b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc new file mode 100644 index 000..f79795c --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0.inc @@ -0,0 +1,23 @@ +DESCRIPTION = Clutter GStreamer +HOMEPAGE = http://www.clutter-project.org/; +LICENSE = LGPLv2+ + +inherit clutter + +SRC_URI += file://enable-tests.patch + +DEPENDS = gst-plugins-base gst-plugins-bad clutter-1.0 +RDEPENDS_${PN} += gst-meta-base +PACKAGES =+ ${PN}-examples + +EXTRA_OECONF += --disable-introspection + +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 +} diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb b/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb new file mode 100644 index 000..dc5cc13 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.0_1.6.0.bb @@ -0,0 +1,9 @@ +require clutter-gst-1.0.inc + +SRC_URI += file://cogl-1.14.patch + +LIC_FILES_CHKSUM = file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4 + +SRC_URI[archive.md5sum] = d60ab0118730cecd5dd9988ad7da034b +SRC_URI[archive.sha256sum] = abc879cdd562f1640a825131405f4327a427bfe65b805ebc25d0c78909c8c622 diff --git a/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch b/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch new file mode 100644 index 000..7622f08 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst-1.6/cogl-1.14.patch @@ -0,0 +1,45 @@ +From 1ae4c3e7b1e2c33892590f9ac7bf0e892a5bcbd5 Mon Sep 17 00:00:00 2001 +From: Tomas Frydrych to...@sleepfive.com +Date: Thu, 11 Oct 2012 08:53:03 +0100 +Subject: [PATCH] ClutterGstVideoSink: fix includes so we can build against + cogl-1.14 + +Cogl 1.14 exposes various GL types through the public API but it does not +pull in the GL type definitions through its public headers; specifically +compilation will fail due to undefined GL_TEXTURE_2D. So include the headers +the hard way. +--- + clutter-gst/clutter-gst-video-sink.c | 17 + + 1 file changed, 17 insertions(+) + +diff --git a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c +index 9b4b53c..f092581 100644 +--- a/clutter-gst/clutter-gst-video-sink.c b/clutter-gst/clutter-gst-video-sink.c +@@ -42,6 +42,23 @@ + #include config.h + #endif + ++/* ++ * cogl-1.14 exposes generic GL types in the API, but not the actual includes. ++ */ ++#include cogl/cogl.h ++ ++#ifdef COGL_HAS_GLES1 ++#include GLES/gl.h ++#include GLES/glext.h ++#elif COGL_HAS_GLES2 ++#include GLES2/gl2.h ++#include GLES2/gl2ext.h ++#elif COGL_HAS_GL ++#include GL/gl.h ++#else ++#error Unknown cogl configuration ++#endif ++ + #include clutter-gst-video-sink.h + #include clutter-gst-util.h + #include clutter-gst-private.h +-- +1.7.10.4 + diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch b/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch new file mode 100644 index 000..de1dcc2 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-gst/enable-tests.patch @@ -0,0 +1,17 @@ +Upstream-Status: Inappropriate [embedded specific] + +Install example binary needed for poky-image-clutter + +Signed-off-by: Zhai Edwin edwin.z...@intel.com +Index: clutter-gst-1.3.8/examples/Makefile.am +=== +--- clutter-gst-1.3.8.orig/examples/Makefile.am clutter-gst-1.3.8/examples/Makefile.am +@@ -1,6 +1,6 @@ + NULL = # + +-noinst_PROGRAMS = video-player video-sink video-sink-navigation ++bin_PROGRAMS = video-player video-sink video-sink-navigation + + INCLUDES = -I$(top_srcdir) \ + $(MAINTAINER_CFLAGS) \ -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded
[OE-core] [PATCH 7/7] Update mx recipe to build with clutter 1.14.4
From: Tomas Frydrych to...@sleepfive.com Signed-off-by: Tomas Frydrych to...@sleepfive.com --- .../recipes-graphics/mx/mx-1.4/fix-build-dir.patch | 43 meta/recipes-graphics/mx/mx.inc| 20 + .../recipes-graphics/mx/mx/fix-test-includes.patch | 17 meta/recipes-graphics/mx/mx_1.4.7.bb | 26 +--- 4 files changed, 91 insertions(+), 15 deletions(-) create mode 100644 meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch create mode 100644 meta/recipes-graphics/mx/mx.inc create mode 100644 meta/recipes-graphics/mx/mx/fix-test-includes.patch diff --git a/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch b/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch new file mode 100644 index 000..667f526 --- /dev/null +++ b/meta/recipes-graphics/mx/mx-1.4/fix-build-dir.patch @@ -0,0 +1,43 @@ +# Fixup for S != B +# This patch is specific to version 1.4.x +# Upstream-status: Pending +Index: git/docs/reference/libmx-gtk/Makefile.am +=== +--- git.orig/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:07:02.027154788 +0100 git/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:14:33.684318650 +0100 +@@ -1,3 +1,6 @@ ++EXTRA_DIST= ++CLEANFILES= ++ + ## Process this file with automake to produce Makefile.in + + # We require automake 1.6 at least. +@@ -77,7 +80,7 @@ + GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la + + # This includes the standard gtk-doc make rules, copied by gtkdocize. +-include $(top_srcdir)/gtk-doc.make ++include $(top_builddir)/gtk-doc.make + + # Other files to distribute + EXTRA_DIST += version.xml.in +Index: git/docs/reference/libmx/Makefile.am +=== +--- git.orig/docs/reference/libmx/Makefile.am 2013-05-08 15:07:02.027154788 +0100 git/docs/reference/libmx/Makefile.am 2013-05-08 15:14:24.456378135 +0100 +@@ -1,3 +1,6 @@ ++EXTRA_DIST= ++CLEANFILES= ++ + ## Process this file with automake to produce Makefile.in + + # We require automake 1.6 at least. +@@ -106,7 +109,7 @@ + GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx/libmx-$(MX_API_VERSION).la + + # This includes the standard gtk-doc make rules, copied by gtkdocize. +-include $(top_srcdir)/gtk-doc.make ++include $(top_builddir)/gtk-doc.make + + # Other files to distribute + EXTRA_DIST += version.xml.in diff --git a/meta/recipes-graphics/mx/mx.inc b/meta/recipes-graphics/mx/mx.inc new file mode 100644 index 000..a3b49bd --- /dev/null +++ b/meta/recipes-graphics/mx/mx.inc @@ -0,0 +1,20 @@ +DESCRIPTION = Clutter based widget library +LICENSE = LGPLv2.1 + +inherit clutter + +DEPENDS = clutter-1.0 dbus-glib gdk-pixbuf + +SRC_URI = http://source.clutter-project.org/sources/mx/${@get_verdir(${PV})}/mx-${PV}.tar.xz + +EXTRA_OECONF = --disable-introspection\ + --disable-gtk-doc \ + --disable-gtk-widgets \ + --with-dbus \ + --with-winsys=none \ + --without-clutter-imcontext \ + --without-clutter-gesture \ + --without-startup-notification \ + --without-glade \ + + diff --git a/meta/recipes-graphics/mx/mx/fix-test-includes.patch b/meta/recipes-graphics/mx/mx/fix-test-includes.patch new file mode 100644 index 000..eee62b6 --- /dev/null +++ b/meta/recipes-graphics/mx/mx/fix-test-includes.patch @@ -0,0 +1,17 @@ +# Fix missing include directory +# This patch is currently required for all versions of mx +# Upstream-status: Pending +Index: git/tests/Makefile.am +=== +--- git.orig/tests/Makefile.am 2013-05-08 15:18:56.918596425 +0100 git/tests/Makefile.am 2013-05-08 15:23:26.864781401 +0100 +@@ -10,7 +10,8 @@ + + INCLUDES = \ + -I$(top_srcdir) \ +- -I$(top_builddir) ++ -I$(top_builddir)\ ++ -I$(top_builddir)/mx + + noinst_PROGRAMS = \ + test-deform-texture \ diff --git a/meta/recipes-graphics/mx/mx_1.4.7.bb b/meta/recipes-graphics/mx/mx_1.4.7.bb index fd9189b..4c4c8eb 100644 --- a/meta/recipes-graphics/mx/mx_1.4.7.bb +++ b/meta/recipes-graphics/mx/mx_1.4.7.bb @@ -1,18 +1,14 @@ -DESCRIPTION = Clutter based widget library -LICENSE = LGPLv2.1 +require mx.inc -LIC_FILES_CHKSUM = file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \ - file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879 - -PR = r0 - -DEPENDS = clutter-1.8 dbus-glib libxrandr gdk-pixbuf startup-notification +# The 1.4.7 tag does not build against cogl 1.14, pull in a revision with a fix +SRCREV = 9b1db6b8060bd00b121a692f942404a24ae2960f +PV = 1.4.7+git${SRCPV} -inherit autotools gettext +SRC_URI = git
Re: [OE-core] proposal to move cogl, clutter and related recipes from oe-core to dedicated meta-clutter layer
Hi Phil, On 15/05/13 21:49, Phil Blundell wrote: On Wed, 2013-05-15 at 16:28 -0300, Otavio Salvador wrote: - we have a different (newer) version I think particularly for point updates we should be able to minimize the pain if the base recipes are set up well. - we use eglnative mostly, though we might start wanting to use glx under qemu for testing (subject to getting a suitable mesa) This is the crux of the difficulties with cogl/clutter. In Guacamayo I need to be able to use both eglnative and glx. I prefer eglnative + gles2, because I only need a single clutter based app running and the X11 overhead is not negligible, but on intel HW I have not been able to get this working satisfactorily in the past, so ended up using GLX for the likes of atom-pc and NUC. The solution I came up with is to predefine a bunch common configure+depends+rdepends sets in the clutter/cogl includes (there is only a finite number of configurations that makes sense, though my recipes do not cover them all), and then in a Guacamayo-specific bbappend choose a suitable configuration on per-machine basis. - we have a slightly funky 2-stage bootstrap process for cogl in order to break the dependency cycle with cairo; this involves hacks to the recipes for cogl, cairo, pango and harfbuzz (at least) which I suspect would not be very palatable to oe-core. I have never run into this, is this with recent cogls? The net result of all this is that, whenever I try to factor out a set of stuff that's generic clutter and could go into oe-core, I end up with recipes that have virtually nothing in common with what we're actually using and consequently don't actually solve any of my problems. I don't think we can create a set of recipes that 'just work' for everyone, but we can have recipes that minimal effort and that also provide sensible defaults for the common machines out there. There are some broader issues here though that need thought, particularly, a bbappend should be a method of last resort, it would be nice have a feature mechanism to ease the configuration. But distro features are of no use here because it is not possible to differentiate packages with different configs based on DF; machine features don't have this limitation, but are the wrong place for this, plus it is entirely conceivable you might want be able to build different configs for the same machine on the same tmp dir (I use pseudo-machines for this, like atom-egl, but that is just a nasty hack). Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] proposal to move cogl, clutter and related recipes from oe-core to dedicated meta-clutter layer
On 15/05/13 20:43, Richard Purdie wrote: On Wed, 2013-05-15 at 20:30 +0300, Richard Purdie wrote: How about the master branch gets renamed dylan so it clearly show what its meant to work against and follows the other repositories? Yes, that's on my TODO list, together with removing the couple of unnecessary updated recipes from master when that is done (glib, libxkbcommon). Just to clarify the Guacamayo/meta-clutter was not set up with the view to this proposal for an separate meta-clutter layer. I created it because I need somewhere with uptodate clutter and associated recipes (e.g., Mutter) so I could get on with the meta-gir (GObject Introspection) work and did not want to make that depend on meta-gucamayo. But I'd really prefer any such meta-clutter layer not to be my private sandbox, hence this proposal. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] proposal to move cogl, clutter and related recipes from oe-core to dedicated meta-clutter layer
On 15/05/13 19:24, Paul Eggleton wrote: However, I do think it's important for us to try to work together for the benefit of everyone, I entirely agree with this; I certainly don't want to maintain a public meta-clutter layer that competes with, or is perceived to compete with some other recipes or efforts (oe-core or otherwise), this benefits no one, least of all anyone interested in being just a 'user' of these packages. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] proposal to move cogl, clutter and related recipes from oe-core to dedicated meta-clutter layer
On 16/05/13 11:35, Phil Blundell wrote: On Thu, 2013-05-16 at 10:01 +0100, Tomas Frydrych wrote: The solution I came up with is to predefine a bunch common configure+depends+rdepends sets in the clutter/cogl includes (there is only a finite number of configurations that makes sense, though my recipes do not cover them all), and then in a Guacamayo-specific bbappend choose a suitable configuration on per-machine basis. Right, that sounds fairly reasonable. Or one could presumably use PACKAGECONFIG for this sort of thing. Yep, that's one of the things I need to clean up in my own recipes. It's because we build Cairo with the cogl backend enabled. That introduces a dependency of cairo on cogl (obviously), which is a problem because cogl-pango needs pango, which needs harfbuzz, which needs cairo. So what we do is build cogl initially with pango disabled, then use that to compile cairo and the rest of the stack, and then finally build the real cogl with everything enabled. This would probably merit some sort of cogl-initial recipe to add. This is something that's just fundamentally difficult in OE; there simply isn't any namespace to express that degree of freedom. DISTRO is essentially invariant for any given tmpdir, and the hierarchy in there reflects MACHINE and PN. So, if you want to build the same package with a different configuration then either MACHINE or PN is going to have to change. Traditionally of course it's been PN that changes in this situation. I originally went down the PN route, but that meant having to specify preferred providers and in my use case the sole criterion was the MACHINE. But for a generic solution, it's probably necessary to have some PN mechanism in place, maybe the keys in PACKAGECONFIG could be used to automatically create a mangled PN for non-standard configs. Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] proposal to move cogl, clutter and related recipes from oe-core to dedicated meta-clutter layer
Hi Paul, On 14/05/13 17:55, Paul Eggleton wrote: Having clutter in OE-Core does not preclude such testing with additional BSPs, and I'm unclear on how moving it out to another layer helps at all with this specific issue. It prevents efficiently supporting clutter on any real machine that does not use mesa's GL, which means all machines not in meta-intel, and some machines in meta-intel. This is the main issue, real HW support. This could present a problem. What if I want Clutter but I don't want the latest version of glib, but instead the version that is being shipped with OE- Core that is tested with the other pieces of the system that depend upon it (especially given glib has recent history of breaking other packages)? Surely the safest alternative is the last stable version of Clutter that works with that version of glib? That would make it difficult to depend upon an external layer that provides its own newer version of glib would it not? Sometimes a 6 month old release is not enough, and having to provide the updated packages yourself is the least desirable of all options. In a small layer, such issues can be handled gracefully, and their impact limited. There's no denying that the maintenance of the Clutter recipes in OE-Core has slipped. I don't think that is an argument in itself to split them out, that just means we need to recognise that and maintain those recipes more effectively. The lack of maintenance reflects the relative importance of Clutter for oe-core, and is an orthogonal issue. I am not complaining that it is not being maintained, I am arguing that it cannot be properly maintained with just reference to mesa and qemu, hence the suggestion to split it out. Honestly I think if Clutter continues to be something that people are using to develop applications we're much better off with the canonical stable version being in OE-Core. Where 'canonical' means 'unusable on non-Intel HW', but I am repeating myself ... Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] proposal to move cogl, clutter and related recipes from oe-core to dedicated meta-clutter layer
Hi Paul, On 15/05/13 10:49, Paul Eggleton wrote: It prevents efficiently supporting clutter on any real machine that does not use mesa's GL, which means all machines not in meta-intel, and some machines in meta-intel. This is the main issue, real HW support. How does it prevent that? Surely if machine-specific changes are required then they will be required on top of a separate layer as much as they are if the recipes remain in OE-Core. It could be all pulled together into the meta-clutter layer, the supported BSPs and machines documented, etc, so that common machines just work out of the box. We could have a dedicated mailing list, a bug tracker, build a community around it, pull resources. The layer mechanism exists to allow specific recipes to be extended if needed. Having the recipes in OE-Core does not preclude their extension or replacement with newer versions elsewhere for those that need it. I have followed the model you advocate for over a year with clutter, and it is a PITA, so I am thinking that perhaps there are others who are doing the same and we could do it in one well known place. You may well be right about the need to test on other GL implementations. That does not explain how moving them to a separate layer directly helps to address that need. You must also expect to make some changes to the recipes themselves, so what changes would you be making? It's not just about testing, you have to build it first: I would like to see a set of recipes that can support a whole bunch of machines in the public OE BSP layers out of the box: configs that work and make sense, patches where needed, documentation, including documentation of BSP specific issues. In the absence of a community-owned meta-clutter layer, if anyone is stuck maintaining their own clutter recipes, I have a set at https://github.com/Guacamayo/meta-clutter which can perhaps be of some use. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] proposal to move cogl, clutter and related recipes from oe-core to dedicated meta-clutter layer
Hi Paul, On 15/05/13 15:09, Paul Eggleton wrote: Can you not just get the appropriate changes into the BSP layers so that when you add the BSP on top of OE-Core it does just work out of the box? What you are really saying is that the onus of maintaining working clutter packages should be on the BSP maintainers. I have already explained previously in this thread why I don't think this is going to work out in practice, so I am not going to repeat myself again. If clutter is taken out of OE-Core this becomes even harder because then BSPs can no longer bbappend clutter or cogl (if that is indeed what is required in order to enable machine-specific functionality) without fiddling around with BBMASK or keeping the appends in yet another separate layer so they don't impact other BSP users who aren't building Clutter. The BSPs would not need to do anything regarding clutter, no bbappends, meta-clutter would be self-contained in this regard. I don't think there is any point in bothering the list with this discussion any further, we have gone around the circle more than once. The whole point of the proposal was to make maintaining, using and supporting the clutter packages easier for everyone, but it seems I underestimated how important Clutter is to oe-core, and I am already looking forward to this newly discovered importance being translated into user happiness before too long. :) Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] proposal to move cogl, clutter and related recipes from oe-core to dedicated meta-clutter layer
Hi Phil, On 13/05/13 16:41, Phil Blundell wrote: It seems a bit hyperbolic to claim that testing clutter is impossible without GPU hardware (either real or emulated). The majority of the code even in cogl, and virtually all the code in clutter itself, is mostly independent of the underlying GL implementation. From the point of view of testing whether clutter basically works and is correctly built/packaged it seems as though this ought to be quite sufficient. There are too separate issues: testing clutter itself, and using clutter to test other parts of the graphics stack. Re the former, all you can say after testing cogl/clutter against mesa software rasterizer is that a particular configuration and a particular backend (in oe-core that would be the GLX backend) work with mesa software rasterizer. This says nothing about any other configuration, with any other backend or whether it works with any other GL/GLES implementation. In reality, cogl/clutter need patches to build against the likes of TI's GLES (e.g., Beagleboard) or to work on the likes of RaspberryPi, and these patches cannot be included in oe-core, of course, because oe-core knows nothing of such machines. Then there are little annoyances, like the fact that over the last year or so, clutter has tended to have a dependency on a specific but mostly random versions of libxkbcommon (from what I can gather, determined more then anything by whatever the Fedora packager happened to package and what version of Fedora the clutter maintainer was using), or Clutter's customary insistence on as recent glib as you can get. This can all be nicely encapsulated in small layer. Regarding using clutter to test other parts of the graphics stack, which is what Richard is wanting clutter in oe-core for, this amounts to testing mesa sw rasterizer. There is limited value here, it's the one GL implementation that nobody using Yocto to build images will be deploying for real, so this is a weak argument for needing clutter in oe-core. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] Enable VPN support in ConnMan
On 13/05/13 15:53, Phil Blundell wrote: On Mon, 2013-05-13 at 12:32 +0100, Tomas Frydrych wrote: On 13/05/13 12:06, Burton, Ross wrote: The problem with bbappends is that they break every time the package in oe-core changes version. I see this as a good thing; if I maintain a bbappend, I want to know when the base package changes its a version, and I get an immediate error due to bbappend to a non-existent file. Personally, for the .bbappends that I maintain, I would much rather not have to go around renaming a bunch of files every time I merge a new version of oe-core and all the recipes get upgraded. But, if you enjoy the errors, you could easily enough get them back even if the filenames didn't change: python() { tolerable_pvs = [ '1.0', '1.1', '1.2' ] pv = d.getVar('PV', True) if not pv in tolerable_pvs: bb.fatal(encountered intolerable version %s of underlying recipe, please adjust me accordingly % pv) } or something. One could wrap that in some extra sugar and put it in base.bbclass if having the boilerplate in each .bbappend is unappealing. I do like this approach; I'd probably wrap it in a class and let the bbappend maintainer to decide if their bbappend deserves this or not. Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] proposal to move cogl, clutter and related recipes from oe-core to dedicated meta-clutter layer
Hi Mark, On 10/05/13 21:37, Mark Hatle wrote: One of the key pieces of the oe-core, it must be able to work without any additional layers. It also much be able to be tested without any additional layers. I personally don't have a preference for the clutter and related items on where they live... but I do want to make sure that oe-core can standalone as a starting point for people to develop devices. Part of being standalone means that it is capable of being tested. Yes, but the clutter packages are not being tested, and more to the point, they cannot be meaningfully tested using oe-core, because such testing has to be done against a real OGL/GLES implementation -- Clutter can only be tested properly in conjunction with BSP layer(s). All you can test with oe-core is the mesa software rasterizer, which is just about the one thing nobody cares about because it is of no practical use. There are two ways that tested clutter packages are achievable: a) Generic clutter recipes in oe-core and BSP specific bbappends in the BSP layers. There are a couple of problems with this: I don't think the BSP maintainers have time/impetus for maintaining the bbappends and testing Clutter, and the BSP support might need upgrading the base package and dependencies (plus Clutter is a fairly high level package to be part of a BSP anyway, IMO). b) A dedicated layer that is not subject to the oe-core constraints and can make reference to external BSP layers. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] proposal to move cogl, clutter and related recipes from oe-core to dedicated meta-clutter layer
Hi Richard, On 10/05/13 23:18, Richard Purdie wrote: I am sure we all want a solid release so I am also sure Tomas wouldn't put experimental version of clutter near of release. From what I read of Tomas' emails, I actually think his plans differ from that as he finds that aspect of OE-Core frustrating. I am no sure what 'aspect' of OE-Core you mean. If you mean the six-monthly releases, then you are reading my emails all wrong -- I am a firm believer. Regarding experimental releases -- I am not interested in them much myself, but with meta-clutter, we could, of course, have negative priority recipes for any interim developer snapshots, if that is what people need. But what I am looking for most are uptodate recipes for *stable* releases of clutter more or less as they happen. I don't touch layers I don't maintain. If I did that, I would get hung, drawn and quartered. Please at least think through things like this before saying them :(. Can you imagine what you'd say to me if I pushed commits to meta-fsl-arm? Just so we are clear, I am not trying to wrench clutter out of your control. For all I care, set up meta-clutter on g.yp.o, and put the current official maintainer of the clutter packages in oe-core in charge, but I don't think we can get a usable clutter support without a dedicated layer in the long run. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] Enable VPN support in ConnMan
On 13/05/13 12:06, Burton, Ross wrote: The problem with bbappends is that they break every time the package in oe-core changes version. I see this as a good thing; if I maintain a bbappend, I want to know when the base package changes its a version, and I get an immediate error due to bbappend to a non-existent file. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] proposal to move cogl, clutter and related recipes from oe-core to dedicated meta-clutter layer
Hi Richard, On 10/05/13 10:05, Richard Purdie wrote: Yes, I could have submitted clutter 1.12 recipes to oe-core in some form and shape in the last 6 months, and we would have had a less outdated package in oe-core; but nevertheless outdated, since again the clutter 1.14 release came too late to make it into dylan. I can see this happening again and again. The trouble is you can make this argument for every single piece of software in OE-Core. The clutter related packages are the only ones where I have run into this problem. In the last 12 months clutter went through 7 stable releases or so, of these there were 3 minor version changes, which signal API changes, another minor version change, as well as a major version change to 2.0, is on the horizon. If you are developing an application using clutter; you need to keep up. If you are using Yocto/OE to develop an application using clutter (and people do), then everyone is left to maintain their own rolling recipes. A dedicated layer will still have timing issues, it will just move onto your personal schedule rather than the OE-Core one and whilst this will obviously suit you, it likely won't suit all other users. For a small dedicated layer the schedule can closely track the upstream. It might not suit all clutter users, but I think it could be made to work for most of them; the current situation suits no one at all. I suspect the bigger problem here is that clutter is hard to write recipes for since it needs to suit a number of different targets and configurations. Going to the effort of doing a generic implementation in OE-Core is hard, whereas creating your own layer means you can customise to your usecase and not worry about the other cases. I suspect your reply to this will be that anyone wanting to add other cases can send you patches. The implication is that the layer will become much more specialised/focused than the core recipes currently are. My reply is that it clutter is not that complex, there are only a finite number of possible configurations that make sense and it should be entirely possible to write a good base recipe that can be easily tweaked using a bbappend based on machine and distro needs. But that's not the real issue. My preference would still be to fix up the recipes in the core, than have some specific branches for danny/dylan with the 1.12/1.14 components in if/as needed. We can create the core recipes so they're properly configurable to the different usecases. Fixing up the recipes in oe-core only addresses one aspect of the problem. The fast turnover of the clutter packages will remain, as will the fact that nothing in oe-core uses clutter, so the oe-core packages are untested. Then there is the fact that oe-core does not have any machines that clutter could be really used with. Then there are also other projects that are closely tied to clutter version, such as (the recently removed) mutter, and, dare I say, GnomeShell, which should be maintained together. I am still to hear any reason why clutter should be in oe-core ... the same logic that said mutter should be removed from oe-core applies to clutter, I think. Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] librsvg: update gdk-pixbuf loader cache when staging native package
From: Tomas Frydrych to...@sleepfive.com librsvg installs an svg loader for gdk-pixbuf; in order for the native version of the loader to be usable by gdk-pixbuf-native we have to update the loader cache. Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/recipes-gnome/librsvg/librsvg_2.32.1.bb | 11 +++ 1 file changed, 11 insertions(+) diff --git a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb index ff17cf7..dcacce4 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.32.1.bb @@ -55,3 +55,14 @@ FILES_librsvg-gtk-dbg += ${libdir}/gdk-pixbuf-2.0/.debug \ PIXBUF_PACKAGES = librsvg-gtk PARALLEL_MAKE = + +# ensure that the native gdk-pixbuf loaders cache is updated when we stage +# our svg loader +SSTATEPOSTINSTFUNCS_class_native += librsvg_sstate_postinst + +librsvg_sstate_postinst() { + if [ ${BB_CURRENTTASK} = populate_sysroot -o ${BB_CURRENTTASK} = populate_sysroot_setscene ] + then + GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/2.10.0/loaders GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/2.10.0/loaders.cache gdk-pixbuf-query-loaders --update-cache + fi +} -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] proposal to move cogl, clutter and related recipes from oe-core to dedicated meta-clutter layer
On 10/05/13 12:32, Richard Purdie wrote: On Fri, 2013-05-10 at 11:56 +0100, Tomas Frydrych wrote: On 10/05/13 10:05, Richard Purdie wrote: The closely track upstream is the key part and I think the core can do this, apart from the ~six week stabilisation window. If you mean you are prepared to do frequent point releases to keep up with clutter, that could work. But if you mean that those interested can closely track oe-core master, then that is not that useful, there are too many other changes happening at the same time. A small single purpose layer means updates (and breakages) can be very contained. My argument for this is that I really do want to stress out the graphics stack we have, clutter provides a good way to test some of those components, particularly some of the more unusual parts. Currently its mostly build test however we do have plans to make that runtime too. I do think that clutters unusual usage of the stack makes it particular useful in this role. I'd appreciate help from anyone who can help make this all work. I am all for this, but does using clutter for automated tests require for the clutter packages to be in oe-core? The only thing you can stress test in oe-core using clutter is mesa, which is only applicable to the i915/i965 chip sets. I think it would be useful if any such tests could be applied to other graphics stacks provided by BSPs; I think all of the BSPs would benefit from this. I'd really like for people to be able to just pick up uptodate and working clutter packages for the major platforms the actively maintained BSPs support. Every so often someone asks about clutter for XYZ (usually the Beagleboard or RPi) on the clutter list: this should be readily available somewhere. have a good weekend everyone, Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] proposal to move cogl, clutter and related recipes from oe-core to dedicated meta-clutter layer
I think it would makes sense to move clutter related packages from oe-core into a dedicated layer: * AFAIK nothing in oe-core requires cogl/clutter/mx, * The packages in oe-core are effectively unmaintained, several upstream releases behind, and pretty much unusable, * The somewhat random nature of clutter and cogl releases makes it hard to sensibly manage these packages within the oe-core release cycle, but a dedicated layer could follow the upstream developments. I have started work on new clutter and related packages for use by meta-guacamayo at https://github.com/Guacamayo/meta-clutter, but I'd be more than happy for the layer to live somewhere else and become the canonical location for clutter-related bits and pieces. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] proposal to move cogl, clutter and related recipes from oe-core to dedicated meta-clutter layer
On 08/05/13 16:23, Richard Purdie wrote: On Wed, 2013-05-08 at 16:11 +0100, Tomas Frydrych wrote: I think it would makes sense to move clutter related packages from oe-core into a dedicated layer: * AFAIK nothing in oe-core requires cogl/clutter/mx, * The packages in oe-core are effectively unmaintained, several upstream releases behind, and pretty much unusable, * The somewhat random nature of clutter and cogl releases makes it hard to sensibly manage these packages within the oe-core release cycle, but a dedicated layer could follow the upstream developments. I have started work on new clutter and related packages for use by meta-guacamayo at https://github.com/Guacamayo/meta-clutter, but I'd be more than happy for the layer to live somewhere else and become the canonical location for clutter-related bits and pieces. I have no idea why you've always felt the need to maintain the clutter pieces in your own layer rather than interacting with the ones in OE-Core instead which I'd love to see better maintained. I'm not aware of any barrier that has prevented that. It's mostly a matter of timing. Clutter does not provide LTS releases, it pretty much deprecates the previous stable branch as soon as new stable branch is started, so tracking the upstream reasonably quickly matters. The timing for the danny oe-core release and the arrival of clutter 1.12 was such that it simply could not have made it into oe-core. Needing 1.12 I had no option than to package it elsewhere. Yes, I could have submitted clutter 1.12 recipes to oe-core in some form and shape in the last 6 months, and we would have had a less outdated package in oe-core; but nevertheless outdated, since again the clutter 1.14 release came too late to make it into dylan. I can see this happening again and again. If there is a good reason to maintain clutter, cogl and mx in oe-core, then I'll make patches for 1.14, but I am not convinced there is a good reason, and that everyone would be better served by a dedicated layer. Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] proposal to move cogl, clutter and related recipes from oe-core to dedicated meta-clutter layer
On 08/05/13 16:23, Phil Blundell wrote: One particular issue for us is that the clutter recipes as they stand in oe-core are very X11-centric. We don't have X and, instead, use the eglnative backend. It'd be handy for us if some putative refactoring of the recipes made them more friendly to non-X11 deployments. I have a similar problem in Guacamayo, where I have more than one target machine, and generally prefer to use the elg-native backend unless it cannot be avoided because the elg driver is too broken. So the recipes in Guacamayo were set up so as to make it easy to reconfigure the packages based on machine and distro features using a mininal bbappend, e.g., https://github.com/Guacamayo/meta-guacamayo/blob/master/meta-guacamayo/recipes-graphics/clutter/clutter-1.12_git.bbappend. The original recipes are too much marked by the specifics of the Guacamayo set up and their gradual evolution, but I am in the process of cleaning this up, so it can be used by others. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] image_types: fix default location of kernel when generating elf images
On 03/05/13 12:50, Richard Purdie wrote: On Wed, 2013-05-01 at 21:51 +0100, Tomas Frydrych wrote: On 01/05/13 21:29, Darren Hart wrote: On 05/01/2013 01:24 PM, tf+lists.yo...@r-finger.com wrote: From: Tomas Frydrych to...@sleepfive.com The kernel is now located in DEPLOY_DIR_IMAGE rather than sysroot. Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/classes/image_types.bbclass |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 98d31f5..0e1ad3a 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -185,7 +185,7 @@ IMAGE_CMD_cpio () { cd ${IMAGE_ROOTFS} (find . | cpio -o -H newc ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) } -ELF_KERNEL ?= ${STAGING_DIR_HOST}/kernel/${KERNEL_IMAGETYPE} +ELF_KERNEL ?= ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin Looks correct, how did this fail before? What was the symptom? e.g., | Cannot open `./tmp/sysroots/nuc/kernel/bzImage': (null) Two bugs really, the location has changed, and it was using a kernel that is not machine-specific. I'll make a patch with better commit message tomorrow. Just for reference, STAGING_DIR_HOST is machine specific these days. This patch also changes the dependency from do_populate_sysroot (which is encapsulated by DEPENDS) to do_deploy (which is not). Did you account for that? I suspect that fixing the path might be safer than this change... Right, I see it now, the bzImage is under STAGING_DIR_HOST/usr/src/kernel I shall make another patch. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] image_types: fix default location of kernel when generating elf images
On 01/05/13 21:29, Darren Hart wrote: On 05/01/2013 01:24 PM, tf+lists.yo...@r-finger.com wrote: From: Tomas Frydrych to...@sleepfive.com The kernel is now located in DEPLOY_DIR_IMAGE rather than sysroot. Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/classes/image_types.bbclass |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index 98d31f5..0e1ad3a 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -185,7 +185,7 @@ IMAGE_CMD_cpio () { cd ${IMAGE_ROOTFS} (find . | cpio -o -H newc ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.cpio) } -ELF_KERNEL ?= ${STAGING_DIR_HOST}/kernel/${KERNEL_IMAGETYPE} +ELF_KERNEL ?= ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin Looks correct, how did this fail before? What was the symptom? e.g., | Cannot open `./tmp/sysroots/nuc/kernel/bzImage': (null) Two bugs really, the location has changed, and it was using a kernel that is not machine-specific. I'll make a patch with better commit message tomorrow. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] ia32-base.inc: remove inapropriate grub dependency
On 01/05/13 21:25, Darren Hart wrote: On 04/27/2013 01:52 AM, tf+lists.yo...@r-finger.com wrote: From: Tomas Frydrych to...@sleepfive.com There is no good reason for ia32 machines to have hard dependency on grub, as there are other bootloaders available for ia32 platforms. Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/conf/machine/include/ia32-base.inc |1 - 1 file changed, 1 deletion(-) diff --git a/meta/conf/machine/include/ia32-base.inc b/meta/conf/machine/include/ia32-base.inc index 921c740..cb542a5 100644 --- a/meta/conf/machine/include/ia32-base.inc +++ b/meta/conf/machine/include/ia32-base.inc @@ -9,7 +9,6 @@ MACHINE_FEATURES += screen keyboard pci usbhost ext2 ext3 x86 \ acpi serial usbgadget alsa MACHINE_EXTRA_RRECOMMENDS += kernel-modules eee-acpi-scripts -MACHINE_ESSENTIAL_EXTRA_RDEPENDS += grub Agreed - but do the images still build as currently written after you remove it here? I have not tested the efi path, though I think the grub-efi.bbclass takes care of the grub dependency. In the non-efi case the grub dependency is taken care of by initramfs-live-install.bb. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] tzdata: We shouldn't override the localtime if it is valid
On 08/02/13 11:55, Burton, Ross wrote: On 8 February 2013 11:38, Otavio Salvador ota...@ossystems.com.br wrote: Can you fix the code to symlink instead of copy? systemd and more needs a symlink so that it can identify the name of the timezone from the link target. You mean inside the if? I mean in general /etc/localtime should be a symlink and not a copy. /etc/localtime is a real file so that /etc is not containing a link to a file in /usr; this has historically been the case unless I am not mistaken. systemd should grow up and read the contents :). Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] tzdata: We shouldn't override the localtime if it is valid
On 08/02/13 12:07, Otavio Salvador wrote: On Fri, Feb 8, 2013 at 10:00 AM, Tomas Frydrych tf+lists.yo...@r-finger.com wrote: On 08/02/13 11:55, Burton, Ross wrote: On 8 February 2013 11:38, Otavio Salvador ota...@ossystems.com.br wrote: Can you fix the code to symlink instead of copy? systemd and more needs a symlink so that it can identify the name of the timezone from the link target. You mean inside the if? I mean in general /etc/localtime should be a symlink and not a copy. /etc/localtime is a real file so that /etc is not containing a link to a file in /usr; this has historically been the case unless I am not mistaken. systemd should grow up and read the contents :). In fact a lot of software expects it to be a symlink so it shouldn't be a copy. Lot of software does thing without understanding what it is doing, that's the nature of software. :) My point is that the code in the current recipe is not doing the unconditional copy by mistake, it is doing so intentionally so that local clock can work without /usr. Only systems that mandate the presence of /usr can use a symlink -- so this is not a bug fix but a change in an established system behaviour. If nothing else, the commit message should be clear in this regard. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] OpenGL as a DISTRO_FEATURE
Hi Ross, On 03/02/13 23:35, Ross Burton wrote: On Sunday, 3 February 2013 at 21:33, Marcin Juszkiewicz wrote: As they are different architectures you can try this: DISTRO_FEATURES_wm8950 = here copy your default DISTRO_FEATURES but skip opengl Replace wm8950 with MACHINE name. Ugly solution but should work. That means that Qt won't be built with GLES support. The best approach is to probe the hardware/libraries at runtime and adapt - i.e. if only GLES libraries are available use those, but a lot of software doesn't support that or simple probing isn't sufficient (Intel Pine Trail supports both but GL is best, Cedar Trail supports both but GL is terrible). Run-time probing is not a solution at all, because (a) we are not talking about how to write portable GL applications, but primarily how to package software already written by other people, and (b) with the current OE set up run-time probing cannot work anyway (and does not, e.g. cogl), because with two 'GL' providers there is no guarantee that the optimal one (i.e., not the mesa software GL rasterizer), gets used. The above scenario where someone wants to maintain a distro with multiple target architectures is the normal thing to ask for with OE. The fact that current OE cannot support it cleanly, and it has to be worked around on distro level (whether by bbappends that make the GL components machine-specific as they should be, or hacks like DISTRO_FEATURES_my-random-machine), demonstrates that we are not doing it right at the moment. It's not as simple as it appears and causes a rather large number of packages to become machine-specific. From actual experience I think this is well overstated; I dare you to support this by real numbers :-) Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] patch.bbclass: Finally remove support for deprecated pnum=.
On 13/12/12 01:25, Robert P. J. Day wrote: -elif pnum in parm: -#bb.msg.warn(None, Deprecated usage of 'pnum' url parameter in '%s', please use 'striplevel' % url) -striplevel = parm[pnum] Not sure what the rationale is for needing to remove it at all, but if you do, it should error on pnum use, so that folk who might have any custom recipes using it get a clear error message, rather than letting it fail inside the patch task. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] libmatchbox: fix build against libpng15
On 06/12/12 08:30, Marko Lindqvist wrote: On 6 December 2012 00:44, Burton, Ross ross.bur...@intel.com wrote: Hi Marko, Is this backwards compatible with libpng12, or should libmatchbox check it has libpng15? Ross This is backwards compatible. Those functions exist in libpng12. This should go directly into matchbox rather than being an OE patch I think. Tomas -- http://sleepfive.com ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2] meta: remove redundant _FOR_BUILD variables
On 10/11/12 11:11, Phil Blundell wrote: The whole PR-bumping thing is just a massive pain in the backside and, now that all the metadata is hashed into the signature files anyway, I think we should consider just ditching PR from oe-core altogether. +1 Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/4] pulseaudio: add GConf dependency
On 30/10/12 10:31, Andrei Gherzan wrote: gnome-common is some scripts and tools used at configure time, so there isn't any linkage, so there isn't any GPLv3 in the images, so there isn't a problem. The question is how do we express this? Should it be whitelisted? The problem with whitelisting is that if the usage changes from the assumptions the whitelisting was originally made on, this will not automatically remove the whitelisting -- if whitlisting is the solution here, it needs to be left to the Yocto users to do it locally based on their own review of the situation. I think to handle this scenario properly, you would need two sets of license controls, one for 'build tools' and one for 'things that ship'. Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC] OpenGL packaging/staging policy
On 29/10/12 17:26, Burton, Ross wrote: Rule 1. Unambiguous package naming I won't repeat this, everyone agreed this was sane. I've a patch for mesa that I'll submit shortly. Rule 2. No whitelisting for GL driver conflicts The target GL shall be staged, and situations which result in multiple GLs being installed should handle this case and resolve it. For atom-pc this means building Mesa. For Beagle this means staging the Beagle binary drivers. For Tegra as I've discovered this is interesting as they don't appear to provide any headers in their Tegra For Linux tarball... For Cedar Trail and EMGD, the easiest solution is a dedicated Mesa building just GL. As Mesa's DRI driver API isn't stable this is practically required anyway: the ABI of the libGL we build and the libGL that the binary driver was built against need to match. This mesa-just-gl (mesa-solo?) can be in meta-intel unless other machines turn out to have a similar (crazy) requirement. Rule 3. No dependencies on specific GL implementations Useful so that GL implementations are swappable on systems where that can happen, but not essential if there isn't a single blessed GL for sysroot. We'll do this later. Some things that will also happen whilst I do this: 1) mesa-dri renamed to mesa. Let's get this done nice and early! 2) mesa stops architecture-overriding enabling of EGL and GLES, so all architectures that build Mesa get GL/EGL/GLESv1/GLESv2. If you don't want this don't build Mesa, and the namespaced packaging means there won't be conflicts. Any more comments? FWIW, I am happy with this proposal :) Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC] OpenGL packaging/staging policy
On 23/10/12 03:06, Daniel Stone wrote: What? You can't do that. Well, you kinda can if you're using GLX and nothing else, maybe, sorta. But the EGL and GL (ES) implementations are very heavily tied together and can't be used as independent works. You can separate GLU, which we've already done. I think you can split out the core of libgbm, but not the DRI plugin. And that's about it. I am well aware that GL stacks are closely tied together, and personally would not advise anyone to mix and match. But please reread the original email Ross sent explaining the Cedar Trail 'complex' situation. If Intel want to use mesa GL and their PVR GLES1/2 / EGL binary bits together ... Regardless what is done with the packaging, allowing only mesa to stage dev files will break things. GL headers are not interchangeable, even if all the implementers are well behaved (which is a big if), the *platform.h files are allowed to be implementation specific and so have to be staged by the actual platform GL stack. Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] libxkbcommon: New window system-independent xkb library
I think this needs a -native tools as well, like, https://github.com/Guacamayo/meta-guacamayo/blob/master/meta-guacamayo/recipes-graphics/xorg-lib/libxkbcommon_git.bb Tomas On 22/10/12 10:30, Ross Burton wrote: From: Damien Lespiau damien.lesp...@intel.com Needed for weston and wayland clients to compile key maps. Signed-off-by: Damien Lespiau damien.lesp...@intel.com Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb | 19 +++ meta/recipes-graphics/xorg-lib/xorg-lib-common.inc |2 +- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb new file mode 100644 index 000..b426115 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_git.bb @@ -0,0 +1,19 @@ +SUMMARY = Generic XKB keymap library + +DESCRIPTION = libxkbcommon is a keymap compiler and support library which \ +processes a reduced subset of keymaps as defined by the XKB specification. + +LICENSE = MIT MIT-style + +require xorg-lib-common.inc + +DEPENDS = flex-native bison-native + +LIC_FILES_CHKSUM = file://COPYING;md5=9c0b824e72a22f9d2c40b9c93b1f0ddc + +SRCREV = 1c880887666f84e08ea1752bb8a5ab2a7bf1d8a0 +PV = 0.1.0+git${SRCPV} +PR = r0 + +SRC_URI = git://anongit.freedesktop.org/xorg/lib/libxkbcommon;protocol=git +S = ${WORKDIR}/git diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc index c911925..f3c08ab 100644 --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc @@ -17,7 +17,7 @@ EXTRA_OECONF = --enable-malloc0returnsnull \ --disable-specs --with-groff=no --with-ps2pdf=no --with-fop=no --without-xmlto python () { -whitelist = [ pixman, libpciaccess ] +whitelist = [ pixman, libpciaccess, libxkbcommon ] if not d.getVar('BPN', True) in whitelist and not oe.utils.contains ('DISTRO_FEATURES', 'x11', True, False, d): raise bb.parse.SkipPackage('x11' not in DISTRO_FEATURES) } ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC] OpenGL packaging/staging policy
On 23/10/12 10:18, Daniel Stone wrote: Regardless what is done with the packaging, allowing only mesa to stage dev files will break things. GL headers are not interchangeable, even if all the implementers are well behaved (which is a big if), the *platform.h files are allowed to be implementation specific and so have to be staged by the actual platform GL stack. Right, I do agree with you, but in the mixed-stack situation, which headers are we building against? :) The GL / GLES / GLES2 / EGL headers are separate from each other, so in theory if you have separate libgl, libles, libgles2, and libegl packages, you could even stage them from four different sources. But for the Cedar Trail scenario a separate big GL and a combined GLES/GLES2/EGL package, plus a package for common libs. This might be of some use for others (IIRC, the whole discussion about this was sparked after enabling EGL in the mesa package), though it means building mesa multiple times. Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] libxkbcommon: New window system-independent xkb library
On 23/10/12 10:15, Daniel Stone wrote: Hi, On 23 October 2012 20:12, Tomas Frydrych tf+lists.yo...@r-finger.com wrote: I think this needs a -native tools as well, like, https://github.com/Guacamayo/meta-guacamayo/blob/master/meta-guacamayo/recipes-graphics/xorg-lib/libxkbcommon_git.bb Not anymore, we use Python for makekeys nowadays. (And, in an unpushed tree, don't use Python at all if we can avoid it.) Good news, but perhaps you forgot to push this into the public repo? makekeys seems to be C program even in the current master, certainly in 1c880887666f84e08ea1752bb8a5ab2a7bf1d8a0. Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC] OpenGL packaging/staging policy
Hi Ross, On 22/10/12 17:35, Burton, Ross wrote: Rule 3. Only Mesa stages, nothing else I think it is a big mistake to special case mesa as anything other than *a* GL provider. GL stacks provide their own headers, these headers might not be identical to the mesa headers, and people writing GL software for the particular target have every right to expect to be using the headers provided with their GL stack -- sooner or later this rule will have to be broken because of customer software not buildable under Yocto. (Whether the headers should be identical is neither here nor there; Yocto needs to work in the real world, and you well know that in the real world this is not the case.) I know some folk don't like to hear this, but whether you like it or not, GL libs are tied to specific HW, i.e., are machine-specific. Our current difficulties stem directly from trying to pretend this is not the case, or that mesa is somehow more than just *a* GL provider. IMHO the correct thing to do here is: a) Make the mesa packages machine specific so we can control compatible machines and preferred providers to match the HW realities, b) Split the ginormous mesa recipe, so that it is, for example, possible to stage mesa gl without mesa egl, so that we can accommodate HW that wants to use bits of mesa. Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC] OpenGL packaging/staging policy
On 22/10/12 20:27, Burton, Ross wrote: On 22 October 2012 18:19, Tomas Frydrych tf+lists.yo...@r-finger.com wrote: Our current difficulties stem directly from trying to pretend this is not the case, or that mesa is somehow more than just *a* GL provider. IMHO the correct thing to do here is: Mesa is the only free GL provider, which does make it useful in an open source build system. Useful, yes, but not different. Having multiple providers is a normal scenario that OE handles perfectly well; having a privileged provider and bunch second class providers is a new scenario that serves no useful purpose here -- you are creating the problem you are trying to solve. This would be the complication packaging tricks that I alluded to in the original mail. There is nothing complicated about this; the fact that you cannot build mesa GL without *staging* mesa EGL at the same time is broken which ever way you look at it. Having only mesa to stage things is not a fix, it's a work around, and one that punishes everyone else for the mesa mess. :-) Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [yocto] opengl / libgl / libgles
On 06/09/12 14:51, Burton, Ross wrote: On 6 September 2012 14:25, Koen Kooi k...@dominion.thruhere.net wrote: It's not automatic, but you can do something like this: http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/commit/?id=23b02134 RDEPENDS_${PN} = libGL Ah, interesting. I'm not entirely keen on the manual dependencies but that's certainly a step in the right direction. Is there much that actually links against libGL / libgles? Things like cogl dlopen() these these, so you have to manually specify the RDEPENDS anyway. Just thinking this could be less of an issue than it might appear. Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [yocto] opengl / libgl / libgles
On 06/09/12 15:50, Koen Kooi wrote: Op 6 sep. 2012, om 16:37 heeft Tomas Frydrych tf+lists.yo...@r-finger.com het volgende geschreven: On 06/09/12 14:51, Burton, Ross wrote: On 6 September 2012 14:25, Koen Kooi k...@dominion.thruhere.net wrote: It's not automatic, but you can do something like this: http://git.yoctoproject.org/cgit/cgit.cgi/meta-ti/commit/?id=23b02134 RDEPENDS_${PN} = libGL Ah, interesting. I'm not entirely keen on the manual dependencies but that's certainly a step in the right direction. Is there much that actually links against libGL / libgles? Things like cogl dlopen() these these, so you have to manually specify the RDEPENDS anyway. Just thinking this could be less of an issue than it might appear. xbmc is one The problem is basically the mesa package, right? If the mesa package is split so that the mesa libGL parts are provided separately from the more generic parts, and any GL bits, mesa or otherwise, are only built as a specific machine feature, then we will never have any GL bits in the non-machine part of the sysroot, and will always be dealing with the correct, and only, libGL. Packages that link directly to libGL would also be machine specific, but if we are talking about a hand full things, this is not a major issue. Or I am missing something? Ross, I think it gets unnecessarily complicated if you start thinking of it in the terms of hot-swapping libGL at runtime the way desktop distros do. Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] runstrip() in package.bbclass fails when run against a kernel module
On 04/09/12 10:23, Martin Jansa wrote: Was this for denzil? In master it was fixed a month ago by: http://git.openembedded.org/openembedded-core/commit/meta/classes/package.bbclass?id=a834ab8a6d53cae504fa112a89bab93d726539ec Don't know why they merged your patch to master too now.. Yes, I run into the bug on Denzil and did not see the alternative fix in master; either one of those fixes the problem, of course. Yes but having both in master doesn't make much sense, and someone already asked the older fix to be merged to denzil. I does not do any harm either, but if you prefer to revert that, I will not complain. (Though, I personally prefer fixing the way the function was incorrectly called rather than handling a wrong argument inside it. :) ) Tomas ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] runstrip() in package.bbclass fails when run against a kernel module
runstrip() in package.bbclass fails when run against a kernel module, because it tries to do a bitwise with a 'None' argument. This throws: TypeError: unsupported operand type(s) for : 'NoneType' and 'int'. (This bug triggers, for example, when building ti-linuxutils from meta-ti (v2012.05-yocto1.2 tag) against Denzil.) Patch attached. Tomas From 6abe978d8e0acdb35c1abfed83e775b276b1231f Mon Sep 17 00:00:00 2001 From: Tomas Frydrych to...@sleepfive.com Date: Fri, 31 Aug 2012 12:02:18 +0100 Subject: [PATCH] package.bbclass: fix stripping for kernel modules runstrip(path, elftype, d) does bitwise on the elftype parameter, so it has to be passed an integer. Passing None fails with: TypeError: unsupported operand type(s) for : 'NoneType' and 'int'. Signed-off-by: Tomas Frydrych to...@sleepfive.com --- meta/classes/package.bbclass |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 44e551f..f046fbb 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -877,7 +877,7 @@ python split_and_strip_files () { for f in files: if not f.endswith(.ko): continue -runstrip(os.path.join(root, f), None, d) +runstrip(os.path.join(root, f), 0, d) # # End of strip # -- 1.7.10.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core