summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Maw <jonathan.maw@codethink.co.uk>2015-05-05 09:01:53 +0000
committerBaserock Gerrit <gerrit@baserock.org>2015-05-19 16:59:17 +0000
commit47babac06e4f036598ab11655a79297b036c898b (patch)
tree071b5a450359bd095d02daf3568fe12f586eeec0
parent508d657dd94478d41eb1ec93a1c1556c607d55e6 (diff)
downloaddefinitions-47babac06e4f036598ab11655a79297b036c898b.tar.gz
Move qtmultimedia to gstreamer-1.0
gstreamer-0.10 is currently broken by the current version of bison, and fixing it is a major hassle due to submodules. Note: Qt 5.5 will include support for this by default Change-Id: Ie3d118d53befa56744d97b107e58b701c904f9f7
-rw-r--r--strata/qt5-tools-qtmultimedia.morph6
1 files changed, 3 insertions, 3 deletions
diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph
index 254e895c..20473ec2 100644
--- a/strata/qt5-tools-qtmultimedia.morph
+++ b/strata/qt5-tools-qtmultimedia.morph
@@ -3,10 +3,10 @@ kind: stratum
description: Qt5 QtMultimedia Development Libraries and Tools
build-depends:
- morph: strata/qt5-tools.morph
-- morph: strata/multimedia-gstreamer-0.10.morph
+- morph: strata/multimedia-gstreamer.morph
chunks:
- name: qtmultimedia
morph: strata/qt5-tools/qtmultimedia.morph
repo: upstream:qt5/qtmultimedia
- ref: 8b1ee1724071cc4bbe8cefe195e375ef583d9d7f
- unpetrify-ref: v5.4.0
+ ref: a42a5ae6191ecbe317a00d8261bc53e842967052
+ unpetrify-ref: baserock/qt5.4-wip-gstreamer-1.0