diff options
author | Richard Dale <richard.dale@codethink.co.uk> | 2013-07-09 03:41:19 +0100 |
---|---|---|
committer | Richard Dale <richard.dale@codethink.co.uk> | 2013-07-09 03:41:19 +0100 |
commit | 31f18eb4755a68888feed90e7cdc6847177abd16 (patch) | |
tree | 1f24146454d090259029fd9ee33a945210d2ac53 | |
parent | ced7381d7466dad364a9dc0b687d35448e48043e (diff) | |
download | morphs-31f18eb4755a68888feed90e7cdc6847177abd16.tar.gz |
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
-rw-r--r-- | enlightenment.morph | 2 | ||||
-rw-r--r-- | multimedia-gstreamer-0.10.morph | 35 | ||||
-rw-r--r-- | multimedia.morph | 14 | ||||
-rw-r--r-- | qt4-devel-system-x86_64-generic.morph | 2 | ||||
-rw-r--r-- | qt4-tools.morph | 2 | ||||
-rw-r--r-- | qt5-devel-system-x86_64-generic.morph | 2 | ||||
-rw-r--r-- | qt5-tools.morph | 2 |
7 files changed, 41 insertions, 18 deletions
diff --git a/enlightenment.morph b/enlightenment.morph index 15c77e6..3c54b0a 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 0000000..df9bbe7 --- /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 df9bbe7..1df108b 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 9b5163f..0e17657 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 e743094..241ac9c 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 ea920eb..efa5e0c 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 365f113..09c7e53 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 |