Skip to contentSkip to conversation

Recipe upgrades, fixes and additions

PATCH In review Joshua Lock 4 participants 27 messages Nov 8, 2011 – Nov 15, 2011

lore
Share & tools
lore

Joshua Lock

author
#0 lore raw

cover Recipe upgrades, fixes and additions

All,

Here's a series of patches I developed whilst trying to play around with some Clutter based software.

The interesting pieces may be:
Clutter 1.8 series recipes - do we want/need to keep clutter 1.6 around? Are we OK with continuing to namespace the clutter recipes by clutter version?

Gconf - I've pulled in GConf from upstream as the D-Bus backend is maintained there now. For this I pulled in the gnome-related classes from meta-oe as they simplified this recipe and I've been wanting to see them merged for some time.

Pulseaudio - whilst adding a required build dependency I changed the recipe so that it doesn't require X unless the X11 distro feature is enabled.

Cheers,
Joshua

The following changes since commit 0809f98e995d3a2ce24ad25bade3dcd5154061fd:

lighttpd 1.4.29: rename index.html to avoid clashes with DL_DIR (2011-11-07 14:03:38 +0000)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib josh/work
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/work

Joshua Lock (12):
cogl: add cogl 1.8.0 recipe
clutter-1.8: add 1.8.0
clutter-gst-1.8: add 1.4.2 for use with clutter 1.8 clutter-gtk-1.8: add clutter-gtk 0.11.4
mx: add mx toolkit 1.3.2
classes/[gnome|gnomebase|mime]: merge meta-oe's enhance gnome related
classes
gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus
libcanberra: add libvorbis to DEPENDS
gypsy: fix packaging
connman: split scripts into separate package
pulseaudio: make X11 dependencies optional and add gtk+
contacts: fix packaging of icons

 meta/classes/gnome-base.bbclass                    |   15 +++++
 meta/classes/gnome.bbclass                         |   19 +-----
 meta/classes/gnomebase.bbclass                     |   32 +++++++++++
 meta/classes/mime.bbclass                          |   56 +++++++++++++++++++
 meta/conf/distro/include/default-providers.inc     |    2 -
 meta/conf/multilib.conf                            |    2 +-
 meta/recipes-connectivity/connman/connman.inc      |    6 ++-
 meta/recipes-connectivity/gypsy/gypsy_0.8.bb       |    4 +-
 meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch |   59 ++++++++++++++++++++
 meta/recipes-gnome/gnome/gconf-dbus_705.bb         |   43 --------------
 meta/recipes-gnome/gnome/gconf_3.2.3.bb            |   43 ++++++++++++++
 meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb |   26 +++++++++
 .../clutter/clutter-gst-1.8_1.4.2.bb               |   22 +++++++
 .../clutter/clutter-gst/enable_tests-1.8.bb        |   15 +++++
 .../clutter/clutter-gtk-1.8_0.11.4.bb              |   11 ++++
 meta/recipes-graphics/clutter/cogl.inc             |    2 +-
 .../clutter/cogl/macro-versions.patch              |   26 +++++++++
 meta/recipes-graphics/clutter/cogl_1.8.0.bb        |    9 +++
 meta/recipes-graphics/mx/mx_1.3.2.bb               |   17 ++++++
 .../pulseaudio/libcanberra_0.28.bb                 |    2 +-
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    4 +-
 meta/recipes-sato/pimlico/contacts.inc             |    3 +-
 22 files changed, 348 insertions(+), 70 deletions(-)
 create mode 100644 meta/classes/gnome-base.bbclass
 create mode 100644 meta/classes/gnomebase.bbclass
 create mode 100644 meta/classes/mime.bbclass
 create mode 100644 meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch
 delete mode 100644 meta/recipes-gnome/gnome/gconf-dbus_705.bb
 create mode 100644 meta/recipes-gnome/gnome/gconf_3.2.3.bb
 create mode 100644 meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb
 create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb
 create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb
 create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb
 create mode 100644 meta/recipes-graphics/clutter/cogl/macro-versions.patch
 create mode 100644 meta/recipes-graphics/clutter/cogl_1.8.0.bb
 create mode 100644 meta/recipes-graphics/mx/mx_1.3.2.bb
Signature · 1 line
1.7.7
author
#1 lore raw

PATCH 1/12 cogl: add cogl 1.8.0 recipe

Cogl has been split into a separate recipe as of the clutter-1.8 series

Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-graphics/clutter/cogl.inc             |    2 +-
 .../clutter/cogl/macro-versions.patch              |   26 ++++++++++++++++++++
 meta/recipes-graphics/clutter/cogl_1.8.0.bb        |    9 +++++++
 3 files changed, 36 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-graphics/clutter/cogl/macro-versions.patch
 create mode 100644 meta/recipes-graphics/clutter/cogl_1.8.0.bb
meta/recipes-graphics/clutter/cogl.inc +1 -1
index 387f6ec..f264151 100644
@@ -8,7 +8,7 @@ BASE_CONF = "--disable-gtk-doc ${@get_clutter_fpu_setting(bb, d)}"
 DEPENDS = "${STDDEPENDS} virtual/libgl"
 EXTRA_OECONF = "${BASE_CONF} --with-flavour=glx"
 
-FILESPATH = "${FILE_DIRNAME}/clutter"
+FILESPATH = "${FILE_DIRNAME}/cogl"
 
 inherit autotools pkgconfig gtk-doc gettext
meta/recipes-graphics/clutter/cogl/macro-versions.patch new file +26 -0
new file mode 100644
index 0000000..87ea1f7
@@ -0,0 +1,26 @@
+Index: cogl-1.8.0/configure.ac
+===================================================================
+--- cogl-1.8.0.orig/configure.ac
++++ cogl-1.8.0/configure.ac
+@@ -833,7 +833,7 @@ LT_INIT([disable-static])
+ dnl ================================================================
+ dnl I18n stuff.
+ dnl ================================================================
+-AM_GNU_GETTEXT_VERSION([0.17])
++AM_GNU_GETTEXT_VERSION([0.18])
+ AM_GNU_GETTEXT([external])
+ 
+ GETTEXT_PACKAGE="cogl"
+Index: cogl-1.8.0/po/Makefile.in.in
+===================================================================
+--- cogl-1.8.0.orig/po/Makefile.in.in
++++ cogl-1.8.0/po/Makefile.in.in
+@@ -9,7 +9,7 @@
+ # General Public License and is *not* in the public domain.
+ #
+ # Origin: gettext-0.17
+-GETTEXT_MACRO_VERSION = 0.17
++GETTEXT_MACRO_VERSION = 0.18
+ 
+ PACKAGE = @PACKAGE@
+ VERSION = @VERSION@
meta/recipes-graphics/clutter/cogl_1.8.0.bb new file +9 -0
new file mode 100644
index 0000000..02ed67c
@@ -0,0 +1,9 @@
+require cogl.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI = "http://source.clutter-project.org/sources/cogl/1.8/${BPN}-${PV}.tar.bz2 \
+	   file://macro-versions.patch"
+
+SRC_URI[md5sum] = "cd18c28bf3dd0008b072cb9c5eed7821"
+SRC_URI[sha256sum] = "5ed9ee014367058a63d99a13e3fcc8cb8c6acb19ece00195c6df034fd8d8d8c7"
Signature · 1 line
1.7.7
author
#2 lore raw

PATCH 2/12 clutter-1.8: add 1.8.0

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb |   26 ++++++++++++++++++++
 1 files changed, 26 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb
meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb new file +26 -0
new file mode 100644
index 0000000..efafbc2
@@ -0,0 +1,26 @@
+require recipes-graphics/clutter/clutter.inc
+
+PR = "r2"
+
+# Internal json-glib was removed in Clutter 1.5.2
+STDDEPENDS += "json-glib cogl atk"
+
+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-1.4.patch \
+           file://update_gettext_macro_version.patch"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+S = "${WORKDIR}/clutter-${PV}"
+
+BASE_CONF += "--disable-introspection"
+
+do_configure_prepend () {
+	# Disable DOLT
+	sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
+
+SRC_URI[md5sum] = "71454425366d9a49948cdd2af9eafc89"
+SRC_URI[sha256sum] = "79cd42c9a208b1bd2e2a0866ad7eb047a00835beabb401e99737af846812119c"
Signature · 1 line
1.7.7
author
#3 lore raw

PATCH 3/12 clutter-gst-1.8: add 1.4.2 for use with clutter 1.8

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 .../clutter/clutter-gst-1.8_1.4.2.bb               |   22 ++++++++++++++++++++
 .../clutter/clutter-gst/enable_tests-1.8.bb        |   15 +++++++++++++
 2 files changed, 37 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb
 create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb
meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb new file +22 -0
new file mode 100644
index 0000000..54b1fc1
@@ -0,0 +1,22 @@
+require recipes-graphics/clutter/clutter-gst.inc
+
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
+                    file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
+
+DEPENDS += "clutter-1.8 gstreamer"
+RDEPENDS_${PN} += "gst-meta-base"
+
+SRC_URI = "http://source.clutter-project.org/sources/clutter-gst/1.4/clutter-gst-${PV}.tar.bz2 \
+           file://enable_tests-1.8.patch"
+
+S = "${WORKDIR}/clutter-gst-${PV}"
+
+SRC_URI[md5sum] = "fd6b2a54f43d04382748e9e4d8a335c5"
+SRC_URI[sha256sum] = "b0e7ff76ee14307b6d26856972ec9e718f62aec2bc8807fb3f2960e508e578b5"
+
+do_configure_prepend () {
+       # Disable DOLT
+       sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb new file +15 -0
new file mode 100644
index 0000000..35e60ca
@@ -0,0 +1,15 @@
+Install example binary needed for poky-image-clutter
+
+Signed-off-by: Zhai Edwin <[email protected]>
+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) \
Signature · 1 line
1.7.7
#4 lore raw

Re: [PATCH 03/12] clutter-gst-1.8: add 1.4.2 for use with clutter 1.8

Quoted 17 lines · Joshua Lock
Signed-off-by Joshua Lock<[email protected]>
---
  .../clutter/clutter-gst-1.8_1.4.2.bb               |   22 ++++++++++++++++++++
  .../clutter/clutter-gst/enable_tests-1.8.bb        |   15 +++++++++++++
  2 files changed, 37 insertions(+), 0 deletions(-)

create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb

meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb new file +3 -0
new file mode 100644
index 0000000..54b1fc1
@@ -0,0 +1,22 @@
+require recipes-graphics/clutter/clutter-gst.inc
+
+PR = "r0"

meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb line 13

Quoted 10 lines
meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb new file +10 -0
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \
+                    file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
+
+DEPENDS += "clutter-1.8 gstreamer"
+RDEPENDS_${PN} += "gst-meta-base"
+
+SRC_URI = "http://source.clutter-project.org/sources/clutter-gst/1.4/clutter-gst-${PV}.tar.bz2 \
+           file://enable_tests-1.8.patch"
+

We seem to be missing the enable_tests-1.8.patch file

Sau!

Quoted 30 lines
meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb new file +9 -0
+S = "${WORKDIR}/clutter-gst-${PV}"
+
+SRC_URI[md5sum] = "fd6b2a54f43d04382748e9e4d8a335c5"
+SRC_URI[sha256sum] = "b0e7ff76ee14307b6d26856972ec9e718f62aec2bc8807fb3f2960e508e578b5"
+
+do_configure_prepend () {
+       # Disable DOLT
+       sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb new file +15 -0
new file mode 100644
index 0000000..35e60ca
@@ -0,0 +1,15 @@
+Install example binary needed for poky-image-clutter
+
+Signed-off-by: Zhai Edwin<[email protected]>
+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) \
author
#5 lore raw

Re: [PATCH 03/12] clutter-gst-1.8: add 1.4.2 for use with clutter 1.8

Quoted 28 lines · Saul Wold
Quoted 27 lines · Joshua Lock
Signed-off-by Joshua Lock<[email protected]>
---
  .../clutter/clutter-gst-1.8_1.4.2.bb               |   22
++++++++++++++++++++
  .../clutter/clutter-gst/enable_tests-1.8.bb        |   15 +++++++++++++
  2 files changed, 37 insertions(+), 0 deletions(-)

create mode 100644
meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb
create mode 100644
meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb

meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb new file +5 -0
new file mode 100644
index 0000000..54b1fc1
@@ -0,0 +1,22 @@
+require recipes-graphics/clutter/clutter-gst.inc
+
+PR = "r0"
+
+LIC_FILES_CHKSUM =

"file://COPYING;md5=4fbd65380cdd255951079008b364516c \
+ file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"

Quoted 10 lines

meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb

Quoted 9 lines
meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb new file +5 -0
+
+DEPENDS += "clutter-1.8 gstreamer"
+RDEPENDS_${PN} += "gst-meta-base"
+
+SRC_URI =

"http://source.clutter-project.org/sources/clutter-gst/1.4/clutter-gst-${PV}.tar.bz2 \

meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb new file +2 -0
+           file://enable_tests-1.8.patch"
+

We seem to be missing the enable_tests-1.8.patch file

It's further down this email, and in master:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=65ce67a64ea0494e388b7f53275c70df71d06a6b

Joshua

Quoted 36 lines

Sau!

Quoted 33 lines
meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb new file +4 -0
+S = "${WORKDIR}/clutter-gst-${PV}"
+
+SRC_URI[md5sum] = "fd6b2a54f43d04382748e9e4d8a335c5"
+SRC_URI[sha256sum] =

"b0e7ff76ee14307b6d26856972ec9e718f62aec2bc8807fb3f2960e508e578b5"

meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb new file +5 -0
+
+do_configure_prepend () {
+       # Disable DOLT
+       sed -i -e 's/^DOLT//' ${S}/configure.ac
+}

diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb new file mode 100644
index 0000000..35e60ca

meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb new file +15 -0
@@ -0,0 +1,15 @@
+Install example binary needed for poky-image-clutter
+
+Signed-off-by: Zhai Edwin<[email protected]>
+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) \
Signature · 3 lines
Joshua Lock
        Yocto Project "Johannes factotum"
        Intel Open Source Technology Centre
#6 lore raw

Re: [PATCH 03/12] clutter-gst-1.8: add 1.4.2 for use with clutter 1.8

Quoted 42 lines · Joshua Lock
Quoted 28 lines · Saul Wold
Quoted 27 lines · Joshua Lock
Signed-off-by Joshua Lock<[email protected]>
---
   .../clutter/clutter-gst-1.8_1.4.2.bb               |   22
++++++++++++++++++++
   .../clutter/clutter-gst/enable_tests-1.8.bb        |   15 +++++++++++++
   2 files changed, 37 insertions(+), 0 deletions(-)

create mode 100644
meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb
create mode 100644
meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb

meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb new file +5 -0
new file mode 100644
index 0000000..54b1fc1
@@ -0,0 +1,22 @@
+require recipes-graphics/clutter/clutter-gst.inc
+
+PR = "r0"
+
+LIC_FILES_CHKSUM =

"file://COPYING;md5=4fbd65380cdd255951079008b364516c \
+ file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"

Quoted 10 lines

meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb

Quoted 9 lines
meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb new file +5 -0
+
+DEPENDS += "clutter-1.8 gstreamer"
+RDEPENDS_${PN} += "gst-meta-base"
+
+SRC_URI =

"http://source.clutter-project.org/sources/clutter-gst/1.4/clutter-gst-${PV}.tar.bz2 \

meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb new file +2 -0
+           file://enable_tests-1.8.patch"
+

We seem to be missing the enable_tests-1.8.patch file

Quoted 3 lines

It's further down this email, and in master:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=65ce67a64ea0494e388b7f53275c70df71d06a6b

I see an enable-tests-1.8.bb file, but not the enable-tests-1.8.patch

git checkout oe-core
Switched to branch 'oe-core'
[sgw@swold-mobl distro]$ find meta* -name enable_test* meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch

- No 1.8.patch

meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb

Should this be a .patch file not a .bb file?

meta/recipes-graphics/clutter/clutter/enable_tests-0.6.patch meta/recipes-graphics/clutter/clutter/enable_tests-0.8.patch meta/recipes-graphics/clutter/clutter/enable_tests.patch meta/recipes-graphics/clutter/clutter/enable_tests-1.4.patch meta/recipes-graphics/clutter/clutter/enable_tests-1.0.patch

meta/recipes-graphics/clutter/clutter/enable_tests-654c26a1301c9bc5f8e3e5e3b68af5eb1b2e0673.patch meta/recipes-graphics/clutter/clutter-gtk/enable_tests.patch

Quoted 39 lines

Joshua

Quoted 36 lines

Sau!

Quoted 33 lines
meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb new file +4 -0
+S = "${WORKDIR}/clutter-gst-${PV}"
+
+SRC_URI[md5sum] = "fd6b2a54f43d04382748e9e4d8a335c5"
+SRC_URI[sha256sum] =

"b0e7ff76ee14307b6d26856972ec9e718f62aec2bc8807fb3f2960e508e578b5"

meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb new file +5 -0
+
+do_configure_prepend () {
+       # Disable DOLT
+       sed -i -e 's/^DOLT//' ${S}/configure.ac
+}

diff --git a/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb b/meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb new file mode 100644
index 0000000..35e60ca

meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb new file +15 -0
@@ -0,0 +1,15 @@
+Install example binary needed for poky-image-clutter
+
+Signed-off-by: Zhai Edwin<[email protected]>
+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) \
author
#7 lore raw

Re: [PATCH 03/12] clutter-gst-1.8: add 1.4.2 for use with clutter 1.8

Quoted 57 lines · Saul Wold
Quoted 40 lines · Joshua Lock
Quoted 37 lines · Saul Wold
Quoted 36 lines · Joshua Lock
Signed-off-by Joshua Lock<[email protected]>
---
   .../clutter/clutter-gst-1.8_1.4.2.bb               |   22
++++++++++++++++++++
   .../clutter/clutter-gst/enable_tests-1.8.bb        |   15
+++++++++++++
   2 files changed, 37 insertions(+), 0 deletions(-)

create mode 100644
meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb
create mode 100644
meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb

meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb new file +5 -0
new file mode 100644
index 0000000..54b1fc1
@@ -0,0 +1,22 @@
+require recipes-graphics/clutter/clutter-gst.inc
+
+PR = "r0"
+
+LIC_FILES_CHKSUM =

"file://COPYING;md5=4fbd65380cdd255951079008b364516c \
+ file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"

meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb new file +5 -0
+
+DEPENDS += "clutter-1.8 gstreamer"
+RDEPENDS_${PN} += "gst-meta-base"
+
+SRC_URI =

"http://source.clutter-project.org/sources/clutter-gst/1.4/clutter-gst-${PV}.tar.bz2

Quoted 9 lines
Quoted 4 lines

meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb

Quoted 3 lines

\

meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb new file +2 -0
+           file://enable_tests-1.8.patch"
+

We seem to be missing the enable_tests-1.8.patch file

It's further down this email, and in master:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=65ce67a64ea0494e388b7f53275c70df71d06a6b

I see an enable-tests-1.8.bb file, but not the enable-tests-1.8.patc

git checkout oe-core
Switched to branch 'oe-core'
[sgw@swold-mobl distro]$ find meta* -name enable_test* meta/recipes-graphics/clutter/clutter-gst/enable_tests.patch

Quoted 6 lines

- No 1.8.patch

meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.4.patch meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb

Should this be a .patch file not a .bb file?

Well that's embarrassing, no idea how I managed that.

Patch incoming.

Joshua

Signature · 3 lines
Joshua Lock
        Yocto Project "Johannes factotum"
        Intel Open Source Technology Centre
author
#8 lore raw

PATCH 4/12 clutter-gtk-1.8: add clutter-gtk 0.11.4

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 .../clutter/clutter-gtk-1.8_0.11.4.bb              |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb
meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb new file +11 -0
new file mode 100644
index 0000000..0885ce1
@@ -0,0 +1,11 @@
+require recipes-graphics/clutter/clutter-gtk.inc
+
+SRC_URI = "http://source.clutter-project.org/sources/clutter-gtk/0.11/clutter-gtk-${PV}.tar.bz2"
+SRC_URI[md5sum] = "8b88cfcb0358ecfe3e9228efd55f7ebc"
+SRC_URI[sha256sum] = "58d5b027c4589ff442d820f624d7991e25cbeaab795b05f2df2e4c7bc1af2cf6"
+
+DEPENDS += "clutter-1.8"
+
+inherit gettext
+
+S = "${WORKDIR}/clutter-gtk-${PV}"
\ No newline at end of file
Signature · 1 line
1.7.7
author
#9 lore raw

PATCH 5/12 mx: add mx toolkit 1.3.2

In reply to Joshua Lock

A widget toolkit built on Clutter

Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-graphics/mx/mx_1.3.2.bb |   17 +++++++++++++++++
 1 files changed, 17 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-graphics/mx/mx_1.3.2.bb
meta/recipes-graphics/mx/mx_1.3.2.bb new file +17 -0
new file mode 100644
index 0000000..695249b
@@ -0,0 +1,17 @@
+DESCRIPTION = "Clutter based widget library"
+LICENSE = "LGPLv2.1"
+PR = "r1"
+
+DEPENDS = "clutter-1.8"
+
+inherit autotools
+
+SRC_URI = "http://source.clutter-project.org/sources/mx/1.3/mx-${PV}.tar.bz2"
+SRC_URI[md5sum] = "6057f3403d1109191dc7ef492bae5867"
+SRC_URI[sha256sum] = "94fd2b307b204945643af1e3193a2a7be96712f9296cf0e525f5fd7538f85513"
+
+LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
+                    file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879"
+
+EXTRA_OECONF = "--disable-introspection --disable-gtk-widgets"
+
Signature · 1 line
1.7.7
author
#10 lore raw

PATCH 6/12 classes/[gnome|gnomebase|mime]: merge meta-oe's enhance gnome related classes

In reply to Joshua Lock

This patch pulls in the gnome related classes from meta-openembedded which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of the gnome classes functionality without adding all of the extra dependencies.

Signed-off-by Joshua Lock <[email protected]>
---
 meta/classes/gnome-base.bbclass |   15 ++++++++++
 meta/classes/gnome.bbclass      |   19 ++-----------
 meta/classes/gnomebase.bbclass  |   32 ++++++++++++++++++++++
 meta/classes/mime.bbclass       |   56 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 106 insertions(+), 16 deletions(-)
 create mode 100644 meta/classes/gnome-base.bbclass
 create mode 100644 meta/classes/gnomebase.bbclass
 create mode 100644 meta/classes/mime.bbclass
meta/classes/gnome-base.bbclass new file +15 -0
new file mode 100644
index 0000000..378731d
@@ -0,0 +1,15 @@
+def gnome_verdir(v):
+	import re
+	m = re.match("^([0-9]+)\.([0-9]+)", v)
+	return "%s.%s" % (m.group(1), m.group(2))
+
+SECTION ?= "x11/gnome"
+SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.bz2;name=archive"
+
+DEPENDS += "gnome-common"
+
+FILES_${PN} += "${datadir}/application-registry \
+    ${datadir}/mime-info \
+    ${datadir}/gnome-2.0"
+
+inherit autotools pkgconfig
\ No newline at end of file
meta/classes/gnome.bbclass +3 -16
index 3d68b12..0a32a77 100644
@@ -1,17 +1,4 @@
-def gnome_verdir(v):
-	import re
-	m = re.match("^([0-9]+)\.([0-9]+)", v)
-	return "%s.%s" % (m.group(1), m.group(2))
+inherit gnomebase gtk-icon-cache gconf mime
 
-SECTION ?= "x11/gnome"
-SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.bz2;name=archive"
-
-DEPENDS += "gnome-common"
-
-FILES_${PN} += "${datadir}/application-registry \
-    ${datadir}/mime-info \
-    ${datadir}/gnome-2.0"
-
-inherit autotools pkgconfig gconf
-
-EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
+EXTRA_OECONF += "--enable-introspection=no"
+BBCLASSEXTEND += "native"
meta/classes/gnomebase.bbclass new file +32 -0
new file mode 100644
index 0000000..5a332a0
@@ -0,0 +1,32 @@
+def gnome_verdir(v):
+	import re
+	m = re.match("^([0-9]+)\.([0-9]+)", v)
+	return "%s.%s" % (m.group(1), m.group(2))
+
+SECTION ?= "x11/gnome"
+SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.bz2;name=archive"
+
+DEPENDS += "gnome-common"
+
+FILES_${PN} += "${datadir}/application-registry  \
+	${datadir}/mime-info \
+	${datadir}/mime/packages \	
+	${datadir}/mime/application \
+	${datadir}/gnome-2.0 \
+	${datadir}/polkit* \
+	${datadir}/GConf \
+	${datadir}/glib-2.0/schemas \
+"
+
+FILES_${PN}-doc += "${datadir}/devhelp"
+
+inherit autotools pkgconfig
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_install_append() {
+	rm -rf ${D}${localstatedir}/lib/scrollkeeper/*
+	rm -rf ${D}${localstatedir}/scrollkeeper/*
+	rm -f ${D}${datadir}/applications/*.cache
+}
+
meta/classes/mime.bbclass new file +56 -0

56 lines not on this page · raw message

Signature · 1 line
1.7.7
#11 lore raw

Re: [PATCH 06/12] classes/[gnome|gnomebase|mime]: merge meta-oe's enhance gnome related classes

Quoted 6 lines · Joshua Lock

This patch pulls in the gnome related classes from meta-openembedded which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of the gnome classes functionality without adding all of the extra dependencies.

Signed-off-by Joshua Lock <[email protected]>
Quoted 8 lines
---
 meta/classes/gnome-base.bbclass |   15 ++++++++++
 meta/classes/gnome.bbclass      |   19 ++-----------
 meta/classes/gnomebase.bbclass  |   32 ++++++++++++++++++++++
 meta/classes/mime.bbclass       |   56 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 106 insertions(+), 16 deletions(-)
 create mode 100644 meta/classes/gnome-base.bbclass
 create mode 100644 meta/classes/gnomebase.bbclass

Couldn't we have better names for these? What is the difference betweem gnome base and gnomebase?

Quoted 39 lines
 create mode 100644 meta/classes/mime.bbclass
meta/classes/gnome-base.bbclass new file +15 -0
new file mode 100644
index 0000000..378731d
@@ -0,0 +1,15 @@
+def gnome_verdir(v):
+	import re
+	m = re.match("^([0-9]+)\.([0-9]+)", v)
+	return "%s.%s" % (m.group(1), m.group(2))
+
+SECTION ?= "x11/gnome"
+SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.bz2;name=archive"
+
+DEPENDS += "gnome-common"
+
+FILES_${PN} += "${datadir}/application-registry \
+    ${datadir}/mime-info \
+    ${datadir}/gnome-2.0"
+
+inherit autotools pkgconfig
\ No newline at end of file
meta/classes/gnome.bbclass +1 -8
index 3d68b12..0a32a77 100644
@@ -1,17 +1,4 @@
-def gnome_verdir(v):
-	import re
-	m = re.match("^([0-9]+)\.([0-9]+)", v)
-	return "%s.%s" % (m.group(1), m.group(2))
+inherit gnomebase gtk-icon-cache gconf mime
 
-SECTION ?= "x11/gnome"
-SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.bz2;name=archive"
-
-DEPENDS += "gnome-common"

meta/classes/gnome.bbclass line 4

Quoted 10 lines
meta/classes/gnome.bbclass +2 -8
-
-FILES_${PN} += "${datadir}/application-registry \
-    ${datadir}/mime-info \
-    ${datadir}/gnome-2.0"
-
-inherit autotools pkgconfig gconf
-
-EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
+EXTRA_OECONF += "--enable-introspection=no"
+BBCLASSEXTEND += "native"

Do we really need to BBCLASSEXTEND every gnome recipe?

Quoted 21 lines
meta/classes/gnomebase.bbclass new file +15 -0
new file mode 100644
index 0000000..5a332a0
@@ -0,0 +1,32 @@
+def gnome_verdir(v):
+	import re
+	m = re.match("^([0-9]+)\.([0-9]+)", v)
+	return "%s.%s" % (m.group(1), m.group(2))
+
+SECTION ?= "x11/gnome"
+SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.bz2;name=archive"
+
+DEPENDS += "gnome-common"
+
+FILES_${PN} += "${datadir}/application-registry  \
+	${datadir}/mime-info \
+	${datadir}/mime/packages \	
+	${datadir}/mime/application \
+	${datadir}/gnome-2.0 \

meta/classes/gnomebase.bbclass line 25

Quoted 10 lines
meta/classes/gnomebase.bbclass new file +10 -0
+	${datadir}/polkit* \
+	${datadir}/GConf \
+	${datadir}/glib-2.0/schemas \
+"
+
+FILES_${PN}-doc += "${datadir}/devhelp"
+
+inherit autotools pkgconfig
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"

That variable is long dead, please don't bring it back :)

Quoted 13 lines
meta/classes/gnomebase.bbclass new file +7 -0
+
+do_install_append() {
+	rm -rf ${D}${localstatedir}/lib/scrollkeeper/*
+	rm -rf ${D}${localstatedir}/scrollkeeper/*
+	rm -f ${D}${datadir}/applications/*.cache
+}
+
meta/classes/mime.bbclass new file +0 -0
new file mode 100644
index 0000000..b9cdd7b

meta/classes/mime.bbclass line 5

Quoted 5 lines
meta/classes/mime.bbclass new file +5 -0
@@ -0,0 +1,56 @@
+DEPENDS += "shared-mime-info-native shared-mime-info"
+
+mime_postinst() {
+if [ "$1" = configure ]; then
+	if [ -x ${bindir}/update-mime-database ] ; then

This is wrong, it will use update-mime-database from the build system. We should really use which to see if its available from the environment and use PATH to resolve it.

meta/classes/mime.bbclass line 7

Quoted 2 lines
meta/classes/mime.bbclass new file +2 -0
+		echo "Updating MIME database... this may take a while."
+		update-mime-database $D${datadir}/mime

This however is using $D correctly making the above error all the more bizarre!

meta/classes/mime.bbclass line 17

Quoted 10 lines
meta/classes/mime.bbclass new file +10 -0
+	else
+		echo "Missing ${bindir}/update-mime-database, update of mime database failed!"
+		exit 1
+	fi
+fi
+}
+
+mime_postrm() {
+if [ "$1" = remove ] || [ "$1" = upgrade ]; then
+	if [ -x ${bindir}/update-mime-database ] ; then

ditto.

Quoted 29 lines
meta/classes/mime.bbclass new file +29 -0
+		echo "Updating MIME database... this may take a while."
+		update-mime-database $D${datadir}/mime
+	else
+		echo "Missing ${bindir}/update-mime-database, update of mime database failed!"
+		exit 1
+	fi
+fi
+}
+
+python ppopulate_packages_append () {
+	import os.path, re
+	packages = bb.data.getVar('PACKAGES', d, 1).split()
+	pkgdest =  bb.data.getVar('PKGDEST', d, 1)
+	
+	for pkg in packages:
+		mime_dir = '%s/%s/usr/share/mime/packages' % (pkgdest, pkg)
+		mimes = []
+		mime_re = re.compile(".*\.xml$")
+		if os.path.exists(mime_dir):
+			for f in os.listdir(mime_dir):
+				if mime_re.match(f):
+					mimes.append(f)
+		if mimes != []:
+			bb.note("adding mime postinst and postrm scripts to %s" % pkg)
+			postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
+			if not postinst:
+				postinst = '#!/bin/sh\n'
+			postinst += bb.data.getVar('mime_postinst', d, 1)
+			bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)

meta/classes/mime.bbclass line 56

Quoted 10 lines
meta/classes/mime.bbclass new file +10 -0
+			postrm = bb.data.getVar('pkg_postrm_%s' % pkg, d, 1) or bb.data.getVar('pkg_postrm', d, 1)
+			if not postrm:
+				postrm = '#!/bin/sh\n'
+			postrm += bb.data.getVar('mime_postrm', d, 1)
+			bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d)
+			bb.note("adding freedesktop-mime-info dependency to %s" % pkg)
+			rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "")
+			rdepends.append("freedesktop-mime-info")
+			bb.data.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends), d)
+}

We don't have freedesktop-mime-info do we? Shouldn't this also check DEPENDS and error out if it wasn't in DEPENDS else rootfs construction will fail.

Cheers,

Richard

author
#12 lore raw

Re: [PATCH 06/12] classes/[gnome|gnomebase|mime]: merge meta-oe's enhance gnome related classes

Quoted 16 lines · Richard Purdie
Quoted 6 lines · Joshua Lock

This patch pulls in the gnome related classes from meta-openembedded which adds extra packaging rules and functionality whilst modularising things so that one can get a subset of the gnome classes functionality without adding all of the extra dependencies.

Signed-off-by Joshua Lock <[email protected]>
Quoted 8 lines
---
 meta/classes/gnome-base.bbclass |   15 ++++++++++
 meta/classes/gnome.bbclass      |   19 ++-----------
 meta/classes/gnomebase.bbclass  |   32 ++++++++++++++++++++++
 meta/classes/mime.bbclass       |   56 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 106 insertions(+), 16 deletions(-)
 create mode 100644 meta/classes/gnome-base.bbclass
 create mode 100644 meta/classes/gnomebase.bbclass
Quoted 2 lines

Couldn't we have better names for these? What is the difference betweem gnome base and gnomebase?

Oh, whoops - gnome-base is the class I wrote to facilitate the GConf recipe before realising/recalling that meta-oe probably had something similar. gnome-base is redundant here. Apologies for the noise.

Quoted 11 lines
Quoted 11 lines
meta/classes/gnome.bbclass +1 -4
index 3d68b12..0a32a77 100644
@@ -1,17 +1,4 @@
-def gnome_verdir(v):
-	import re
-	m = re.match("^([0-9]+)\.([0-9]+)", v)
-	return "%s.%s" % (m.group(1), m.group(2))
+inherit gnomebase gtk-icon-cache gconf mime
Quoted 16 lines
Quoted 4 lines
meta/classes/gnome.bbclass +0 -4
-SECTION ?= "x11/gnome"
-SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.bz2;name=archive"
-
-DEPENDS += "gnome-common"

meta/classes/gnome.bbclass line 4

Quoted 10 lines
meta/classes/gnome.bbclass +2 -8
-
-FILES_${PN} += "${datadir}/application-registry \
-    ${datadir}/mime-info \
-    ${datadir}/gnome-2.0"
-
-inherit autotools pkgconfig gconf
-
-EXTRA_OEMAKE += "GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1"
+EXTRA_OECONF += "--enable-introspection=no"
+BBCLASSEXTEND += "native"

Do we really need to BBCLASSEXTEND every gnome recipe?

Probably not.

Quoted 26 lines
Quoted 26 lines
meta/classes/gnomebase.bbclass new file +19 -0
new file mode 100644
index 0000000..5a332a0
@@ -0,0 +1,32 @@
+def gnome_verdir(v):
+	import re
+	m = re.match("^([0-9]+)\.([0-9]+)", v)
+	return "%s.%s" % (m.group(1), m.group(2))
+
+SECTION ?= "x11/gnome"
+SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.bz2;name=archive"
+
+DEPENDS += "gnome-common"
+
+FILES_${PN} += "${datadir}/application-registry  \
+	${datadir}/mime-info \
+	${datadir}/mime/packages \	
+	${datadir}/mime/application \
+	${datadir}/gnome-2.0 \
+	${datadir}/polkit* \
+	${datadir}/GConf \
+	${datadir}/glib-2.0/schemas \
+"
Quoted 8 lines

meta/classes/gnomebase.bbclass line 25

Quoted 6 lines
meta/classes/gnomebase.bbclass new file +6 -0
+
+FILES_${PN}-doc += "${datadir}/devhelp"
+
+inherit autotools pkgconfig
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"

That variable is long dead, please don't bring it back :)

*whistles*

Quoted 15 lines
Quoted 15 lines
meta/classes/gnomebase.bbclass new file +7 -0
+
+do_install_append() {
+	rm -rf ${D}${localstatedir}/lib/scrollkeeper/*
+	rm -rf ${D}${localstatedir}/scrollkeeper/*
+	rm -f ${D}${datadir}/applications/*.cache
+}
+
meta/classes/mime.bbclass new file +1 -0
new file mode 100644
index 0000000..b9cdd7b
@@ -0,0 +1,56 @@
+DEPENDS += "shared-mime-info-native shared-mime-info"
Quoted 8 lines

meta/classes/mime.bbclass line 5

Quoted 4 lines
meta/classes/mime.bbclass new file +4 -0
+
+mime_postinst() {
+if [ "$1" = configure ]; then
+	if [ -x ${bindir}/update-mime-database ] ; then

This is wrong, it will use update-mime-database from the build system. We should really use which to see if its available from the environment and use PATH to resolve it.

Will do.

Quoted 55 lines

meta/classes/mime.bbclass line 7

Quoted 3 lines
meta/classes/mime.bbclass new file +2 -0
+		echo "Updating MIME database... this may take a while."
+		update-mime-database $D${datadir}/mime

This however is using $D correctly making the above error all the more bizarre!

meta/classes/mime.bbclass line 17

Quoted 10 lines
meta/classes/mime.bbclass new file +10 -0
+	else
+		echo "Missing ${bindir}/update-mime-database, update of mime database failed!"
+		exit 1
+	fi
+fi
+}
+
+mime_postrm() {
+if [ "$1" = remove ] || [ "$1" = upgrade ]; then
+	if [ -x ${bindir}/update-mime-database ] ; then

ditto.

Quoted 35 lines
meta/classes/mime.bbclass new file +35 -0
+		echo "Updating MIME database... this may take a while."
+		update-mime-database $D${datadir}/mime
+	else
+		echo "Missing ${bindir}/update-mime-database, update of mime database failed!"
+		exit 1
+	fi
+fi
+}
+
+python ppopulate_packages_append () {
+	import os.path, re
+	packages = bb.data.getVar('PACKAGES', d, 1).split()
+	pkgdest =  bb.data.getVar('PKGDEST', d, 1)
+	
+	for pkg in packages:
+		mime_dir = '%s/%s/usr/share/mime/packages' % (pkgdest, pkg)
+		mimes = []
+		mime_re = re.compile(".*\.xml$")
+		if os.path.exists(mime_dir):
+			for f in os.listdir(mime_dir):
+				if mime_re.match(f):
+					mimes.append(f)
+		if mimes != []:
+			bb.note("adding mime postinst and postrm scripts to %s" % pkg)
+			postinst = bb.data.getVar('pkg_postinst_%s' % pkg, d, 1) or bb.data.getVar('pkg_postinst', d, 1)
+			if not postinst:
+				postinst = '#!/bin/sh\n'
+			postinst += bb.data.getVar('mime_postinst', d, 1)
+			bb.data.setVar('pkg_postinst_%s' % pkg, postinst, d)
+			postrm = bb.data.getVar('pkg_postrm_%s' % pkg, d, 1) or bb.data.getVar('pkg_postrm', d, 1)
+			if not postrm:
+				postrm = '#!/bin/sh\n'
+			postrm += bb.data.getVar('mime_postrm', d, 1)
+			bb.data.setVar('pkg_postrm_%s' % pkg, postrm, d)
+			bb.note("adding freedesktop-mime-info dependency to %s" % pkg)
Quoted 9 lines

meta/classes/mime.bbclass line 56

Quoted 4 lines
meta/classes/mime.bbclass new file +4 -0
+			rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "")
+			rdepends.append("freedesktop-mime-info")
+			bb.data.setVar('RDEPENDS_' + pkg, " " + " ".join(rdepends), d)
+}

We don't have freedesktop-mime-info do we? Shouldn't this also check DEPENDS and error out if it wasn't in DEPENDS else rootfs construction will fail.

Hmm, definitely needs more investigation. I'll spin a v2 with your comments addressed, thanks for the review.

Cheers,
Joshua

Signature · 3 lines
Joshua Lock
        Yocto Project "Johannes factotum"
        Intel Open Source Technology Centre
author
#13 lore raw

PATCH 7/12 gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus

In reply to Joshua Lock

The D-Bus backend has been integrated into upstream GConf so we can switch to upstream and drop gconf-dbus.

This patch adds a release in the 3.2 series as we disable Gtk+, and therefore are not impacted by the gtk+3 requirement, and the D-Bus backend was reportedly unstable before this release.

Furthermore I've aligned some of the metadata with the meta-oe gconf recipe to hopefully enable them to use a bbappended version of the core's recipe.

Signed-off-by Joshua Lock <[email protected]>
---
 meta/conf/distro/include/default-providers.inc     |    2 -
 meta/conf/multilib.conf                            |    2 +-
 meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch |   59 ++++++++++++++++++++
 meta/recipes-gnome/gnome/gconf-dbus_705.bb         |   43 --------------
 meta/recipes-gnome/gnome/gconf_3.2.3.bb            |   43 ++++++++++++++
 5 files changed, 103 insertions(+), 46 deletions(-)
 create mode 100644 meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch
 delete mode 100644 meta/recipes-gnome/gnome/gconf-dbus_705.bb
 create mode 100644 meta/recipes-gnome/gnome/gconf_3.2.3.bb
meta/conf/distro/include/default-providers.inc +0 -2
index be23d36..afea5e7 100644
@@ -21,8 +21,6 @@ VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-cworth"
 #
 PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib"
 PREFERRED_PROVIDER_dbus-glib-native ?= "dbus-glib-native"
-PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
-PREFERRED_PROVIDER_gconf-native ?= "gconf-dbus-native"
 PREFERRED_PROVIDER_gdk-pixbuf ?= "gdk-pixbuf"
 PREFERRED_PROVIDER_libgcc ?= "libgcc"
 PREFERRED_PROVIDER_libgcc-nativesdk ?= "libgcc-nativesdk"
meta/conf/multilib.conf +1 -1
index 5e4b435..de53540 100644
@@ -103,7 +103,7 @@ BBCLASSEXTEND_append_pn-gcc-cross-initial = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gcc-cross-intermediate = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gcc-cross = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gcc-runtime = " ${MULTILIBS}"
-BBCLASSEXTEND_append_pn-gconf-dbus = " ${MULTILIBS}"
+BBCLASSEXTEND_append_pn-gconf = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gdbm = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gdb = " ${MULTILIBS}"
 BBCLASSEXTEND_append_pn-gdk-pixbuf = " ${MULTILIBS}"
meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch new file +59 -0

59 lines not on this page · raw message

meta/recipes-gnome/gnome/gconf-dbus_705.bb deleted +0 -43

43 lines not on this page · raw message

meta/recipes-gnome/gnome/gconf_3.2.3.bb new file +43 -0

43 lines not on this page · raw message

Signature · 1 line
1.7.7
author
#14 lore raw

PATCH 8/12 libcanberra: add libvorbis to DEPENDS

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 .../pulseaudio/libcanberra_0.28.bb                 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-multimedia/pulseaudio/libcanberra_0.28.bb +1 -1
index 432a831..e69c89d 100644
@@ -4,7 +4,7 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
                     file://src/canberra.h;beginline=7;endline=24;md5=c616c687cf8da540a14f917e0d23ab03"
 
-DEPENDS = "gtk+ pulseaudio alsa-lib libtool"
+DEPENDS = "gtk+ pulseaudio alsa-lib libtool libvorbis"
 PR = "r1"
 
 inherit gconf autotools
Signature · 1 line
1.7.7
author
#15 lore raw

PATCH 9/12 gypsy: fix packaging

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-connectivity/gypsy/gypsy_0.8.bb |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-connectivity/gypsy/gypsy_0.8.bb +2 -2
index f3d3fa7..59a34fa 100644
@@ -16,11 +16,11 @@ DEPENDS = "glib-2.0 dbus bluez4 dbus-glib libxslt"
 SRC_URI = "http://gypsy.freedesktop.org/releases/gypsy-${PV}.tar.gz \
            file://fix-unused-but-set-variable-warning.patch \
           "
-PR = "r1"
+PR = "r2"
 
 inherit autotools pkgconfig
 
-FILES_${PN} += "/usr/share/dbus-1/services/"
+FILES_${PN} += "/usr/share/dbus-1/system-services/"
 
 SRC_URI[md5sum] = "32b8db24db86d2dac87b391dd255f4bf"
 SRC_URI[sha256sum] = "1986a58189614a950725c3bc7d05faa3b84695f35cb696326f340ef87fc3acaa"
Signature · 1 line
1.7.7
author
#16 lore raw

PATCH 10/12 connman: split scripts into separate package

In reply to Joshua Lock

The connman scripts are useless without a Python interpreter so split them into a separate package and add Python to its RDEPENDS.

Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-connectivity/connman/connman.inc |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
meta/recipes-connectivity/connman/connman.inc +5 -1
index 480b59c..e86bd9f 100644
@@ -30,6 +30,9 @@ do_install_append() {
     install -m 0755 ${WORKDIR}/connman ${D}${sysconfdir}/init.d/connman
 }
 
+PACKAGES += "${PN}-scripts"
+RDEPENDS_${PN}-scripts += "python"
+
 PACKAGES_DYNAMIC = "${PN}-plugin-*"
 FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
             ${sysconfdir} ${sharedstatedir} ${localstatedir} \

@@ -37,7 +40,6 @@ FILES_${PN} = "${bindir}/* ${sbindir}/* ${libexecdir}/* ${libdir}/lib*.so.* \
             ${datadir}/pixmaps ${datadir}/applications \
             ${datadir}/idl ${datadir}/omf ${datadir}/sounds \
             ${libdir}/bonobo/servers \
-            ${libdir}/${PN}/test/* \
             ${datadir}/dbus-1/system-services/* \
             ${libdir}/connman/scripts/dhclient*"
 FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \

@@ -45,6 +47,8 @@ FILES_${PN}-dbg += "${libdir}/connman/plugins/.debug \
 
 FILES_${PN}-dev += "${libdir}/connman/plugins/*.la"
 
+FILES_${PN}-scripts += "${libdir}/${PN}/test/*"
+
 python populate_packages_prepend() {
 	prefix = (d.getVar("MLPREFIX", True) or "")
 	depmap = dict( wifi=prefix+"wpa-supplicant", bluetooth=prefix+"bluez4", ofono=prefix+"ofono" )
Signature · 1 line
1.7.7
#17 lore raw

Re: [PATCH 10/12] connman: split scripts into separate package

Op 8 nov. 2011, om 01:10 heeft Joshua Lock het volgende geschreven:

Quoted 2 lines

The connman scripts are useless without a Python interpreter so split them into a separate package and add Python to its RDEPENDS.

python, python-core or even python-core + modules?

regards,

Koen

author
#18 lore raw

PATCH 11/12 pulseaudio: make X11 dependencies optional and add gtk+

In reply to Joshua Lock

Use the x11 distro feature to determine whether --with-x should be passed. Further, if we're using X11 add gtk+ to DEPENDS (it's required to build).

Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-multimedia/pulseaudio/pulseaudio.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-multimedia/pulseaudio/pulseaudio.inc +2 -2
index bb32467..c581eae 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://GPL;md5=4325afd396febcb659c36b49533135d4 \
                     file://LGPL;md5=2d5025d4aa3495befef8f17206a5b0a1 \
                     file://src/modules/bluetooth/proximity-helper.c;beginline=1;endline=25;md5=e4cc710e40a4d900c2c294167bc58270 \
                     file://src/pulsecore/vector.h;beginline=1;endline=21;md5=1b561f0a2ca47b1fa49862a6ccaacff1"
-DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool virtual/libx11"
+DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool ${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 gtk+', '', d)}"
 # optional
 DEPENDS += "udev alsa-lib glib-2.0 dbus consolekit \
            ${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluez4', '', d)}"

@@ -22,7 +22,7 @@ EXTRA_OECONF = "\
 		--disable-lynx \
 		${@base_contains('DISTRO_FEATURES', 'bluetooth', '--enable-bluez', '--disable-bluez', d)} \
 		--disable-polkit \
-		--with-x \
+		${@base_contains('DISTRO_FEATURES', 'x11', '--with-x', '--without-x', d)} \
 		--without-jack \
 		--with-glib \
 		--with-alsa \
Signature · 1 line
1.7.7
author
#19 lore raw

PATCH 12/12 contacts: fix packaging of icons

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-sato/pimlico/contacts.inc |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)
meta/recipes-sato/pimlico/contacts.inc +2 -1
index ce990d7..52c65ec 100644
@@ -23,7 +23,8 @@ do_install_append () {
 }
 
 FILES_${PN} += "${datadir}/pixmaps/stock_contact.png \
-		${datadir}/pixmaps/stock_person.png"
+		${datadir}/pixmaps/stock_person.png \
+		${datadir}/icons/hicolor"
 
 SRC_URI = "file://stock_contact.png \
            file://stock_person.png"
Signature · 1 line
1.7.7
#20 lore raw
In reply to Joshua Lock
Quoted 9 lines · Joshua Lock

All,

Here's a series of patches I developed whilst trying to play around with some Clutter based software.

The interesting pieces may be:
Clutter 1.8 series recipes - do we want/need to keep clutter 1.6 around? Are we OK with continuing to namespace the clutter recipes by clutter version?

Yes, I think this makes sense.

Quoted 3 lines

Gconf - I've pulled in GConf from upstream as the D-Bus backend is maintained there now. For this I pulled in the gnome-related classes from meta-oe as they simplified this recipe and I've been wanting to see them merged for some time.

I had to drop this patch as the gnome classes need a bit more work. I'd like to get gconf resolved though.

Quoted 3 lines

Pulseaudio - whilst adding a required build dependency I changed the recipe so that it doesn't require X unless the X11 distro feature is enabled.

So I merged the series apart from the gnome class and gconf pieces.

Cheers,

Richard

#21 lore raw
Quoted 6 lines · Richard Purdie
Quoted 5 lines · Joshua Lock

All,

Here's a series of patches I developed whilst trying to play around with some Clutter based software.

Quoted 7 lines
Quoted 4 lines

The interesting pieces may be:
Clutter 1.8 series recipes - do we want/need to keep clutter 1.6 around? Are we OK with continuing to namespace the clutter recipes by clutter version?

Yes, I think this makes sense.

Yes to maintaining the version number, but not sure we want to keep 1.6 around, also do you need to add a similar .bbappend for clutter-1.8 for the meta-yocto atom-pc configuration?

Sau!

Quoted 23 lines
Quoted 3 lines

Gconf - I've pulled in GConf from upstream as the D-Bus backend is maintained there now. For this I pulled in the gnome-related classes from meta-oe as they simplified this recipe and I've been wanting to see them merged for some time.

I had to drop this patch as the gnome classes need a bit more work. I'd like to get gconf resolved though.

Quoted 3 lines

Pulseaudio - whilst adding a required build dependency I changed the recipe so that it doesn't require X unless the X11 distro feature is enabled.

So I merged the series apart from the gnome class and gconf pieces.

Cheers,

Richard

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#22 lore raw
In reply to Richard Purdie
Quoted 6 lines · Richard Purdie
Quoted 5 lines · Joshua Lock

All,

Here's a series of patches I developed whilst trying to play around with some Clutter based software.

Quoted 6 lines
Quoted 4 lines

The interesting pieces may be:
Clutter 1.8 series recipes - do we want/need to keep clutter 1.6 around? Are we OK with continuing to namespace the clutter recipes by clutter version?

Yes, I think this makes sense.

Why do we want to continue the clutter the namespace with version numbers? Was this not for a past issue with mis-matched API/ABI?

If that problem is solved, then next remove that version info.

Sau!

Quoted 24 lines
Quoted 4 lines

Gconf - I've pulled in GConf from upstream as the D-Bus backend is maintained there now. For this I pulled in the gnome-related classes from meta-oe as they simplified this recipe and I've been wanting to see them merged for some time.

I had to drop this patch as the gnome classes need a bit more work. I'd like to get gconf resolved though.

Quoted 3 lines

Pulseaudio - whilst adding a required build dependency I changed the recipe so that it doesn't require X unless the X11 distro feature is enabled.

So I merged the series apart from the gnome class and gconf pieces.

Cheers,

Richard

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

#23 lore raw
Quoted 12 lines · Saul Wold
Quoted 11 lines · Richard Purdie
Quoted 9 lines · Joshua Lock

All,

Here's a series of patches I developed whilst trying to play around with some Clutter based software.

The interesting pieces may be:
Clutter 1.8 series recipes - do we want/need to keep clutter 1.6 around? Are we OK with continuing to namespace the clutter recipes by clutter version?

Quoted 6 lines
Quoted 1 line

Yes, I think this makes sense.

Why do we want to continue the clutter the namespace with version numbers? Was this not for a past issue with mis-matched API/ABI?

If that problem is solved, then next remove that version info.

Clutter produces libraries with a very specific namespace so you can parallel install clutter 1.4, 1.6 and 1.8. Applications compile against a given version of the library.

Having the major lib version as part of the package name therefore makes sense. There aren't a lot of projects that do this but this one does and it continues to make sense to namespace it accordingly.

Cheers,

Richard

author
#24 lore raw
Quoted 20 lines · Richard Purdie
Quoted 12 lines · Saul Wold
Quoted 11 lines · Richard Purdie
Quoted 9 lines · Joshua Lock

All,

Here's a series of patches I developed whilst trying to play around with some Clutter based software.

The interesting pieces may be:
Clutter 1.8 series recipes - do we want/need to keep clutter 1.6 around? Are we OK with continuing to namespace the clutter recipes by clutter version?

Quoted 6 lines
Quoted 1 line

Yes, I think this makes sense.

Why do we want to continue the clutter the namespace with version numbers? Was this not for a past issue with mis-matched API/ABI?

If that problem is solved, then next remove that version info.

Quoted 7 lines

Clutter produces libraries with a very specific namespace so you can parallel install clutter 1.4, 1.6 and 1.8. Applications compile against a given version of the library.

Having the major lib version as part of the package name therefore makes sense. There aren't a lot of projects that do this but this one does and it continues to make sense to namespace it accordingly.

With this knowledge "in hand" I've just re-read the 1.8 release notes[1] and, for better or for worse, this is no longer the case:

"
* This version is API and ABI compatible with the current stable release of Clutter.
* Installing the contents of this release will overwrite the files from the installation of the current release of Clutter.
"

For point 1 I'd added a patch to PROVIDES = "clutter-1.6" but I'm not sure what makes sense in the context of point 2.

Cheers,
Joshua

1.
http://www.clutter-project.org/blogs/archive/2011-09/clutter-1.8.0-stable-release

Signature · 3 lines
Joshua Lock
        Yocto Project "Johannes factotum"
        Intel Open Source Technology Centre
#25 lore raw
In reply to Joshua Lock
Quoted 5 lines · Joshua Lock

All,

Here's a series of patches I developed whilst trying to play around with some Clutter based software.

Did you look at the clutter_git versions at all? I thought I recently saw a problem with clutter_git also with COGL.

Sau!

Quoted 75 lines

The interesting pieces may be:
Clutter 1.8 series recipes - do we want/need to keep clutter 1.6 around? Are we OK with continuing to namespace the clutter recipes by clutter version?

Gconf - I've pulled in GConf from upstream as the D-Bus backend is maintained there now. For this I pulled in the gnome-related classes from meta-oe as they simplified this recipe and I've been wanting to see them merged for some time.

Pulseaudio - whilst adding a required build dependency I changed the recipe so that it doesn't require X unless the X11 distro feature is enabled.

Cheers,
Joshua

The following changes since commit 0809f98e995d3a2ce24ad25bade3dcd5154061fd:

   lighttpd 1.4.29: rename index.html to avoid clashes with DL_DIR (2011-11-07 14:03:38 +0000)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib josh/work
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/work

Joshua Lock (12):
cogl: add cogl 1.8.0 recipe
clutter-1.8: add 1.8.0
clutter-gst-1.8: add 1.4.2 for use with clutter 1.8 clutter-gtk-1.8: add clutter-gtk 0.11.4
mx: add mx toolkit 1.3.2
classes/[gnome|gnomebase|mime]: merge meta-oe's enhance gnome related
classes
gconf: add upstream GNOME gconf 3.2.3 and drop gconf-dbus
libcanberra: add libvorbis to DEPENDS
gypsy: fix packaging
connman: split scripts into separate package
pulseaudio: make X11 dependencies optional and add gtk+
contacts: fix packaging of icons

  meta/classes/gnome-base.bbclass                    |   15 +++++
  meta/classes/gnome.bbclass                         |   19 +-----
  meta/classes/gnomebase.bbclass                     |   32 +++++++++++
  meta/classes/mime.bbclass                          |   56 +++++++++++++++++++
  meta/conf/distro/include/default-providers.inc     |    2 -
  meta/conf/multilib.conf                            |    2 +-
  meta/recipes-connectivity/connman/connman.inc      |    6 ++-
  meta/recipes-connectivity/gypsy/gypsy_0.8.bb       |    4 +-
  meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch |   59 ++++++++++++++++++++
  meta/recipes-gnome/gnome/gconf-dbus_705.bb         |   43 --------------
  meta/recipes-gnome/gnome/gconf_3.2.3.bb            |   43 ++++++++++++++
  meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb |   26 +++++++++
  .../clutter/clutter-gst-1.8_1.4.2.bb               |   22 +++++++
  .../clutter/clutter-gst/enable_tests-1.8.bb        |   15 +++++
  .../clutter/clutter-gtk-1.8_0.11.4.bb              |   11 ++++
  meta/recipes-graphics/clutter/cogl.inc             |    2 +-
  .../clutter/cogl/macro-versions.patch              |   26 +++++++++
  meta/recipes-graphics/clutter/cogl_1.8.0.bb        |    9 +++
  meta/recipes-graphics/mx/mx_1.3.2.bb               |   17 ++++++
  .../pulseaudio/libcanberra_0.28.bb                 |    2 +-
  meta/recipes-multimedia/pulseaudio/pulseaudio.inc  |    4 +-
  meta/recipes-sato/pimlico/contacts.inc             |    3 +-
  22 files changed, 348 insertions(+), 70 deletions(-)

create mode 100644 meta/classes/gnome-base.bbclass
create mode 100644 meta/classes/gnomebase.bbclass
create mode 100644 meta/classes/mime.bbclass
create mode 100644 meta/recipes-gnome/gnome/gconf-3.2.3/nointro.patch delete mode 100644 meta/recipes-gnome/gnome/gconf-dbus_705.bb create mode 100644 meta/recipes-gnome/gnome/gconf_3.2.3.bb
create mode 100644 meta/recipes-graphics/clutter/clutter-1.8_1.8.0.bb create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.8_1.4.2.bb create mode 100644 meta/recipes-graphics/clutter/clutter-gst/enable_tests-1.8.bb create mode 100644 meta/recipes-graphics/clutter/clutter-gtk-1.8_0.11.4.bb create mode 100644 meta/recipes-graphics/clutter/cogl/macro-versions.patch create mode 100644 meta/recipes-graphics/clutter/cogl_1.8.0.bb create mode 100644 meta/recipes-graphics/mx/mx_1.3.2.bb

author
#26 lore raw
Quoted 9 lines · Saul Wold
Quoted 6 lines · Joshua Lock

All,

Here's a series of patches I developed whilst trying to play around with some
Clutter based software.

Did you look at the clutter_git versions at all? I thought I recently saw a problem with clutter_git also with COGL.

Sorry, I didn't do anything with the _git recipes.

Joshua

Signature · 3 lines
Joshua Lock
        Yocto Project "Johannes factotum"
        Intel Open Source Technology Centre