summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-02-20 15:47:31 (GMT)
committerJavier Jardón <jjardon@gnome.org>2015-02-20 15:51:49 (GMT)
commitb6461f046ff67295ce3aaea38689800aea7570a7 (patch)
treee9c083056ad6ea10e80d34c3b5adce22074147b1
parent99b689ac7a42a1cd2df5a23a45ff0b1b38ad98f8 (diff)
downloaddefinitions-b6461f046ff67295ce3aaea38689800aea7570a7.tar.gz
Rename multimedia to multimedia-gstreamerbaserock/jjardon/multimedia
-rw-r--r--strata/enlightenment.morph2
-rw-r--r--strata/multimedia-gstreamer.morph (renamed from strata/multimedia.morph)4
-rw-r--r--strata/qt5-tools-qtmultimedia.morph2
-rw-r--r--strata/qt5-tools-qtwebkit.morph2
-rw-r--r--systems/genivi-baseline-system-armv7lhf-jetson.morph4
-rw-r--r--systems/genivi-baseline-system-armv7lhf-versatile.morph4
-rw-r--r--systems/genivi-baseline-system-x86_64-generic.morph4
-rw-r--r--systems/gitlab-ci-runner.morph4
-rw-r--r--systems/qt5-devel-system-x86_64-generic.morph4
-rw-r--r--systems/weston-system-armv7lhf-jetson.morph4
-rw-r--r--systems/weston-system-x86_64-generic.morph4
-rw-r--r--systems/xfce-system.morph4
12 files changed, 21 insertions, 21 deletions
diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph
index 541b4f7..25eafce 100644
--- a/strata/enlightenment.morph
+++ b/strata/enlightenment.morph
@@ -6,7 +6,7 @@ build-depends:
- morph: strata/x-generic.morph
- morph: strata/lua.morph
- morph: strata/audio-bluetooth.morph
-- morph: strata/multimedia.morph
+- morph: strata/multimedia-gstreamer.morph
- morph: strata/connman-common.morph
chunks:
- name: fribidi
diff --git a/strata/multimedia.morph b/strata/multimedia-gstreamer.morph
index d4451ab..cee7df7 100644
--- a/strata/multimedia.morph
+++ b/strata/multimedia-gstreamer.morph
@@ -1,6 +1,6 @@
-name: multimedia
+name: multimedia-gstreamer
kind: stratum
-description: Codecs
+description: GStreamer multimedia components
build-depends:
- morph: strata/audio-bluetooth.morph
- morph: strata/multimedia-common.morph
diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph
index 6482db6..df36cca 100644
--- a/strata/qt5-tools-qtmultimedia.morph
+++ b/strata/qt5-tools-qtmultimedia.morph
@@ -6,7 +6,7 @@ build-depends:
- morph: strata/multimedia-gstreamer-0.10.morph
chunks:
- name: qtmultimedia
- morph: strata/qt5-tools/qtmultimedia.morph
+ morph: strata/qt5-tools/qtmultimedia-gstreamer.morph
repo: upstream:qt5/qtmultimedia
ref: b3c2dca466042cf362ffb8d803bf05c9b8a0f95f
unpetrify-ref: v5.3.2
diff --git a/strata/qt5-tools-qtwebkit.morph b/strata/qt5-tools-qtwebkit.morph
index 1d74694..4441e46 100644
--- a/strata/qt5-tools-qtwebkit.morph
+++ b/strata/qt5-tools-qtwebkit.morph
@@ -2,7 +2,7 @@ name: qt5-tools-qtwebkit
kind: stratum
description: Qt5 WebKit Development Libraries and Tools
build-depends:
-- morph: strata/multimedia.morph
+- morph: strata/multimedia-gstreamer.morph
- morph: strata/qt5-tools.morph
- morph: strata/ruby.morph
chunks:
diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph
index 74000f5..5058156 100644
--- a/systems/genivi-baseline-system-armv7lhf-jetson.morph
+++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph
@@ -21,8 +21,8 @@ strata:
morph: strata/libdrm-common.morph
- name: multimedia-common
morph: strata/multimedia-common.morph
-- name: multimedia
- morph: strata/multimedia.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 0fc7a30..16bed19 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -21,8 +21,8 @@ strata:
morph: strata/libdrm-common.morph
- name: multimedia-common
morph: strata/multimedia-common.morph
-- name: multimedia
- morph: strata/multimedia.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 20c9c13..f482868 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -21,8 +21,8 @@ strata:
morph: strata/libdrm-common.morph
- name: multimedia-common
morph: strata/multimedia-common.morph
-- name: multimedia
- morph: strata/multimedia.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 6c2af7a..979b73b 100644
--- a/systems/gitlab-ci-runner.morph
+++ b/systems/gitlab-ci-runner.morph
@@ -23,8 +23,8 @@ strata:
morph: strata/x-generic.morph
- name: multimedia-common
morph: strata/multimedia-common.morph
-- name: multimedia
- morph: strata/multimedia.morph
+- name: multimedia-gstreamer
+ morph: strata/multimedia-gstreamer.morph
- name: genivi
morph: strata/genivi.morph
- name: tools
diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph
index 57d1f12..0f76853 100644
--- a/systems/qt5-devel-system-x86_64-generic.morph
+++ b/systems/qt5-devel-system-x86_64-generic.morph
@@ -14,8 +14,8 @@ strata:
morph: strata/audio-bluetooth.morph
- name: multimedia-common
morph: strata/multimedia-common.morph
-- name: multimedia
- morph: strata/multimedia.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 062324f..e1979d4 100644
--- a/systems/weston-system-armv7lhf-jetson.morph
+++ b/systems/weston-system-armv7lhf-jetson.morph
@@ -21,8 +21,8 @@ strata:
morph: strata/libdrm-common.morph
- name: multimedia-common
morph: strata/multimedia-common.morph
-- name: multimedia
- morph: strata/multimedia.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 f9c6280..dfa5c3d 100644
--- a/systems/weston-system-x86_64-generic.morph
+++ b/systems/weston-system-x86_64-generic.morph
@@ -21,8 +21,8 @@ strata:
morph: strata/libdrm-common.morph
- name: multimedia-common
morph: strata/multimedia-common.morph
-- name: multimedia
- morph: strata/multimedia.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 3f0a246..5aea4f7 100644
--- a/systems/xfce-system.morph
+++ b/systems/xfce-system.morph
@@ -25,8 +25,8 @@ strata:
morph: strata/x-generic.morph
- name: multimedia-common
morph: strata/multimedia-common.morph
-- name: multimedia
- morph: strata/multimedia.morph
+- name: multimedia-gstreamer
+ morph: strata/multimedia-gstreamer.morph
- name: genivi
morph: strata/genivi.morph
- name: gtk2