Add a 'multimedia-gstreamer-0.10' morph for use with components that

need gstreamer 0.10

Revert the multimedia.morph back to gstreamer 1.0 for use with GENIVI

7 files changed, 41 insertions, 18 deletions

diff --git a/enlightenment.morph b/enlightenment.morph
index 15c77e6d..3c54b0a9 100644
--- a/enlightenment.morph
+++ b/enlightenment.morph
@@ -16,7 +16,7 @@ build-depends:
   morph: audio-bluetooth
 - repo: baserock:baserock/morphs
   ref: master
-  morph: multimedia
+  morph: multimedia-gstreamer-0.10
 chunks:
 - name: efl
   repo: upstream:enlightenment/efl
diff --git a/multimedia-gstreamer-0.10.morph b/multimedia-gstreamer-0.10.morph
new file mode 100644
index 00000000..df9bbe7e
--- /dev/null
+++ b/multimedia-gstreamer-0.10.morph
@@ -0,0 +1,35 @@
+name: multimedia
+kind: stratum
+description: Codecs
+build-depends:
+- morph: core
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: foundation
+  repo: baserock:baserock/morphs
+  ref: master
+- morph: audio-bluetooth
+  repo: baserock:baserock/morphs
+  ref: master
+chunks:
+- name: orc
+  repo: upstream:orc
+  ref: baserock/morph
+  build-depends: []
+- name: gstreamer
+  repo: upstream:gstreamer
+  ref: baserock/morph/0.10
+  build-depends:
+  - orc
+- name: gstreamer-plugins-base
+  repo: upstream:gstreamer-plugins-base
+  ref: baserock/morph/0.10
+  build-depends:
+  - gstreamer
+- name: gstreamer-plugins-good
+  repo: upstream:gstreamer-plugins-good
+  ref: baserock/morph/0.10
+  build-depends:
+  - gstreamer
+  - gstreamer-plugins-base
+  - orc
diff --git a/multimedia.morph b/multimedia.morph
index df9bbe7e..1df108b6 100644
--- a/multimedia.morph
+++ b/multimedia.morph
@@ -18,18 +18,6 @@ chunks:
   build-depends: []
 - name: gstreamer
   repo: upstream:gstreamer
-  ref: baserock/morph/0.10
+  ref: baserock/genivi/baseline
   build-depends:
   - orc
-- name: gstreamer-plugins-base
-  repo: upstream:gstreamer-plugins-base
-  ref: baserock/morph/0.10
-  build-depends:
-  - gstreamer
-- name: gstreamer-plugins-good
-  repo: upstream:gstreamer-plugins-good
-  ref: baserock/morph/0.10
-  build-depends:
-  - gstreamer
-  - gstreamer-plugins-base
-  - orc
diff --git a/qt4-devel-system-x86_64-generic.morph b/qt4-devel-system-x86_64-generic.morph
index 9b5163f9..0e17657d 100644
--- a/qt4-devel-system-x86_64-generic.morph
+++ b/qt4-devel-system-x86_64-generic.morph
@@ -18,7 +18,7 @@ strata:
 - morph: audio-bluetooth
   repo: baserock:baserock/morphs
   ref: master
-- morph: multimedia
+- morph: multimedia-gstreamer-0.10
   repo: baserock:baserock/morphs
   ref: master
 - morph: bsp-x86_64-generic
diff --git a/qt4-tools.morph b/qt4-tools.morph
index e7430943..241ac9c0 100644
--- a/qt4-tools.morph
+++ b/qt4-tools.morph
@@ -10,7 +10,7 @@ build-depends:
   morph: x-x86_64-generic
 - repo: baserock:baserock/morphs
   ref: master
-  morph: multimedia
+  morph: multimedia-gstreamer-0.10
 chunks:
 - name: icu
   repo: upstream:icu
diff --git a/qt5-devel-system-x86_64-generic.morph b/qt5-devel-system-x86_64-generic.morph
index ea920eb1..efa5e0c8 100644
--- a/qt5-devel-system-x86_64-generic.morph
+++ b/qt5-devel-system-x86_64-generic.morph
@@ -18,7 +18,7 @@ strata:
 - morph: audio-bluetooth
   repo: baserock:baserock/morphs
   ref: master
-- morph: multimedia
+- morph: multimedia-gstreamer-0.10
   repo: baserock:baserock/morphs
   ref: master
 - morph: bsp-x86_64-generic
diff --git a/qt5-tools.morph b/qt5-tools.morph
index 365f113d..09c7e531 100644
--- a/qt5-tools.morph
+++ b/qt5-tools.morph
@@ -10,7 +10,7 @@ build-depends:
   morph: x-x86_64-generic
 - repo: baserock:baserock/morphs
   ref: master
-  morph: multimedia
+  morph: multimedia-gstreamer-0.10
 chunks:
 - name: icu
   repo: upstream:icu