summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Dale <richard.dale@codethink.co.uk>2013-07-03 16:40:24 +0100
committerRichard Dale <richard.dale@codethink.co.uk>2013-07-03 16:40:24 +0100
commit8a60d5124f2a33aeaab8dc193abd5db0e4231f30 (patch)
tree0ed99077a287b68f36b75f8c459039faeb5495ae
parent6b2fca375fc9fe7833bb470d1ed5fa9ec0aec46b (diff)
downloaddefinitions-8a60d5124f2a33aeaab8dc193abd5db0e4231f30.tar.gz
This patch adds gstreamer-plugins-base to the multimedia stratum
It reverts the gstreamer version for 1.0 to 0.10 The multimedia stratum is used by Enlightenment, Qt4 and Qt5
-rw-r--r--enlightenment.morph6
-rw-r--r--multimedia.morph9
-rw-r--r--qt4-devel-system-x86_64-generic.morph6
-rw-r--r--qt5-devel-system-x86_64-generic.morph6
4 files changed, 25 insertions, 2 deletions
diff --git a/enlightenment.morph b/enlightenment.morph
index 0a0c4a0d..15c77e6d 100644
--- a/enlightenment.morph
+++ b/enlightenment.morph
@@ -11,6 +11,12 @@ build-depends:
- repo: baserock:baserock/morphs
ref: master
morph: lua
+- repo: baserock:baserock/morphs
+ ref: master
+ morph: audio-bluetooth
+- repo: baserock:baserock/morphs
+ ref: master
+ morph: multimedia
chunks:
- name: efl
repo: upstream:enlightenment/efl
diff --git a/multimedia.morph b/multimedia.morph
index 18279bb6..4cfc415c 100644
--- a/multimedia.morph
+++ b/multimedia.morph
@@ -8,7 +8,7 @@ build-depends:
- morph: foundation
repo: baserock:baserock/morphs
ref: master
-- morph: genivi-foundation
+- morph: audio-bluetooth
repo: baserock:baserock/morphs
ref: master
chunks:
@@ -18,6 +18,11 @@ chunks:
build-depends: []
- name: gstreamer
repo: upstream:gstreamer
- ref: baserock/genivi/baseline
+ 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
diff --git a/qt4-devel-system-x86_64-generic.morph b/qt4-devel-system-x86_64-generic.morph
index 3ac71819..9b5163f9 100644
--- a/qt4-devel-system-x86_64-generic.morph
+++ b/qt4-devel-system-x86_64-generic.morph
@@ -15,6 +15,12 @@ strata:
- morph: foundation
repo: baserock:baserock/morphs
ref: master
+- morph: audio-bluetooth
+ repo: baserock:baserock/morphs
+ ref: master
+- morph: multimedia
+ repo: baserock:baserock/morphs
+ ref: master
- morph: bsp-x86_64-generic
repo: baserock:baserock/morphs
ref: master
diff --git a/qt5-devel-system-x86_64-generic.morph b/qt5-devel-system-x86_64-generic.morph
index 68ecd431..ea920eb1 100644
--- a/qt5-devel-system-x86_64-generic.morph
+++ b/qt5-devel-system-x86_64-generic.morph
@@ -15,6 +15,12 @@ strata:
- morph: foundation
repo: baserock:baserock/morphs
ref: master
+- morph: audio-bluetooth
+ repo: baserock:baserock/morphs
+ ref: master
+- morph: multimedia
+ repo: baserock:baserock/morphs
+ ref: master
- morph: bsp-x86_64-generic
repo: baserock:baserock/morphs
ref: master