diff options
| author | James Thomas <james.thomas@codethink.co.uk> | 2014-06-22 15:03:55 +0000 |
|---|---|---|
| committer | James Thomas <james.thomas@codethink.co.uk> | 2014-06-22 15:28:25 +0000 |
| commit | c773c0d8a1b48e9e729cb72bd249ed0c3dd1a85a (patch) | |
| tree | 9fbe3064db915622103e0ca1f461741dd499ff80 | |
| parent | 65e60232f41d2891f57a9be9a65ffc0bcfafce18 (diff) | |
| download | definitions-c773c0d8a1b48e9e729cb72bd249ed0c3dd1a85a.tar.gz | |
Add qt5-multimedia
| -rw-r--r-- | genivi-baseline-system-armv7lhf-jetson.morph | 1 | ||||
| -rw-r--r-- | multimedia-gstreamer-0.10.morph | 3 | ||||
| -rw-r--r-- | qt5-tools-jetson.morph | 6 |
3 files changed, 8 insertions, 2 deletions
diff --git a/genivi-baseline-system-armv7lhf-jetson.morph b/genivi-baseline-system-armv7lhf-jetson.morph index 3ad28b62..e5bc9499 100644 --- a/genivi-baseline-system-armv7lhf-jetson.morph +++ b/genivi-baseline-system-armv7lhf-jetson.morph @@ -20,6 +20,7 @@ strata: - morph: audio-bluetooth - morph: x-common - morph: multimedia +- morph: multimedia-gstreamer-0.10 - morph: genivi - morph: wayland-armv7-nvidia-tegra - morph: qt5-tools-jetson diff --git a/multimedia-gstreamer-0.10.morph b/multimedia-gstreamer-0.10.morph index c7a44e87..31519549 100644 --- a/multimedia-gstreamer-0.10.morph +++ b/multimedia-gstreamer-0.10.morph @@ -13,8 +13,7 @@ chunks: build-depends: [] - name: gstreamer repo: upstream:gstreamer - ref: c7e4a97d26396882960fd399b1a5e298e40d2a35 - unpetrify-ref: baserock/morph/0.10 + ref: baserock/james/0.10 build-depends: - orc - name: gstreamer-plugins-base diff --git a/qt5-tools-jetson.morph b/qt5-tools-jetson.morph index 9628b233..d61c4511 100644 --- a/qt5-tools-jetson.morph +++ b/qt5-tools-jetson.morph @@ -43,6 +43,12 @@ chunks: build-depends: - qtbase - qtscript +- name: qtmultimedia + repo: upstream:qt5/qtmultimedia + ref: baserock/v5.3.0 + build-depends: + - qtbase + - qtdeclarative - name: qtquick1 repo: upstream:qt5/qtquick1 ref: baserock/v5.3.0 |