diff options
author | Javier Jardón <jjardon@gnome.org> | 2015-02-20 15:54:27 +0000 |
---|---|---|
committer | Javier Jardón <jjardon@gnome.org> | 2015-02-20 15:54:52 +0000 |
commit | 96168a6614a567928dd2f244998a9ad3e8f29359 (patch) | |
tree | 721478e017a707e81e8894b63e3a9fc7b786ad26 /systems | |
parent | ef71b54fd294613f230697a2f74d39e507d03b23 (diff) | |
parent | b6461f046ff67295ce3aaea38689800aea7570a7 (diff) | |
download | definitions-96168a6614a567928dd2f244998a9ad3e8f29359.tar.gz |
Merge branch 'baserock/jjardon/multimedia'
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk>
Reviewed-by: James Thomas <james.thomas@codethink.co.uk>
Diffstat (limited to 'systems')
-rw-r--r-- | systems/genivi-baseline-system-armv7lhf-jetson.morph | 6 | ||||
-rw-r--r-- | systems/genivi-baseline-system-armv7lhf-versatile.morph | 6 | ||||
-rw-r--r-- | systems/genivi-baseline-system-x86_64-generic.morph | 6 | ||||
-rw-r--r-- | systems/gitlab-ci-runner.morph | 6 | ||||
-rw-r--r-- | systems/qt4-devel-system-x86_64-generic.morph | 2 | ||||
-rw-r--r-- | systems/qt5-devel-system-x86_64-generic.morph | 6 | ||||
-rw-r--r-- | systems/weston-system-armv7lhf-jetson.morph | 6 | ||||
-rw-r--r-- | systems/weston-system-x86_64-generic.morph | 6 | ||||
-rw-r--r-- | systems/xfce-system.morph | 6 |
9 files changed, 34 insertions, 16 deletions
diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index 5cbfddbe..50581561 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -19,8 +19,10 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: genivi morph: strata/genivi.morph - name: wayland-generic diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index a5f07750..16bed197 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -19,8 +19,10 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: genivi morph: strata/genivi.morph - name: wayland-generic diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index f5fb571e..f4828688 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -19,8 +19,10 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: genivi morph: strata/genivi.morph - name: wayland-generic diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph index b4e20ec7..979b73b0 100644 --- a/systems/gitlab-ci-runner.morph +++ b/systems/gitlab-ci-runner.morph @@ -21,8 +21,10 @@ strata: morph: strata/x-common.morph - name: x-generic morph: strata/x-generic.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: genivi morph: strata/genivi.morph - name: tools diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph index 9a23bdeb..0a98f205 100644 --- a/systems/qt4-devel-system-x86_64-generic.morph +++ b/systems/qt4-devel-system-x86_64-generic.morph @@ -12,6 +12,8 @@ strata: morph: strata/foundation.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia-gstreamer-0.10 morph: strata/multimedia-gstreamer-0.10.morph - name: bsp-x86_64-generic diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph index 1a78ff4f..0f768536 100644 --- a/systems/qt5-devel-system-x86_64-generic.morph +++ b/systems/qt5-devel-system-x86_64-generic.morph @@ -12,8 +12,10 @@ strata: morph: strata/foundation.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph - name: tools diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph index 2e139755..e1979d44 100644 --- a/systems/weston-system-armv7lhf-jetson.morph +++ b/systems/weston-system-armv7lhf-jetson.morph @@ -19,8 +19,10 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: wayland-generic morph: strata/wayland-generic.morph - name: graphics-common diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph index de099697..dfa5c3df 100644 --- a/systems/weston-system-x86_64-generic.morph +++ b/systems/weston-system-x86_64-generic.morph @@ -19,8 +19,10 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: wayland-generic morph: strata/wayland-generic.morph - name: graphics-common diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph index 697ea52d..5aea4f7b 100644 --- a/systems/xfce-system.morph +++ b/systems/xfce-system.morph @@ -23,8 +23,10 @@ strata: morph: strata/x-common.morph - name: x-generic morph: strata/x-generic.morph -- name: multimedia - morph: strata/multimedia.morph +- name: multimedia-common + morph: strata/multimedia-common.morph +- name: multimedia-gstreamer + morph: strata/multimedia-gstreamer.morph - name: genivi morph: strata/genivi.morph - name: gtk2 |