Skip to contentSkip to conversation

Recipes for Clutter 1.6 v2

PATCH Applied Joshua Lock 2 participants 6 messages Mar 28, 2011 – Mar 29, 2011

lore
Share & tools
lore
#0 lore raw

cover Recipes for Clutter 1.6 v2

From: Joshua Lock <[email protected]>

v2 of a series series of patches adds recipes for Clutter 1.6 and versions of clutter-box2d and clutter-gst which build against it.

Pull URL: git://git.openembedded.org/openembedded-core-contrib
Branch: josh/clutter
Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/clutter

Thanks,
Joshua Lock <[email protected]>
---

Joshua Lock (4):
clutter: add 1.6.8
clutter-gst: add 1.3.6 for use with clutter 1.6
clutter-box2d: add version 0.10.0 for use with clutter 1.6
clutter-gtk: remove duplicate gtk+ DEPENDS entry

 meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb |   25 +++++++++++++++++
 .../clutter/clutter-box2d-1.6_0.10.0.bb            |   20 ++++++++++++++
 meta/recipes-graphics/clutter/clutter-box2d.inc    |    4 +-
 .../clutter-box2d/fix-disable-introspection.patch  |   28 ++++++++++++++++++++
 meta/recipes-graphics/clutter/clutter-box2d_git.bb |    2 +-
 .../clutter/clutter-gst-1.6_1.3.6.bb               |   16 +++++++++++
 meta/recipes-graphics/clutter/clutter-gst.inc      |    2 +-
 .../clutter/clutter-gtk-1.4_git.bb                 |    2 +-
 8 files changed, 94 insertions(+), 5 deletions(-)
 create mode 100644 meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb
 create mode 100644 meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb
 create mode 100644 meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch
 create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb
Signature · 1 line
1.7.4.1
#1 lore raw

PATCH 1/4 clutter: add 1.6.8

From: Joshua Lock <[email protected]>

---
 meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb |   25 ++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb
meta/recipes-graphics/clutter/clutter-1.6_1.6.8.bb new file +25 -0
new file mode 100644
index 0000000..7ead5f9
@@ -0,0 +1,25 @@
+require recipes-graphics/clutter/clutter.inc
+
+PR = "r0"
+
+PACKAGES =+ "${PN}-examples"
+FILES_${PN}-examples = "${bindir}/test-* ${pkgdatadir}/redhand.png"
+
+SRC_URI = "http://source.clutter-project.org/sources/clutter/1.6/clutter-${PV}.tar.bz2 \
+           file://enable_tests-1.4.patch \
+           file://test-conformance-fix.patch"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+S = "${WORKDIR}/clutter-1.6.8"
+
+BASE_CONF += "--disable-introspection"
+
+EXTRA_OECONF += "--with-json=check"
+
+do_configure_prepend () {
+	# Disable DOLT
+	sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
+
+SRC_URI[md5sum] = "5a3c6d8414d4e286aba0a936f344c9b1""
+SRC_URI[sha256sum] = "cc147b8e7e62ed4b9b8a83df3db9788cf37db0c83970ba876228433f32bda442"
Signature · 1 line
1.7.4.1
#2 lore raw

PATCH 2/4 clutter-gst: add 1.3.6 for use with clutter 1.6

In reply to Joshua Lock

From: Joshua Lock <[email protected]>

The inc file should be usable across clutter versions, plus this is already set in the clutter-box2d-1.4_git.bb recipe

---
 .../clutter/clutter-gst-1.6_1.3.6.bb               |   16 ++++++++++++++++
 meta/recipes-graphics/clutter/clutter-gst.inc      |    2 +-
 2 files changed, 17 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb
meta/recipes-graphics/clutter/clutter-gst-1.6_1.3.6.bb new file +16 -0
new file mode 100644
index 0000000..d787b80
@@ -0,0 +1,16 @@
+require clutter-gst.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \
+                    file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4"
+
+DEPENDS += "clutter-1.6"
+
+SRC_URI = "http://source.clutter-project.org/sources/clutter-gst/1.3/clutter-gst-${PV}.tar.bz2 \
+           file://enable_tests.patch"
+
+S = "${WORKDIR}/clutter-gst-${PV}"
+
+do_configure_prepend () {
+       # Disable DOLT
+       sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
meta/recipes-graphics/clutter/clutter-gst.inc +1 -1
index 614c62d..702424b 100644
@@ -2,7 +2,7 @@ DESCRIPTION = "Clutter GStreamer"
 HOMEPAGE = "http://www.clutter-project.org/"
 LICENSE = "LGPLv2+"
 
-DEPENDS = "clutter-1.4 gstreamer gst-plugins-base"
+DEPENDS = "gstreamer gst-plugins-base"
 
 FILESPATH = "${FILE_DIRNAME}/clutter-gst"
 
Signature · 1 line
1.7.4.1
#3 lore raw

PATCH 3/4 clutter-box2d: add version 0.10.0 for use with clutter 1.6

In reply to Joshua Lock

From: Joshua Lock <[email protected]>

Don't specificy dependant clutter version in inc file, this enables the inc file to be re-used accross Clutter versions.

---
 .../clutter/clutter-box2d-1.6_0.10.0.bb            |   20 ++++++++++++++
 meta/recipes-graphics/clutter/clutter-box2d.inc    |    4 +-
 .../clutter-box2d/fix-disable-introspection.patch  |   28 ++++++++++++++++++++
 meta/recipes-graphics/clutter/clutter-box2d_git.bb |    2 +-
 4 files changed, 51 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb
 create mode 100644 meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch
meta/recipes-graphics/clutter/clutter-box2d-1.6_0.10.0.bb new file +20 -0
new file mode 100644
index 0000000..cad8cfc
@@ -0,0 +1,20 @@
+require clutter-box2d.inc
+
+PR = "r0"
+
+SRC_URI = "http://source.clutter-project.org/sources/clutter-box2d/0.10/clutter-box2d-${PV}.tar.bz2 \
+           file://fix-disable-introspection.patch"
+
+S = "${WORKDIR}/clutter-box2d-${PV}"
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
+
+BASE_CONF += "--disable-introspection"
+
+do_configure_prepend () {
+	# Disable DOLT
+	sed -i -e 's/^DOLT//' ${S}/configure.ac
+}
+
+SRC_URI[md5sum] = "51618976ca6a5d536c4eac5f0e120d9d"
+SRC_URI[sha256sum] = "1e42d0cea429e4dc953a1f652672dbd322b3938846e99bab35f463de6fd8ae7f"
meta/recipes-graphics/clutter/clutter-box2d.inc +2 -2
index 0249984..0574db3 100644
@@ -2,8 +2,6 @@ DESCRIPTION = "Clutter Box2D"
 HOMEPAGE = "http://www.clutter-project.org/"
 LICENSE = "Catto"
 
-DEPENDS = "clutter-1.4"
-
 # The main clutter lib is machine specific so we need to be too
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
@@ -13,3 +11,5 @@ do_install_append () {
 	install -d ${D}${bindir}
 	install ${S}/examples/.libs/blockbox ${D}${bindir}
 }
+
+FILESPATH = "${FILE_DIRNAME}/clutter-box2d"
meta/recipes-graphics/clutter/clutter-box2d/fix-disable-introspection.patch new file +28 -0
new file mode 100644
index 0000000..cfb50dc
@@ -0,0 +1,28 @@
+Even with introspection disabled clutter-box2d would try to install the gir
+files.
+This patch ignored the while introspection related section of the Makefile if
+introspection is disabled.
+
+JL 28/03/11
[email protected]
+
+Index: clutter-box2d-0.10.0/clutter-box2d/Makefile.am
+===================================================================
+--- clutter-box2d-0.10.0.orig/clutter-box2d/Makefile.am
++++ clutter-box2d-0.10.0/clutter-box2d/Makefile.am
+@@ -41,6 +41,8 @@ EXTRA_DIST = \
+ 
+ BUILT_GIRSOURCES =
+ 
++if HAVE_INTROSPECTION
++
+ ClutterBox2D-@[email protected]: $(INTROSPECTION_SCANNER) libclutter-box2d-@[email protected]
+ 	$(QUIET_GEN)$(INTROSPECTION_SCANNER) -v \
+ 		--namespace ClutterBox2D --nsversion=@CLUTTER_BOX2D_API_VERSION@ \
+@@ -70,3 +72,5 @@ typelibs_DATA = $(BUILT_GIRSOURCES:.gir=
+ 
+ CLEANFILES=
+ CLEANFILES += $(BUILT_GIRSOURCES) $(typelibs_DATA)
++
++endif
+\ No newline at end of file
meta/recipes-graphics/clutter/clutter-box2d_git.bb +1 -1
index 6b718d5..62b5c80 100644
@@ -9,4 +9,4 @@ SRC_URI = "git://git.clutter-project.org/clutter-box2d.git;protocol=git"
 
 S = "${WORKDIR}/git"
 
-
+DEPENDS += "clutter-1.4"
Signature · 1 line
1.7.4.1
#4 lore raw

PATCH 4/4 clutter-gtk: remove duplicate gtk+ DEPENDS entry

In reply to Joshua Lock

From: Joshua Lock <[email protected]>

the inc file already specifies the gtk+ dependancy

---
 .../clutter/clutter-gtk-1.4_git.bb                 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-graphics/clutter/clutter-gtk-1.4_git.bb +1 -1
index 3822b31..42a1ef2 100644
@@ -12,6 +12,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 S = "${WORKDIR}/git"
 
-DEPENDS += "gtk+ clutter-1.4"
+DEPENDS += "clutter-1.4"
 
 EXTRA_OECONF += "--disable-introspection"
Signature · 1 line
1.7.4.1
#5 lore raw
In reply to Joshua Lock
Quoted 14 lines · Joshua Lock

From: Joshua Lock <[email protected]>

v2 of a series series of patches adds recipes for Clutter 1.6 and versions of clutter-box2d and clutter-gst which build against it.

Pull URL: git://git.openembedded.org/openembedded-core-contrib
Branch: josh/clutter
Browse: http://git.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=josh/clutter

Thanks,
Joshua Lock <[email protected]>
---

Quoted 5 lines

Joshua Lock (4):
clutter: add 1.6.8
clutter-gst: add 1.3.6 for use with clutter 1.6
clutter-box2d: add version 0.10.0 for use with clutter 1.6
clutter-gtk: remove duplicate gtk+ DEPENDS entry

Merged to master, thanks!

Richard