summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-08-05 09:44:18 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-08-05 09:44:18 (GMT)
commitb6f37ee66a963ac94126528358be91b7b3298b5d (patch)
tree24ae8e34955975c513f53d0fc122686d8ea93fed
parent998fb00b9099791dd7fc1ef4b68a6e5049e0d5a2 (diff)
parent66b0c1934042d082d165d52b2b997bedc09c3fd3 (diff)
downloaddefinitions-b6f37ee66a963ac94126528358be91b7b3298b5d.tar.gz
Merge branch 'baserock/jjardon/gstreamer'
Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
-rw-r--r--multimedia.morph30
1 files changed, 26 insertions, 4 deletions
diff --git a/multimedia.morph b/multimedia.morph
index 9d7621c..639b324 100644
--- a/multimedia.morph
+++ b/multimedia.morph
@@ -6,12 +6,34 @@ build-depends:
chunks:
- name: orc
repo: upstream:orc
- ref: b4f7fcaf99a4d952e59f2a9fa9286d24cc4b3a5a
- unpetrify-ref: baserock/morph
+ ref: ec132ae118bead13312f126a1f6e5709a2429ff6
+ unpetrify-ref: orc-0.4.19
build-depends: []
- name: gstreamer
repo: upstream:gstreamer
- ref: 5a5083f292e676e1548f6351ad27d0ccb18f68bc
- unpetrify-ref: baserock/genivi/baseline
+ ref: 0217fba607637860a475d0b5d48a3d4b249ca360
+ unpetrify-ref: baserock/morph/1.2
build-depends:
- orc
+- name: gstreamer-plugins-base
+ repo: upstream:gstreamer-plugins-base
+ ref: 1263caa96fcc1e3d2963bc27acbcf88b5b17d5dd
+ unpetrify-ref: baserock/morph/1.2
+ build-depends:
+ - gstreamer
+- name: gstreamer-plugins-good
+ repo: upstream:gstreamer-plugins-good
+ ref: b7e3af91197812e41028016d2e75ad2d6530b9b3
+ unpetrify-ref: baserock/morph/1.2
+ build-depends:
+ - gstreamer
+ - gstreamer-plugins-base
+ - orc
+- name: gstreamer-plugins-bad
+ repo: upstream:gstreamer-plugins-bad
+ ref: 343470e7fd1e7a6bb95b953d25b2caf5425d0185
+ unpetrify-ref: baserock/morph/1.2
+ build-depends:
+ - gstreamer
+ - gstreamer-plugins-base
+ - orc