summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Thomas <james.thomas@codethink.co.uk>2015-02-18 10:56:53 +0000
committerJames Thomas <james.thomas@codethink.co.uk>2015-02-18 10:56:53 +0000
commitd684564190e7a9abc65fe9a6f6614fd0a6c65fb7 (patch)
treeb31046d0998f5f34b32c4bfbe90260aeefc67fb7
parent480255744e15a59f6a78b06ec5264b00159c9ea9 (diff)
parent804ef93b3e33903a51c214dcb509bdeba74b9417 (diff)
downloaddefinitions-d684564190e7a9abc65fe9a6f6614fd0a6c65fb7.tar.gz
Merge branch 'baserock/james/upgrade-weston'
Reviewed by: Javier Jardon <javierjc1982@gmail.com> Reviewed by: Sam Thursfield <sam.thursfield@codethink.co.uk>
-rw-r--r--strata/input-common.morph4
-rw-r--r--strata/wayland-generic.morph4
-rw-r--r--strata/weston-common.morph4
3 files changed, 6 insertions, 6 deletions
diff --git a/strata/input-common.morph b/strata/input-common.morph
index dad71041..dab05826 100644
--- a/strata/input-common.morph
+++ b/strata/input-common.morph
@@ -22,8 +22,8 @@ chunks:
build-depends: []
- name: libinput
repo: upstream:libinput
- ref: fd8a29fb692404ace405631012d0b708362b1fa0
- unpetrify-ref: 0.9.0
+ ref: ca4e03fb11429b6a3704206124fbff2f57d121f9
+ unpetrify-ref: 0.10.0
build-depends:
- mtdev
- libevdev
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index 164db34b..58eefbbd 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -13,7 +13,7 @@ chunks:
- name: wayland
morph: strata/wayland-generic/wayland.morph
repo: upstream:wayland
- ref: 52d971c924d0147d6949096c9cf001d75828a054
- unpetrify-ref: 1.6.93
+ ref: 8e9d5a108476b3435a8286613b9a63b69afd92b7
+ unpetrify-ref: 1.7.0
build-depends:
- libxkbcommon
diff --git a/strata/weston-common.morph b/strata/weston-common.morph
index f79510c8..13106ea5 100644
--- a/strata/weston-common.morph
+++ b/strata/weston-common.morph
@@ -10,6 +10,6 @@ chunks:
- name: weston
morph: strata/weston-common/weston.morph
repo: upstream:weston
- ref: 06315ce5b9569e02ec4e7d322d933bc247620aff
- unpetrify-ref: baserock/weston-1.6.93/tegra
+ ref: 322383ed469d69401b502618718a97a4e85c97d8
+ unpetrify-ref: baserock/weston-1.7.0/tegra
build-depends: []