summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-02-20 14:13:13 (GMT)
committerJavier Jardón <jjardon@gnome.org>2015-02-20 14:32:30 (GMT)
commit09c9893ee8eb23ab1208f818757b60d84f0cd640 (patch)
treecb1eba6ced997febc0438582cbd1c38504bbfa1e
parentfec4238e53ef0c95e7f5f14c629651cdad72b7c9 (diff)
downloaddefinitions-09c9893ee8eb23ab1208f818757b60d84f0cd640.tar.gz
Make multimedia and multimedia-gstreamer-0.10 depend on multimedia-common
Change the systems as well so nothing break
-rw-r--r--strata/multimedia-gstreamer-0.10.morph1
-rw-r--r--strata/multimedia.morph1
-rw-r--r--systems/genivi-baseline-system-armv7lhf-jetson.morph2
-rw-r--r--systems/genivi-baseline-system-armv7lhf-versatile.morph2
-rw-r--r--systems/genivi-baseline-system-x86_64-generic.morph2
-rw-r--r--systems/gitlab-ci-runner.morph2
-rw-r--r--systems/qt4-devel-system-x86_64-generic.morph2
-rw-r--r--systems/qt5-devel-system-x86_64-generic.morph2
-rw-r--r--systems/weston-system-armv7lhf-jetson.morph2
-rw-r--r--systems/weston-system-x86_64-generic.morph2
-rw-r--r--systems/xfce-system.morph2
11 files changed, 20 insertions, 0 deletions
diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph
index 5091737..e87c405 100644
--- a/strata/multimedia-gstreamer-0.10.morph
+++ b/strata/multimedia-gstreamer-0.10.morph
@@ -5,6 +5,7 @@ build-depends:
- morph: strata/core.morph
- morph: strata/foundation.morph
- morph: strata/audio-bluetooth.morph
+- morph: strata/multimedia-common.morph
chunks:
- name: orc
repo: upstream:orc
diff --git a/strata/multimedia.morph b/strata/multimedia.morph
index 6acab0f..29d400a 100644
--- a/strata/multimedia.morph
+++ b/strata/multimedia.morph
@@ -3,6 +3,7 @@ kind: stratum
description: Codecs
build-depends:
- morph: strata/audio-bluetooth.morph
+- morph: strata/multimedia-common.morph
chunks:
- name: orc
repo: upstream:orc
diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph
index 5cbfddb..74000f5 100644
--- a/systems/genivi-baseline-system-armv7lhf-jetson.morph
+++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph
@@ -19,6 +19,8 @@ strata:
morph: strata/audio-bluetooth.morph
- name: libdrm-common
morph: strata/libdrm-common.morph
+- name: multimedia-common
+ morph: strata/multimedia-common.morph
- name: multimedia
morph: strata/multimedia.morph
- name: genivi
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index a5f0775..0fc7a30 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -19,6 +19,8 @@ strata:
morph: strata/audio-bluetooth.morph
- name: libdrm-common
morph: strata/libdrm-common.morph
+- name: multimedia-common
+ morph: strata/multimedia-common.morph
- name: multimedia
morph: strata/multimedia.morph
- name: genivi
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index f5fb571..20c9c13 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -19,6 +19,8 @@ strata:
morph: strata/audio-bluetooth.morph
- name: libdrm-common
morph: strata/libdrm-common.morph
+- name: multimedia-common
+ morph: strata/multimedia-common.morph
- name: multimedia
morph: strata/multimedia.morph
- name: genivi
diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph
index b4e20ec..6c2af7a 100644
--- a/systems/gitlab-ci-runner.morph
+++ b/systems/gitlab-ci-runner.morph
@@ -21,6 +21,8 @@ strata:
morph: strata/x-common.morph
- name: x-generic
morph: strata/x-generic.morph
+- name: multimedia-common
+ morph: strata/multimedia-common.morph
- name: multimedia
morph: strata/multimedia.morph
- name: genivi
diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph
index 9a23bde..0a98f20 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 1a78ff4..57d1f12 100644
--- a/systems/qt5-devel-system-x86_64-generic.morph
+++ b/systems/qt5-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
morph: strata/multimedia.morph
- name: bsp-x86_64-generic
diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph
index 2e13975..062324f 100644
--- a/systems/weston-system-armv7lhf-jetson.morph
+++ b/systems/weston-system-armv7lhf-jetson.morph
@@ -19,6 +19,8 @@ strata:
morph: strata/audio-bluetooth.morph
- name: libdrm-common
morph: strata/libdrm-common.morph
+- name: multimedia-common
+ morph: strata/multimedia-common.morph
- name: multimedia
morph: strata/multimedia.morph
- name: wayland-generic
diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph
index de09969..f9c6280 100644
--- a/systems/weston-system-x86_64-generic.morph
+++ b/systems/weston-system-x86_64-generic.morph
@@ -19,6 +19,8 @@ strata:
morph: strata/audio-bluetooth.morph
- name: libdrm-common
morph: strata/libdrm-common.morph
+- name: multimedia-common
+ morph: strata/multimedia-common.morph
- name: multimedia
morph: strata/multimedia.morph
- name: wayland-generic
diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph
index 697ea52..3f0a246 100644
--- a/systems/xfce-system.morph
+++ b/systems/xfce-system.morph
@@ -23,6 +23,8 @@ strata:
morph: strata/x-common.morph
- name: x-generic
morph: strata/x-generic.morph
+- name: multimedia-common
+ morph: strata/multimedia-common.morph
- name: multimedia
morph: strata/multimedia.morph
- name: genivi