Skip to contentSkip to conversation

Clutter-centric updates

PATCH Applied Joshua Lock 3 participants 9 messages Feb 9, 2012 – Feb 10, 2012

lore
Share & tools
lore

Joshua Lock

author
#0 lore raw

cover Clutter-centric updates

Here are clutter and mx recipe updates and some changes to the mx recipe to ensure it's fully functional following some discussion with the mx maintainer.

Cheers,
Joshua

The following changes since commit 4ef5e70f531f48cef90805402c16ec02ad3f2b92:

tcmode-default: add preference for gdb/gdbserver (2012-02-08 10:16:48 -0600)

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

Joshua Lock (5):
clutter-1.8: update to clutter-1.8.4
mx: update to 1.4.2
mx: ensure gettext and dbus are present
clutter: upgrade git recipe to reflect 1.8.4 tag
distro-tracking-fields: update clutter, clutter_git and mx

 .../conf/distro/include/distro_tracking_fields.inc |   16 ++--
 .../{clutter-1.8_1.8.2.bb => clutter-1.8_1.8.4.bb} |    7 +-
 meta/recipes-graphics/clutter/clutter_git.bb       |    6 +-
 .../mx/files/introspection-m4.patch                |  107 ++++++++++++++++++++
 .../mx/{mx_1.3.2.bb => mx_1.4.2.bb}                |   15 ++-
 5 files changed, 130 insertions(+), 21 deletions(-)
 rename meta/recipes-graphics/clutter/{clutter-1.8_1.8.2.bb => clutter-1.8_1.8.4.bb} (79%)
 create mode 100644 meta/recipes-graphics/mx/files/introspection-m4.patch
 rename meta/recipes-graphics/mx/{mx_1.3.2.bb => mx_1.4.2.bb} (40%)
Signature · 1 line
1.7.7.6
author
#1 lore raw

PATCH 1/5 clutter-1.8: update to clutter-1.8.4

Added a note about why we're setting S, so I don't have to figure it out again next time I try and update clutter.

Signed-off-by Joshua Lock <[email protected]>
---
 .../{clutter-1.8_1.8.2.bb => clutter-1.8_1.8.4.bb} |    7 +++----
 1 files changed, 3 insertions(+), 4 deletions(-)
 rename meta/recipes-graphics/clutter/{clutter-1.8_1.8.2.bb => clutter-1.8_1.8.4.bb} (79%)
meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb renamed from meta/recipes-graphics/clutter/clutter-1.8_1.8.2.bb +3 -4
similarity index 79%
rename from meta/recipes-graphics/clutter/clutter-1.8_1.8.2.bb
rename to meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
index f76201e..378b6fe 100644
@@ -1,8 +1,6 @@
 require recipes-graphics/clutter/clutter.inc
 require recipes-graphics/clutter/clutter-package.inc
 
-PR = "r3"
-
 # We're API/ABI compatible and this may make things easier for layers
 PROVIDES += "clutter-1.6"
 

@@ -14,6 +12,7 @@ SRC_URI = "http://source.clutter-project.org/sources/clutter/1.8/clutter-${PV}.t
            file://update_gettext_macro_version.patch"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+# because we've namespaced PN to clutter-1.8
 S = "${WORKDIR}/clutter-${PV}"
 
 BASE_CONF += "--disable-introspection"

@@ -23,5 +22,5 @@ do_configure_prepend () {
 	sed -i -e 's/^DOLT//' ${S}/configure.ac
 }
 
-SRC_URI[md5sum] = "29a238fa11da2f56c40de0eb04424aaf"
-SRC_URI[sha256sum] = "5e6abf6440e6be8130fd7a6b449e1789e4318f61b17f06323ba1b58dc143bc8b"
+SRC_URI[md5sum] = "487f70f9b59e1328b47f1db4094ab662"
+SRC_URI[sha256sum] = "0d567177facd6913ac9c894e230ae48933125f02354ef965bbbf0586f1f0df91"
Signature · 1 line
1.7.7.6
author
#2 lore raw

PATCH 2/5 mx: update to 1.4.2

In reply to Joshua Lock

Patch in a copy of introspection.m4 so that we can continue to easily and cleanly disable introspection.

Signed-off-by Joshua Lock <[email protected]>
---
 .../mx/files/introspection-m4.patch                |  106 ++++++++++++++++++++
 .../mx/{mx_1.3.2.bb => mx_1.4.2.bb}                |    9 +-
 2 files changed, 111 insertions(+), 4 deletions(-)
 create mode 100644 meta/recipes-graphics/mx/files/introspection-m4.patch
 rename meta/recipes-graphics/mx/{mx_1.3.2.bb => mx_1.4.2.bb} (58%)
meta/recipes-graphics/mx/files/introspection-m4.patch new file +106 -0
new file mode 100644
index 0000000..aeecbbe
@@ -0,0 +1,106 @@
+A copy of introspection.m4 from upstream gobject-introspection so that
+we can use the GOBJECT_INTROSPECTION_CHECK([0.6.4]) and --disable-introspection
+
+Signed-off-by: Joshua Lock <[email protected]>
+
+Upstream-status: Inappropriate (build system specific).
+
+Index: mx-1.4.2/m4/introspection.m4
+===================================================================
+--- /dev/null
++++ mx-1.4.2/m4/introspection.m4
+@@ -0,0 +1,94 @@
++dnl -*- mode: autoconf -*-
++dnl Copyright 2009 Johan Dahlin
++dnl
++dnl This file is free software; the author(s) gives unlimited
++dnl permission to copy and/or distribute it, with or without
++dnl modifications, as long as this notice is preserved.
++dnl
++
++# serial 1
++
++m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
++[
++    AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
++    AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
++    AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
++
++    dnl enable/disable introspection
++    m4_if([$2], [require],
++    [dnl
++        enable_introspection=yes
++    ],[dnl
++        AC_ARG_ENABLE(introspection,
++                  AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
++                                 [Enable introspection for this build]),, 
++                                 [enable_introspection=auto])
++    ])dnl
++
++    AC_MSG_CHECKING([for gobject-introspection])
++
++    dnl presence/version checking
++    AS_CASE([$enable_introspection],
++    [no], [dnl
++        found_introspection="no (disabled, use --enable-introspection to enable)"
++    ],dnl
++    [yes],[dnl
++        PKG_CHECK_EXISTS([gobject-introspection-1.0],,
++                         AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
++        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
++                         found_introspection=yes,
++                         AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
++    ],dnl
++    [auto],[dnl
++        PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
++    ],dnl
++    [dnl	
++        AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
++    ])dnl
++
++    AC_MSG_RESULT([$found_introspection])
++
++    INTROSPECTION_SCANNER=
++    INTROSPECTION_COMPILER=
++    INTROSPECTION_GENERATE=
++    INTROSPECTION_GIRDIR=
++    INTROSPECTION_TYPELIBDIR=
++    if test "x$found_introspection" = "xyes"; then
++       INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
++       INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
++       INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
++       INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
++       INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
++       INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
++       INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
++       INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
++    fi
++    AC_SUBST(INTROSPECTION_SCANNER)
++    AC_SUBST(INTROSPECTION_COMPILER)
++    AC_SUBST(INTROSPECTION_GENERATE)
++    AC_SUBST(INTROSPECTION_GIRDIR)
++    AC_SUBST(INTROSPECTION_TYPELIBDIR)
++    AC_SUBST(INTROSPECTION_CFLAGS)
++    AC_SUBST(INTROSPECTION_LIBS)
++    AC_SUBST(INTROSPECTION_MAKEFILE)
++
++    AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
++])
++
++
++dnl Usage:
++dnl   GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
++
++AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
++[
++  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
++])
++
++dnl Usage:
++dnl   GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
++
++
++AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
++[
++  _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
++])
meta/recipes-graphics/mx/mx_1.4.2.bb renamed from meta/recipes-graphics/mx/mx_1.3.2.bb +5 -4
similarity index 58%
rename from meta/recipes-graphics/mx/mx_1.3.2.bb
rename to meta/recipes-graphics/mx/mx_1.4.2.bb
index 695249b..91eca29 100644
@@ -1,14 +1,15 @@
 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"
+SRC_URI = "http://source.clutter-project.org/sources/mx/1.4/mx-${PV}.tar.bz2 \
+	   file://introspection-m4.patch"
+
+SRC_URI[md5sum] = "faf8d97ad9995f54cc91f90bc90c8f9d"
+SRC_URI[sha256sum] = "9d40dd48a8e3d098cc75c05163f77305ffb83439783dc91be50681c9502660ce"
 
 LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=fbc093901857fcd118f065f900982c24 \
                     file://mx/mx-widget.c;beginline=8;endline=20;md5=13bba3c973a72414a701e1e87b5ee879"
Signature · 1 line
1.7.7.6
author
#3 lore raw

PATCH 3/5 mx: ensure gettext and dbus are present

In reply to Joshua Lock

Upstream informs me that D-bus isn't really optional as it's required to make some of the API work such as the single instance MxApplication. Therefore ensure we're building with it enabled.

Gettext macros are used in the configure.ac so inherit gettext to ensure the required dependencies are present.

Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-graphics/mx/mx_1.4.2.bb |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
meta/recipes-graphics/mx/mx_1.4.2.bb +5 -3
index 91eca29..c50bc0f 100644
@@ -1,9 +1,11 @@
 DESCRIPTION = "Clutter based widget library"
 LICENSE = "LGPLv2.1"
 
-DEPENDS = "clutter-1.8"
+PR = "r1"
 
-inherit autotools
+DEPENDS = "clutter-1.8 dbus-glib"
+
+inherit autotools gettext
 
 SRC_URI = "http://source.clutter-project.org/sources/mx/1.4/mx-${PV}.tar.bz2 \
 	   file://introspection-m4.patch"

@@ -14,5 +16,5 @@ SRC_URI[sha256sum] = "9d40dd48a8e3d098cc75c05163f77305ffb83439783dc91be50681c950
 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"
+EXTRA_OECONF = "--disable-introspection --disable-gtk-widgets --with-dbus"
Signature · 1 line
1.7.7.6
author
#4 lore raw

PATCH 4/5 clutter: upgrade git recipe to reflect 1.8.4 tag

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 meta/recipes-graphics/clutter/clutter_git.bb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-graphics/clutter/clutter_git.bb +3 -3
index d598b4a..ef2c276 100644
@@ -3,9 +3,9 @@ require clutter-package.inc
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 
-# the 1.8.2 tag
-SRCREV = "9041ea42655dfc1422ce88eab931382dd400d13a"
-PV = "1.8.2+git${SRCPV}"
+# the 1.8.4 tag
+SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459"
+PV = "1.8.4git${SRCPV}"
 PR = "r0"
 
 DEFAULT_PREFERENCE = "-1"
Signature · 1 line
1.7.7.6
#5 lore raw

Re: [PATCH 4/5] clutter: upgrade git recipe to reflect 1.8.4 tag

meta/recipes-graphics/clutter/clutter_git.bb require clutter-package.inc · line 8

Quoted 6 lines
meta/recipes-graphics/clutter/clutter_git.bb +3 -3
-# the 1.8.2 tag
-SRCREV = "9041ea42655dfc1422ce88eab931382dd400d13a"
-PV = "1.8.2+git${SRCPV}"
+# the 1.8.4 tag
+SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459"
+PV = "1.8.4git${SRCPV}"

should this be 1.8.4+git${SRCPV} ?

author
#6 lore raw

Re: [PATCH 4/5] clutter: upgrade git recipe to reflect 1.8.4 tag

Quoted 8 lines · Khem Raj

meta/recipes-graphics/clutter/clutter_git.bb require clutter-package.inc · line 8

Quoted 6 lines
meta/recipes-graphics/clutter/clutter_git.bb +3 -3
-# the 1.8.2 tag
-SRCREV = "9041ea42655dfc1422ce88eab931382dd400d13a"
-PV = "1.8.2+git${SRCPV}"
+# the 1.8.4 tag
+SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459"
+PV = "1.8.4git${SRCPV}"

should this be 1.8.4+git${SRCPV} ?

Yes it should, thanks.

Updated patch pushed to the same repo/branch.

Cheers,
Joshua

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

PATCH 5/5 distro-tracking-fields: update clutter, clutter_git and mx

In reply to Joshua Lock
Signed-off-by Joshua Lock <[email protected]>
---
 .../conf/distro/include/distro_tracking_fields.inc |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
meta/conf/distro/include/distro_tracking_fields.inc +8 -8
index 09b5bfc..02aeabd 100644
@@ -5562,16 +5562,16 @@ RECIPE_MAINTAINER_pn-cogl = "Joshua Lock <[email protected]>"
 
 RECIPE_STATUS_pn-clutter-1.8 = "green"
 DISTRO_PN_ALIAS_pn-clutter-1.8 = "Fedora=clutter OpenSuse=clutter Ubuntu=clutter-1.0 Mandriva=clutter Debian=clutter"
-RECIPE_LATEST_VERSION_pn-clutter-1.8 = "1.8.2"
-RECIPE_MANUAL_CHECK_DATE_pn-clutter-1.8 = "Dec 13, 2011"
-RECIPE_LAST_UPDATE_pn-clutter-1.8 = "Dec 13, 2011"
+RECIPE_LATEST_VERSION_pn-clutter-1.8 = "1.8.4"
+RECIPE_MANUAL_CHECK_DATE_pn-clutter-1.8 = "Feb 08, 2012"
+RECIPE_LAST_UPDATE_pn-clutter-1.8 = "Feb 08, 2012"
 RECIPE_MAINTAINER_pn-clutter-1.8 = "Joshua Lock <[email protected]>"
 # Non namespaced version for git recipe
 RECIPE_STATUS_pn-clutter = "green"
 DISTRO_PN_ALIAS_pn-clutter = "Fedora=clutter OpenSuse=clutter Ubuntu=clutter-1.0 Mandriva=clutter Debian=clutter"
-RECIPE_LATEST_VERSION_pn-clutter = "1.8.2"
-RECIPE_MANUAL_CHECK_DATE_pn-clutter = "Dec 13, 2011"
-RECIPE_LAST_UPDATE_pn-clutter = "Dec 13, 2011"
+RECIPE_LATEST_VERSION_pn-clutter = "1.8.4"
+RECIPE_MANUAL_CHECK_DATE_pn-clutter = "Feb 08, 2012"
+RECIPE_LAST_UPDATE_pn-clutter = "Feb 08, 2012"
 RECIPE_MAINTAINER_pn-clutter = "Joshua Lock <[email protected]>"
 
 RECIPE_STATUS_pn-clutter-gtk-1.8 = "red"

@@ -5899,8 +5899,8 @@ RECIPE_LATEST_VERSION_pn-gthumb = "2.12.4"
 RECIPE_LAST_UPDATE_pn-gthumb = "Nov 30, 2011"
 RECIPE_MAINTAINER_pn-gthumb = "Joshua Lock <[email protected]>"
 
-RECIPE_LATEST_VERSION_pn-mx = "1.3.2"
-RECIPE_LAST_UPDATE_pn-mx = "Nov 16, 2011"
+RECIPE_LATEST_VERSION_pn-mx = "1.4.2"
+RECIPE_LAST_UPDATE_pn-mx = "Deb 08, 2012"
 RECIPE_MAINTAINER_pn-mx = "Joshua Lock <[email protected]>"
 
 RECIPE_LATEST_VERSION_pn-json-glib = "0.14.2"
Signature · 1 line
1.7.7.6
Applied
#8 lore raw
In reply to Joshua Lock
Quoted 27 lines · Joshua Lock

Here are clutter and mx recipe updates and some changes to the mx recipe to ensure it's fully functional following some discussion with the mx maintainer.

Cheers,
Joshua

The following changes since commit 4ef5e70f531f48cef90805402c16ec02ad3f2b92:

   tcmode-default: add preference for gdb/gdbserver (2012-02-08 10:16:48 -0600)

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

Joshua Lock (5):
clutter-1.8: update to clutter-1.8.4
mx: update to 1.4.2
mx: ensure gettext and dbus are present
clutter: upgrade git recipe to reflect 1.8.4 tag
distro-tracking-fields: update clutter, clutter_git and mx

  .../conf/distro/include/distro_tracking_fields.inc |   16 ++--
  .../{clutter-1.8_1.8.2.bb =>  clutter-1.8_1.8.4.bb} |    7 +-
  meta/recipes-graphics/clutter/clutter_git.bb       |    6 +-
  .../mx/files/introspection-m4.patch                |  107 ++++++++++++++++++++
  .../mx/{mx_1.3.2.bb =>  mx_1.4.2.bb}                |   15 ++-
  5 files changed, 130 insertions(+), 21 deletions(-)
Quoted 4 lines

rename meta/recipes-graphics/clutter/{clutter-1.8_1.8.2.bb => clutter-1.8_1.8.4.bb} (79%) create mode 100644 meta/recipes-graphics/mx/files/introspection-m4.patch rename meta/recipes-graphics/mx/{mx_1.3.2.bb => mx_1.4.2.bb} (40%)

Merged into OE-core

Thanks
Sau!