clutter-1.0: upgrade to v1.20.0

PATCH In review Tim Orling 1 participant 4 messages Oct 8, 2014 – Dec 30, 2014

Share & tools

Tim Orling

author

2014-10-08 03:00 UTC #0 lore raw

PATCH 1/2 clutter-1.0: upgrade to v1.20.0

* The 1.19.x series were "snapshots" and not stable releases.
* This is the first stable release beyond the 1.18.x series.
* Tested on nuc with core-image-weston.

ANNOUNCEMENT:
https://mail.gnome.org/archives/clutter-list/2014-September/msg00007.html

Signed-off-by Tim Orling <[email protected]>

---
 meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb | 8 --------
 meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb | 8 ++++++++
 2 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb
 create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb

meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb deleted +0 -8

deleted file mode 100644
index 452e7ee..0000000
@@ -1,8 +0,0 @@
-require clutter-1.0.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-SRC_URI[archive.md5sum] = "471f5ea423e20d4140c7771873daef29"
-SRC_URI[archive.sha256sum] = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63"
-
-SRC_URI += "file://install-examples.patch"

meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb new file +8 -0

new file mode 100644
index 0000000..7898810
@@ -0,0 +1,8 @@
+require clutter-1.0.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI[archive.md5sum] = "a8a33a57a944c6d7c7c013ce9aa3222b"
+SRC_URI[archive.sha256sum] = "cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293"
+
+SRC_URI += "file://install-examples.patch"

Signature · 1 line

1.9.3

Tim Orling

author

2014-10-08 03:00 UTC #1 lore raw

PATCH 2/2 clutter-1.0: add ptest

Upstream has reworked installed-tests, use them for ptest. Default output format for tests is not TAP, add patch to generate TAP output. Run tests with gnome-desktop-testing-runner, which understands TAP output.

Tested on nuc with core-image-clutter and core-image-weston.

Reminder that for "pure" wayland (e.g. core-image-weston) you need to "export CLUTTER_BACKEND = wayland" to get past setting the DISPLAY variable expected for X11 backend.

Signed-off-by Tim Orling <[email protected]>

---
 meta/recipes-graphics/clutter/clutter-1.0.inc        |  4 +++-
 .../run-installed-tests-with-tap-output.patch        | 20 ++++++++++++++++++++
 meta/recipes-graphics/clutter/clutter-1.0/run-ptest  |  3 +++
 meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb  |  4 +++-
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch
 create mode 100644 meta/recipes-graphics/clutter/clutter-1.0/run-ptest

meta/recipes-graphics/clutter/clutter-1.0.inc +3 -1

index 77035d7..3929765 100644
@@ -2,7 +2,7 @@ SUMMARY = "Graphics library for creating hardware-accelerated user interfaces"
 HOMEPAGE = "http://www.clutter-project.org/"
 LICENSE = "LGPLv2.1+"
 
-inherit clutter
+inherit clutter ptest-gnome
 
 DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0"
 PACKAGE_BEFORE_PN += "${PN}-examples"

@@ -39,6 +39,8 @@ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland',
 FILES_${PN}-dbg += "${libdir}/clutter/examples/.debug"
 FILES_${PN}-examples = "${libdir}/clutter/examples"
 
+FILES_${PN}-dbg += "${libexecdir}/installed-tests/.debug"
+
 do_configure_prepend() {
 	# see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this
 	touch -t 200001010000 ${S}/po/clutter-1.0.pot

meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch new file +20 -0

new file mode 100644
index 0000000..80acab8
@@ -0,0 +1,20 @@
+Configure output from installed-tests to be TAP compliant, such that gnome-desktop-testing-runner properly interprets the results.
+
+Upstream-status: Pending
+
+Signed-off-by: Tim Orling <[email protected]>
+
+Index: clutter-1.20.0/build/autotools/glib-tap.mk
+===================================================================
+--- clutter-1.20.0.orig/build/autotools/glib-tap.mk
++++ clutter-1.20.0/build/autotools/glib-tap.mk
+@@ -128,7 +128,8 @@ installed_test_meta_DATA = $(installed_t
+ 	$(AM_V_GEN) (echo '[Test]' > [email protected]; \
+ 	echo 'Type=session' >> [email protected]; \
+ 	echo 'TestEnvironment=G_ENABLE_DIAGNOSTIC=0;CLUTTER_ENABLE_DIAGNOSTIC=0;' >> [email protected]; \
+-	echo 'Exec=$(installed_testdir)/$<' >> [email protected]; \
++	echo 'Exec=$(installed_testdir)/$< --tap' >> [email protected]; \
++	echo 'Output=TAP' >> [email protected]; \
+ 	mv [email protected] $@)
+ 
+ CLEANFILES += $(installed_test_meta_DATA)

meta/recipes-graphics/clutter/clutter-1.0/run-ptest new file +3 -0

new file mode 100644
index 0000000..98877e5
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+gnome-desktop-testing-runner clutter

meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb +3 -1

index 7898810..5f39a3a 100644
@@ -5,4 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
 SRC_URI[archive.md5sum] = "a8a33a57a944c6d7c7c013ce9aa3222b"
 SRC_URI[archive.sha256sum] = "cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293"
 
-SRC_URI += "file://install-examples.patch"
+SRC_URI += "file://install-examples.patch \
+            file://run-installed-tests-with-tap-output.patch \
+            file://run-ptest"

Signature · 1 line

1.9.3

Tim Orling

author

2014-11-28 17:45 UTC #2 lore raw

In reply to Tim Orling

Ping.

Quoted 48 lines · Tim Orling

* The 1.19.x series were "snapshots" and not stable releases.
* This is the first stable release beyond the 1.18.x series.
* Tested on nuc with core-image-weston.
ANNOUNCEMENT:
https://mail.gnome.org/archives/clutter-list/2014-September/msg00007.html
Signed-off-by Tim Orling <[email protected]>
---
meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb | 8 -------- meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb | 8 ++++++++
2 files changed, 8 insertions(+), 8 deletions(-)
delete mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb
meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb deleted +0 -8
deleted file mode 100644
index 452e7ee..0000000
@@ -1,8 +0,0 @@
-require clutter-1.0.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-SRC_URI[archive.md5sum] = "471f5ea423e20d4140c7771873daef29"
-SRC_URI[archive.sha256sum] = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63"
-
-SRC_URI += "file://install-examples.patch"
meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb new file +8 -0
new file mode 100644
index 0000000..7898810
@@ -0,0 +1,8 @@
+require clutter-1.0.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI[archive.md5sum] = "a8a33a57a944c6d7c7c013ce9aa3222b"
+SRC_URI[archive.sha256sum] = "cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293"
+
+SRC_URI += "file://install-examples.patch"
Signature · 1 line
1.9.3

Tim Orling

author

2014-12-30 03:51 UTC #3 lore raw

And again, PING.

Quoted 57 lines · Tim Orling

Ping.
Quoted 1 line
On Oct 7, 2014, at 8:00 PM, Tim Orling <[email protected]
Quoted 7 lines · <javascript:;>> wrote:
* The 1.19.x series were "snapshots" and not stable releases.
* This is the first stable release beyond the 1.18.x series.
* Tested on nuc with core-image-weston.
ANNOUNCEMENT:
https://mail.gnome.org/archives/clutter-list/2014-September/msg00007.html
Review
Quoted 10 lines
Signed-off-by Tim Orling <[email protected] <javascript:;>>
---
meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb | 8 -------- meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb | 8 ++++++++
2 files changed, 8 insertions(+), 8 deletions(-)
delete mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb
(quoted diff) +0 -0
b/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb
meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb line 6
Quoted 11 lines
deleted file mode 100644
index 452e7ee..0000000
meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb deleted +0 -6
@@ -1,8 +0,0 @@
-require clutter-1.0.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-SRC_URI[archive.md5sum] = "471f5ea423e20d4140c7771873daef29"
-SRC_URI[archive.sha256sum] =
"f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63"
Review
Quoted 3 lines
meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb deleted +0 -2
-
-SRC_URI += "file://install-examples.patch"
(quoted diff) +0 -0
b/meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb
meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb line 6
Quoted 11 lines
new file mode 100644
index 0000000..7898810
meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb new file +6 -0
@@ -0,0 +1,8 @@
+require clutter-1.0.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI[archive.md5sum] = "a8a33a57a944c6d7c7c013ce9aa3222b"
+SRC_URI[archive.sha256sum] =
"cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293"
Quoted 5 lines
meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb new file +2 -1
+
+SRC_URI += "file://install-examples.patch"
--
1.9.3