diff options
| author | Javier Jardón <jjardon@gnome.org> | 2015-02-20 15:54:27 +0000 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2015-02-20 15:54:52 +0000 |
| commit | 96168a6614a567928dd2f244998a9ad3e8f29359 (patch) | |
| tree | 721478e017a707e81e8894b63e3a9fc7b786ad26 /strata | |
| parent | ef71b54fd294613f230697a2f74d39e507d03b23 (diff) | |
| parent | b6461f046ff67295ce3aaea38689800aea7570a7 (diff) | |
| download | definitions-96168a6614a567928dd2f244998a9ad3e8f29359.tar.gz | |
Merge branch 'baserock/jjardon/multimedia'
Reviewed-by: Sam Thursfield <sam.thursfield@codethink.co.uk>
Reviewed-by: James Thomas <james.thomas@codethink.co.uk>
Diffstat (limited to 'strata')
| -rw-r--r-- | strata/enlightenment.morph | 2 | ||||
| -rw-r--r-- | strata/multimedia-common.morph | 17 | ||||
| -rw-r--r-- | strata/multimedia-gstreamer-0.10.morph | 1 | ||||
| -rw-r--r-- | strata/multimedia-gstreamer.morph (renamed from strata/multimedia.morph) | 6 | ||||
| -rw-r--r-- | strata/qt5-tools-qtmultimedia.morph | 2 | ||||
| -rw-r--r-- | strata/qt5-tools-qtwebkit.morph | 2 |
6 files changed, 25 insertions, 5 deletions
diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph index 541b4f7a..25eafce2 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-common.morph b/strata/multimedia-common.morph new file mode 100644 index 00000000..f10dd2b3 --- /dev/null +++ b/strata/multimedia-common.morph @@ -0,0 +1,17 @@ +name: multimedia-common +kind: stratum +description: Mutimedia Libraries +build-depends: +- morph: strata/core.morph +chunks: +- name: ogg + repo: upstream:ogg + ref: 0deb6226917e32a71f15d5279d0bc76d8b97c13f + unpetrify-ref: master + build-depends: [] +- name: libvorbis + repo: upstream:libvorbis + ref: 2ae58009cbc655a6031280f92fb1e7b324318ae8 + unpetrify-ref: libvorbis-1.3.3 + build-depends: + - ogg diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph index 50917372..e87c4050 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-gstreamer.morph index 6acab0f7..cee7df71 100644 --- a/strata/multimedia.morph +++ b/strata/multimedia-gstreamer.morph @@ -1,8 +1,10 @@ -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 +- morph: strata/mesa-common.morph chunks: - name: orc repo: upstream:orc diff --git a/strata/qt5-tools-qtmultimedia.morph b/strata/qt5-tools-qtmultimedia.morph index 6482db62..df36ccad 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 1d746949..4441e46b 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: |