From fec4238e53ef0c95e7f5f14c629651cdad72b7c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 20 Feb 2015 14:06:55 +0000 Subject: Add multimedia-common stratum with libogg and libvorbis for now --- strata/multimedia-common.morph | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 strata/multimedia-common.morph 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 -- cgit v1.2.1 From 09c9893ee8eb23ab1208f818757b60d84f0cd640 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 20 Feb 2015 14:13:13 +0000 Subject: Make multimedia and multimedia-gstreamer-0.10 depend on multimedia-common Change the systems as well so nothing break --- strata/multimedia-gstreamer-0.10.morph | 1 + strata/multimedia.morph | 1 + systems/genivi-baseline-system-armv7lhf-jetson.morph | 2 ++ systems/genivi-baseline-system-armv7lhf-versatile.morph | 2 ++ systems/genivi-baseline-system-x86_64-generic.morph | 2 ++ systems/gitlab-ci-runner.morph | 2 ++ systems/qt4-devel-system-x86_64-generic.morph | 2 ++ systems/qt5-devel-system-x86_64-generic.morph | 2 ++ systems/weston-system-armv7lhf-jetson.morph | 2 ++ systems/weston-system-x86_64-generic.morph | 2 ++ systems/xfce-system.morph | 2 ++ 11 files changed, 20 insertions(+) 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.morph index 6acab0f7..29d400ab 100644 --- a/strata/multimedia.morph +++ b/strata/multimedia.morph @@ -3,6 +3,7 @@ kind: stratum description: Codecs build-depends: - morph: strata/audio-bluetooth.morph +- morph: strata/multimedia-common.morph chunks: - name: orc repo: upstream:orc diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index 5cbfddbe..74000f5f 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -19,6 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia morph: strata/multimedia.morph - name: genivi diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index a5f07750..0fc7a30a 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -19,6 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia morph: strata/multimedia.morph - name: genivi diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index f5fb571e..20c9c13f 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -19,6 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia morph: strata/multimedia.morph - name: genivi diff --git a/systems/gitlab-ci-runner.morph b/systems/gitlab-ci-runner.morph index b4e20ec7..6c2af7a9 100644 --- a/systems/gitlab-ci-runner.morph +++ b/systems/gitlab-ci-runner.morph @@ -21,6 +21,8 @@ strata: morph: strata/x-common.morph - name: x-generic morph: strata/x-generic.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia morph: strata/multimedia.morph - name: genivi diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph index 9a23bdeb..0a98f205 100644 --- a/systems/qt4-devel-system-x86_64-generic.morph +++ b/systems/qt4-devel-system-x86_64-generic.morph @@ -12,6 +12,8 @@ strata: morph: strata/foundation.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia-gstreamer-0.10 morph: strata/multimedia-gstreamer-0.10.morph - name: bsp-x86_64-generic diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph index 1a78ff4f..57d1f122 100644 --- a/systems/qt5-devel-system-x86_64-generic.morph +++ b/systems/qt5-devel-system-x86_64-generic.morph @@ -12,6 +12,8 @@ strata: morph: strata/foundation.morph - name: audio-bluetooth morph: strata/audio-bluetooth.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia morph: strata/multimedia.morph - name: bsp-x86_64-generic diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph index 2e139755..062324ff 100644 --- a/systems/weston-system-armv7lhf-jetson.morph +++ b/systems/weston-system-armv7lhf-jetson.morph @@ -19,6 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia morph: strata/multimedia.morph - name: wayland-generic diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph index de099697..f9c6280b 100644 --- a/systems/weston-system-x86_64-generic.morph +++ b/systems/weston-system-x86_64-generic.morph @@ -19,6 +19,8 @@ strata: morph: strata/audio-bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia morph: strata/multimedia.morph - name: wayland-generic diff --git a/systems/xfce-system.morph b/systems/xfce-system.morph index 697ea52d..3f0a2465 100644 --- a/systems/xfce-system.morph +++ b/systems/xfce-system.morph @@ -23,6 +23,8 @@ strata: morph: strata/x-common.morph - name: x-generic morph: strata/x-generic.morph +- name: multimedia-common + morph: strata/multimedia-common.morph - name: multimedia morph: strata/multimedia.morph - name: genivi -- cgit v1.2.1 From 99b689ac7a42a1cd2df5a23a45ff0b1b38ad98f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 20 Feb 2015 14:20:30 +0000 Subject: strata/multimedia: Make multimedia stratum depend on mesa-common So we can build the new GL and wayland plugins --- strata/multimedia.morph | 1 + 1 file changed, 1 insertion(+) diff --git a/strata/multimedia.morph b/strata/multimedia.morph index 29d400ab..d4451abd 100644 --- a/strata/multimedia.morph +++ b/strata/multimedia.morph @@ -4,6 +4,7 @@ description: Codecs build-depends: - morph: strata/audio-bluetooth.morph - morph: strata/multimedia-common.morph +- morph: strata/mesa-common.morph chunks: - name: orc repo: upstream:orc -- cgit v1.2.1 From b6461f046ff67295ce3aaea38689800aea7570a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 20 Feb 2015 15:47:31 +0000 Subject: Rename multimedia to multimedia-gstreamer --- strata/enlightenment.morph | 2 +- strata/multimedia-gstreamer.morph | 41 ++++++++++++++++++++++ strata/multimedia.morph | 41 ---------------------- strata/qt5-tools-qtmultimedia.morph | 2 +- strata/qt5-tools-qtwebkit.morph | 2 +- .../genivi-baseline-system-armv7lhf-jetson.morph | 4 +-- ...genivi-baseline-system-armv7lhf-versatile.morph | 4 +-- .../genivi-baseline-system-x86_64-generic.morph | 4 +-- systems/gitlab-ci-runner.morph | 4 +-- systems/qt5-devel-system-x86_64-generic.morph | 4 +-- systems/weston-system-armv7lhf-jetson.morph | 4 +-- systems/weston-system-x86_64-generic.morph | 4 +-- systems/xfce-system.morph | 4 +-- 13 files changed, 60 insertions(+), 60 deletions(-) create mode 100644 strata/multimedia-gstreamer.morph delete mode 100644 strata/multimedia.morph 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-gstreamer.morph b/strata/multimedia-gstreamer.morph new file mode 100644 index 00000000..cee7df71 --- /dev/null +++ b/strata/multimedia-gstreamer.morph @@ -0,0 +1,41 @@ +name: multimedia-gstreamer +kind: stratum +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 + ref: 16e053b8f2359196fd50b111f1c10b93590f5cb9 + unpetrify-ref: orc-0.4.22 + build-depends: [] +- name: gstreamer + repo: upstream:gstreamer + ref: b9b3440e323c7b32a8c3a9d52c7bf1a229850558 + unpetrify-ref: baserock/1.4 + build-depends: + - orc +- name: gstreamer-plugins-base + repo: upstream:gstreamer-plugins-base + ref: 3b38ad94a2d58c07c24e4647e08afa1fe4dd7d46 + unpetrify-ref: baserock/1.4 + build-depends: + - gstreamer +- name: gstreamer-plugins-good + repo: upstream:gstreamer-plugins-good + ref: 9d48c2f7a7b63fd967de7eec72434bc876c02667 + unpetrify-ref: baserock/1.4 + build-depends: + - gstreamer + - gstreamer-plugins-base + - orc +- name: gstreamer-plugins-bad + repo: upstream:gstreamer-plugins-bad + ref: bb2a4669ff57af90c8101c54744d3228aa060475 + unpetrify-ref: baserock/1.4 + build-depends: + - gstreamer + - gstreamer-plugins-base + - orc diff --git a/strata/multimedia.morph b/strata/multimedia.morph deleted file mode 100644 index d4451abd..00000000 --- a/strata/multimedia.morph +++ /dev/null @@ -1,41 +0,0 @@ -name: multimedia -kind: stratum -description: Codecs -build-depends: -- morph: strata/audio-bluetooth.morph -- morph: strata/multimedia-common.morph -- morph: strata/mesa-common.morph -chunks: -- name: orc - repo: upstream:orc - ref: 16e053b8f2359196fd50b111f1c10b93590f5cb9 - unpetrify-ref: orc-0.4.22 - build-depends: [] -- name: gstreamer - repo: upstream:gstreamer - ref: b9b3440e323c7b32a8c3a9d52c7bf1a229850558 - unpetrify-ref: baserock/1.4 - build-depends: - - orc -- name: gstreamer-plugins-base - repo: upstream:gstreamer-plugins-base - ref: 3b38ad94a2d58c07c24e4647e08afa1fe4dd7d46 - unpetrify-ref: baserock/1.4 - build-depends: - - gstreamer -- name: gstreamer-plugins-good - repo: upstream:gstreamer-plugins-good - ref: 9d48c2f7a7b63fd967de7eec72434bc876c02667 - unpetrify-ref: baserock/1.4 - build-depends: - - gstreamer - - gstreamer-plugins-base - - orc -- name: gstreamer-plugins-bad - repo: upstream:gstreamer-plugins-bad - ref: bb2a4669ff57af90c8101c54744d3228aa060475 - unpetrify-ref: baserock/1.4 - build-depends: - - gstreamer - - gstreamer-plugins-base - - 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: diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index 74000f5f..50581561 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 0fc7a30a..16bed197 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 20c9c13f..f4828688 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 6c2af7a9..979b73b0 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 57d1f122..0f768536 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 062324ff..e1979d44 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 f9c6280b..dfa5c3df 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 3f0a2465..5aea4f7b 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 -- cgit v1.2.1