diff options
Diffstat (limited to 'strata')
-rw-r--r-- | strata/NetworkManager-common.morph | 2 | ||||
-rw-r--r-- | strata/audio-bluetooth/nohands.morph | 5 | ||||
-rw-r--r-- | strata/bluetooth.morph | 39 | ||||
-rw-r--r-- | strata/bluetooth/bluez-tools.morph (renamed from strata/audio-bluetooth/bluez-tools.morph) | 0 | ||||
-rw-r--r-- | strata/bluetooth/bluez.morph (renamed from strata/audio-bluetooth/bluez.morph) | 0 | ||||
-rw-r--r-- | strata/bluetooth/libical.morph (renamed from strata/audio-bluetooth/libical.morph) | 0 | ||||
-rw-r--r-- | strata/enlightenment.morph | 2 | ||||
-rw-r--r-- | strata/genivi-demo-platform-libs.morph | 1 | ||||
-rw-r--r-- | strata/genivi.morph | 2 | ||||
-rw-r--r-- | strata/gnome.morph | 3 | ||||
-rw-r--r-- | strata/multimedia-gstreamer-0.10.morph | 2 | ||||
-rw-r--r-- | strata/multimedia-gstreamer.morph | 2 | ||||
-rw-r--r-- | strata/sound-server-pulseaudio.morph (renamed from strata/audio-bluetooth.morph) | 60 | ||||
-rw-r--r-- | strata/sound-server-pulseaudio/alsa-utils.morph (renamed from strata/audio-bluetooth/alsa-utils.morph) | 0 | ||||
-rw-r--r-- | strata/sound-server-pulseaudio/avahi.morph (renamed from strata/audio-bluetooth/avahi.morph) | 0 | ||||
-rw-r--r-- | strata/sound-server-pulseaudio/json-c.morph (renamed from strata/audio-bluetooth/json-c.morph) | 0 | ||||
-rw-r--r-- | strata/sound-server-pulseaudio/libsndfile.morph (renamed from strata/audio-bluetooth/libsndfile.morph) | 0 | ||||
-rw-r--r-- | strata/sound-server-pulseaudio/pulseaudio.morph (renamed from strata/audio-bluetooth/pulseaudio.morph) | 0 | ||||
-rw-r--r-- | strata/sound-server-pulseaudio/webrtc-audio-processing.morph (renamed from strata/audio-bluetooth/webrtc-audio-processing.morph) | 0 | ||||
-rw-r--r-- | strata/xfce.morph | 2 |
20 files changed, 56 insertions, 64 deletions
diff --git a/strata/NetworkManager-common.morph b/strata/NetworkManager-common.morph index 35ed2107..41ead7ac 100644 --- a/strata/NetworkManager-common.morph +++ b/strata/NetworkManager-common.morph @@ -1,7 +1,7 @@ name: NetworkManager-common kind: stratum build-depends: -- morph: strata/audio-bluetooth.morph +- morph: strata/bluetooth.morph - morph: strata/connectivity.morph - morph: strata/device-management.morph - morph: strata/network-security.morph diff --git a/strata/audio-bluetooth/nohands.morph b/strata/audio-bluetooth/nohands.morph deleted file mode 100644 index ebe249c0..00000000 --- a/strata/audio-bluetooth/nohands.morph +++ /dev/null @@ -1,5 +0,0 @@ -name: nohands -kind: chunk -build-system: autotools -build-commands: -- make CXXFLAGS="-fpermissive -lpthread" diff --git a/strata/bluetooth.morph b/strata/bluetooth.morph new file mode 100644 index 00000000..70afb597 --- /dev/null +++ b/strata/bluetooth.morph @@ -0,0 +1,39 @@ +name: bluetooth +kind: stratum +description: Components required for bluetooth. +build-depends: +- morph: strata/glib-common.morph +- morph: strata/foundation.morph +chunks: +- name: libical + morph: strata/bluetooth/libical.morph + repo: upstream:libical-git + ref: 6c4af23b0a95fd105f38e879908cbc80390f3716 + unpetrify-ref: v2.0.0 +- name: bluez + morph: strata/bluetooth/bluez.morph + repo: upstream:bluez + ref: 5eb47745978925e451523c8e8cb2ad6a53ed3863 + unpetrify-ref: baserock/5.37+service-api + build-depends: + - libical +- name: dbus-glib + repo: upstream:dbus-glib + ref: 397e8297d433547c9bf4150ddd2b9e0b4c39628c + unpetrify-ref: dbus-glib_0.102 + build-system: autotools +- name: bluez-tools + morph: strata/bluetooth/bluez-tools.morph + repo: upstream:bluez-tools + ref: 7350787e96a6ecf2cc5d4afddb3321ccad9fa461 + unpetrify-ref: baserock/morph + build-depends: + - dbus-glib +- name: obexd + repo: upstream:obexd + ref: 4225280022c206762c91beee47c62d05e1baeacc + unpetrify-ref: baserock/morph + build-system: autotools + build-depends: + - bluez + - libical diff --git a/strata/audio-bluetooth/bluez-tools.morph b/strata/bluetooth/bluez-tools.morph index 80e47ef5..80e47ef5 100644 --- a/strata/audio-bluetooth/bluez-tools.morph +++ b/strata/bluetooth/bluez-tools.morph diff --git a/strata/audio-bluetooth/bluez.morph b/strata/bluetooth/bluez.morph index e7208da7..e7208da7 100644 --- a/strata/audio-bluetooth/bluez.morph +++ b/strata/bluetooth/bluez.morph diff --git a/strata/audio-bluetooth/libical.morph b/strata/bluetooth/libical.morph index 2ee7c96c..2ee7c96c 100644 --- a/strata/audio-bluetooth/libical.morph +++ b/strata/bluetooth/libical.morph diff --git a/strata/enlightenment.morph b/strata/enlightenment.morph index 61942884..5c1dc2c0 100644 --- a/strata/enlightenment.morph +++ b/strata/enlightenment.morph @@ -5,7 +5,7 @@ build-depends: - morph: strata/tools.morph - morph: strata/x-generic.morph - morph: strata/lua51.morph -- morph: strata/audio-bluetooth.morph +- morph: strata/bluetooth.morph - morph: strata/multimedia-gstreamer.morph - morph: strata/connman-common.morph chunks: diff --git a/strata/genivi-demo-platform-libs.morph b/strata/genivi-demo-platform-libs.morph index 5ddc0d1b..05b904bd 100644 --- a/strata/genivi-demo-platform-libs.morph +++ b/strata/genivi-demo-platform-libs.morph @@ -4,7 +4,6 @@ description: Libraries needed for the GENIVI demo platform. build-depends: - morph: strata/foundation.morph - morph: strata/python-pygobject.morph -- morph: strata/audio-bluetooth.morph chunks: - name: dbus-c++ morph: strata/genivi-demo-platform-libs/dbus-c++.morph diff --git a/strata/genivi.morph b/strata/genivi.morph index b0735953..bbdecc67 100644 --- a/strata/genivi.morph +++ b/strata/genivi.morph @@ -3,7 +3,7 @@ kind: stratum description: Software components designed by genivi, for genivi. build-depends: - morph: strata/foundation.morph -- morph: strata/audio-bluetooth.morph +- morph: strata/sound-server-pulseaudio.morph chunks: - name: linuxquota morph: strata/genivi/linuxquota.morph diff --git a/strata/gnome.morph b/strata/gnome.morph index 3a8e0f64..d9ce4eb9 100644 --- a/strata/gnome.morph +++ b/strata/gnome.morph @@ -2,6 +2,7 @@ name: gnome kind: stratum description: GNOME stratum build-depends: +- morph: strata/bluetooth.morph - morph: strata/icu-common.morph - morph: strata/input-common.morph - morph: strata/data-indexing-management.morph @@ -9,7 +10,6 @@ build-depends: - morph: strata/geolocation.morph - morph: strata/gtk2.morph - morph: strata/gtk3.morph -- morph: strata/audio-bluetooth.morph - morph: strata/libsoup-common.morph - morph: strata/NetworkManager-common.morph - morph: strata/multimedia-gstreamer.morph @@ -20,6 +20,7 @@ build-depends: - morph: strata/ruby.morph - morph: strata/samba.morph - morph: strata/secret-service.morph +- morph: strata/sound-server-pulseaudio.morph - morph: strata/spell-checking.morph - morph: strata/cups.morph - morph: strata/WebKitGtk1-common.morph diff --git a/strata/multimedia-gstreamer-0.10.morph b/strata/multimedia-gstreamer-0.10.morph index 81a4960a..1e8be05c 100644 --- a/strata/multimedia-gstreamer-0.10.morph +++ b/strata/multimedia-gstreamer-0.10.morph @@ -4,8 +4,8 @@ description: Codecs build-depends: - morph: strata/core.morph - morph: strata/foundation.morph -- morph: strata/audio-bluetooth.morph - morph: strata/multimedia-common.morph +- morph: strata/sound-server-pulseaudio.morph chunks: - name: gstreamer@0.10 repo: upstream:gstreamer diff --git a/strata/multimedia-gstreamer.morph b/strata/multimedia-gstreamer.morph index 8dcda772..6ac83824 100644 --- a/strata/multimedia-gstreamer.morph +++ b/strata/multimedia-gstreamer.morph @@ -2,11 +2,11 @@ name: multimedia-gstreamer kind: stratum description: GStreamer multimedia components build-depends: -- morph: strata/audio-bluetooth.morph - morph: strata/libsoup-common.morph - morph: strata/multimedia-common.morph - morph: strata/mesa-common.morph - morph: strata/graphics-common.morph +- morph: strata/sound-server-pulseaudio.morph chunks: - name: gstreamer repo: upstream:gstreamer diff --git a/strata/audio-bluetooth.morph b/strata/sound-server-pulseaudio.morph index 4755bb7d..ae66a5f3 100644 --- a/strata/audio-bluetooth.morph +++ b/strata/sound-server-pulseaudio.morph @@ -1,9 +1,8 @@ -name: audio-bluetooth +name: sound-server-pulseaudio kind: stratum -description: Components required for audio and bluetooth. +description: Components required for pulseaudio. build-depends: -- morph: strata/glib-common.morph -- morph: strata/foundation.morph +- morph: strata/bluetooth.morph chunks: - name: libatomic_ops repo: upstream:libatomic_ops @@ -18,7 +17,7 @@ chunks: unpetrify-ref: baserock/v1.0.29 build-system: autotools - name: alsa-utils - morph: strata/audio-bluetooth/alsa-utils.morph + morph: strata/sound-server-pulseaudio/alsa-utils.morph repo: upstream:alsa-utils ref: 85c622e2984b557e6bd79c13cea466012dfb3761 # Note: ref anchored because alsa-utils is known for rebasing @@ -26,58 +25,18 @@ chunks: unpetrify-ref: baserock/v1.0.29 build-depends: - alsa-lib -- name: libical - morph: strata/audio-bluetooth/libical.morph - repo: upstream:libical-git - ref: 6c4af23b0a95fd105f38e879908cbc80390f3716 - unpetrify-ref: v2.0.0 -- name: bluez - morph: strata/audio-bluetooth/bluez.morph - repo: upstream:bluez - ref: 5eb47745978925e451523c8e8cb2ad6a53ed3863 - unpetrify-ref: baserock/5.37+service-api - build-depends: - - libical -- name: dbus-glib - repo: upstream:dbus-glib - ref: 397e8297d433547c9bf4150ddd2b9e0b4c39628c - unpetrify-ref: dbus-glib_0.102 - build-system: autotools -- name: bluez-tools - morph: strata/audio-bluetooth/bluez-tools.morph - repo: upstream:bluez-tools - ref: 7350787e96a6ecf2cc5d4afddb3321ccad9fa461 - unpetrify-ref: baserock/morph - build-depends: - - dbus-glib -- name: obexd - repo: upstream:obexd - ref: 4225280022c206762c91beee47c62d05e1baeacc - unpetrify-ref: baserock/morph - build-system: autotools - build-depends: - - bluez - - libical - name: speex repo: upstream:speex ref: e5dc987a403426ee3d0d81768afffa0fe74e20fa unpetrify-ref: baserock/morph build-system: autotools -- name: nohands - morph: strata/audio-bluetooth/nohands.morph - repo: upstream:nohands - ref: 20ec5cc245fd5e74d9a0fc21497d1ba4164f2a3a - unpetrify-ref: baserock/morph - build-depends: - - bluez - - speex - name: json-c - morph: strata/audio-bluetooth/json-c.morph + morph: strata/sound-server-pulseaudio/json-c.morph repo: upstream:json-c ref: e8bd6865d7a671e9f75ece05dfe86a19ba610581 unpetrify-ref: baserock/json-c-0.12-20140410-plus-patch - name: libsndfile - morph: strata/audio-bluetooth/libsndfile.morph + morph: strata/sound-server-pulseaudio/libsndfile.morph repo: upstream:libsndfile ref: 6c05c615c95ffef7a8a5a707cde0bb52bdd74244 unpetrify-ref: baserock/morph @@ -87,7 +46,7 @@ chunks: unpetrify-ref: v0.14 build-system: autotools - name: avahi - morph: strata/audio-bluetooth/avahi.morph + morph: strata/sound-server-pulseaudio/avahi.morph repo: upstream:avahi ref: 031d6323b5abb785fbe3601b2f163316a1eb54bc unpetrify-ref: v0.6.31 @@ -101,12 +60,12 @@ chunks: build-depends: - libsndfile - name: webrtc-audio-processing - morph: strata/audio-bluetooth/webrtc-audio-processing.morph + morph: strata/sound-server-pulseaudio/webrtc-audio-processing.morph repo: upstream:webrtc-audio-processing ref: 9a0e28cab06f43d10cd00b69fc14dee78a73c2d0 unpetrify-ref: v0.2 - name: pulseaudio - morph: strata/audio-bluetooth/pulseaudio.morph + morph: strata/sound-server-pulseaudio/pulseaudio.morph repo: upstream:pulseaudio ref: 8887f256e0f1167e579a217387a4efc5397edf93 unpetrify-ref: v9.0 @@ -117,6 +76,5 @@ chunks: - speex - json-c - alsa-lib - - bluez - sbc - webrtc-audio-processing diff --git a/strata/audio-bluetooth/alsa-utils.morph b/strata/sound-server-pulseaudio/alsa-utils.morph index a6a1e041..a6a1e041 100644 --- a/strata/audio-bluetooth/alsa-utils.morph +++ b/strata/sound-server-pulseaudio/alsa-utils.morph diff --git a/strata/audio-bluetooth/avahi.morph b/strata/sound-server-pulseaudio/avahi.morph index a255ce1e..a255ce1e 100644 --- a/strata/audio-bluetooth/avahi.morph +++ b/strata/sound-server-pulseaudio/avahi.morph diff --git a/strata/audio-bluetooth/json-c.morph b/strata/sound-server-pulseaudio/json-c.morph index c3d9243c..c3d9243c 100644 --- a/strata/audio-bluetooth/json-c.morph +++ b/strata/sound-server-pulseaudio/json-c.morph diff --git a/strata/audio-bluetooth/libsndfile.morph b/strata/sound-server-pulseaudio/libsndfile.morph index 8d6c2fe0..8d6c2fe0 100644 --- a/strata/audio-bluetooth/libsndfile.morph +++ b/strata/sound-server-pulseaudio/libsndfile.morph diff --git a/strata/audio-bluetooth/pulseaudio.morph b/strata/sound-server-pulseaudio/pulseaudio.morph index dfaa9b0d..dfaa9b0d 100644 --- a/strata/audio-bluetooth/pulseaudio.morph +++ b/strata/sound-server-pulseaudio/pulseaudio.morph diff --git a/strata/audio-bluetooth/webrtc-audio-processing.morph b/strata/sound-server-pulseaudio/webrtc-audio-processing.morph index ea8cd4e0..ea8cd4e0 100644 --- a/strata/audio-bluetooth/webrtc-audio-processing.morph +++ b/strata/sound-server-pulseaudio/webrtc-audio-processing.morph diff --git a/strata/xfce.morph b/strata/xfce.morph index 552cbd89..8b1d69f4 100644 --- a/strata/xfce.morph +++ b/strata/xfce.morph @@ -3,7 +3,7 @@ kind: stratum description: xfce stratum build-depends: - morph: strata/gtk2.morph -- morph: strata/audio-bluetooth.morph +- morph: strata/sound-server-pulseaudio.morph chunks: - name: xfce-dev-tools repo: upstream:xfce/xfce4-dev-tools |