From 9b5d457c60cb23a0ff31b30a382618f54d26fdff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sun, 3 Jul 2016 21:34:00 +0100 Subject: Split bluetooth and audio-server (pulseaudio) in different strata Change-Id: I5bd5d79581ed59833002f27f10b596202d8d06bb --- strata/NetworkManager-common.morph | 2 +- strata/audio-bluetooth.morph | 122 --------------------- strata/audio-bluetooth/alsa-utils.morph | 7 -- strata/audio-bluetooth/avahi.morph | 16 --- strata/audio-bluetooth/bluez-tools.morph | 10 -- strata/audio-bluetooth/bluez.morph | 19 ---- strata/audio-bluetooth/json-c.morph | 7 -- strata/audio-bluetooth/libical.morph | 5 - strata/audio-bluetooth/libsndfile.morph | 5 - strata/audio-bluetooth/nohands.morph | 5 - strata/audio-bluetooth/pulseaudio.morph | 18 --- .../audio-bluetooth/webrtc-audio-processing.morph | 14 --- strata/bluetooth.morph | 39 +++++++ strata/bluetooth/bluez-tools.morph | 10 ++ strata/bluetooth/bluez.morph | 19 ++++ strata/bluetooth/libical.morph | 5 + strata/enlightenment.morph | 2 +- strata/genivi-demo-platform-libs.morph | 1 - strata/genivi.morph | 2 +- strata/gnome.morph | 3 +- strata/multimedia-gstreamer-0.10.morph | 2 +- strata/multimedia-gstreamer.morph | 2 +- strata/sound-server-pulseaudio.morph | 80 ++++++++++++++ strata/sound-server-pulseaudio/alsa-utils.morph | 7 ++ strata/sound-server-pulseaudio/avahi.morph | 16 +++ strata/sound-server-pulseaudio/json-c.morph | 7 ++ strata/sound-server-pulseaudio/libsndfile.morph | 5 + strata/sound-server-pulseaudio/pulseaudio.morph | 18 +++ .../webrtc-audio-processing.morph | 14 +++ strata/xfce.morph | 2 +- .../genivi-baseline-system-armv7lhf-jetson.morph | 6 +- ...genivi-baseline-system-armv7lhf-versatile.morph | 6 +- .../genivi-baseline-system-x86_64-generic.morph | 6 +- systems/genivi-demo-platform-armv7lhf-jetson.morph | 6 +- systems/genivi-demo-platform-x86_32-generic.morph | 6 +- systems/genivi-demo-platform-x86_64-generic.morph | 6 +- systems/gnome-system-armv7lhf-jetson.morph | 6 +- systems/gnome-system-x86_64.morph | 6 +- systems/ivi-system-armv7lhf-jetson.morph | 6 +- systems/ivi-system-x86_32.morph | 6 +- systems/ivi-system-x86_64.morph | 6 +- systems/java-build-system-x86_64-generic.morph | 6 +- systems/qt4-devel-system-x86_64-generic.morph | 6 +- systems/qt5-devel-system-x86_64-generic.morph | 6 +- systems/weston-qt5-system-x86_64.morph | 6 +- systems/weston-system-armv7lhf-jetson.morph | 6 +- systems/weston-system-x86_64-generic.morph | 6 +- systems/xfce-system-x86_64.morph | 6 +- 48 files changed, 300 insertions(+), 272 deletions(-) delete mode 100644 strata/audio-bluetooth.morph delete mode 100644 strata/audio-bluetooth/alsa-utils.morph delete mode 100644 strata/audio-bluetooth/avahi.morph delete mode 100644 strata/audio-bluetooth/bluez-tools.morph delete mode 100644 strata/audio-bluetooth/bluez.morph delete mode 100644 strata/audio-bluetooth/json-c.morph delete mode 100644 strata/audio-bluetooth/libical.morph delete mode 100644 strata/audio-bluetooth/libsndfile.morph delete mode 100644 strata/audio-bluetooth/nohands.morph delete mode 100644 strata/audio-bluetooth/pulseaudio.morph delete mode 100644 strata/audio-bluetooth/webrtc-audio-processing.morph create mode 100644 strata/bluetooth.morph create mode 100644 strata/bluetooth/bluez-tools.morph create mode 100644 strata/bluetooth/bluez.morph create mode 100644 strata/bluetooth/libical.morph create mode 100644 strata/sound-server-pulseaudio.morph create mode 100644 strata/sound-server-pulseaudio/alsa-utils.morph create mode 100644 strata/sound-server-pulseaudio/avahi.morph create mode 100644 strata/sound-server-pulseaudio/json-c.morph create mode 100644 strata/sound-server-pulseaudio/libsndfile.morph create mode 100644 strata/sound-server-pulseaudio/pulseaudio.morph create mode 100644 strata/sound-server-pulseaudio/webrtc-audio-processing.morph 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.morph b/strata/audio-bluetooth.morph deleted file mode 100644 index 4755bb7d..00000000 --- a/strata/audio-bluetooth.morph +++ /dev/null @@ -1,122 +0,0 @@ -name: audio-bluetooth -kind: stratum -description: Components required for audio and bluetooth. -build-depends: -- morph: strata/glib-common.morph -- morph: strata/foundation.morph -chunks: -- name: libatomic_ops - repo: upstream:libatomic_ops - ref: 0a58f5d63969c10d2141af89cb7a53df786909ab - unpetrify-ref: baserock/morph - build-system: autotools -- name: alsa-lib - repo: upstream:alsa-lib - ref: 16c956e598a2b22459538ec7eb46b7a8421bb80a - # Note: ref anchored because alsa-lib is known for rebasing - # tags, and master - unpetrify-ref: baserock/v1.0.29 - build-system: autotools -- name: alsa-utils - morph: strata/audio-bluetooth/alsa-utils.morph - repo: upstream:alsa-utils - ref: 85c622e2984b557e6bd79c13cea466012dfb3761 - # Note: ref anchored because alsa-utils is known for rebasing - # tags, and master - 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 - repo: upstream:json-c - ref: e8bd6865d7a671e9f75ece05dfe86a19ba610581 - unpetrify-ref: baserock/json-c-0.12-20140410-plus-patch -- name: libsndfile - morph: strata/audio-bluetooth/libsndfile.morph - repo: upstream:libsndfile - ref: 6c05c615c95ffef7a8a5a707cde0bb52bdd74244 - unpetrify-ref: baserock/morph -- name: libdaemon - repo: upstream:libdaemon - ref: 9fcc28e0e8f84968d1fb8b6d544a42efb13803ec - unpetrify-ref: v0.14 - build-system: autotools -- name: avahi - morph: strata/audio-bluetooth/avahi.morph - repo: upstream:avahi - ref: 031d6323b5abb785fbe3601b2f163316a1eb54bc - unpetrify-ref: v0.6.31 - build-depends: - - libdaemon -- name: sbc - repo: upstream:sbc - ref: f64b34a770bc7fbf180d2a733fe63d352f281ea2 - unpetrify-ref: "1.3" - build-system: autotools - build-depends: - - libsndfile -- name: webrtc-audio-processing - morph: strata/audio-bluetooth/webrtc-audio-processing.morph - repo: upstream:webrtc-audio-processing - ref: 9a0e28cab06f43d10cd00b69fc14dee78a73c2d0 - unpetrify-ref: v0.2 -- name: pulseaudio - morph: strata/audio-bluetooth/pulseaudio.morph - repo: upstream:pulseaudio - ref: 8887f256e0f1167e579a217387a4efc5397edf93 - unpetrify-ref: v9.0 - build-depends: - - avahi - - libsndfile - - libatomic_ops - - speex - - json-c - - alsa-lib - - bluez - - sbc - - webrtc-audio-processing diff --git a/strata/audio-bluetooth/alsa-utils.morph b/strata/audio-bluetooth/alsa-utils.morph deleted file mode 100644 index a6a1e041..00000000 --- a/strata/audio-bluetooth/alsa-utils.morph +++ /dev/null @@ -1,7 +0,0 @@ -name: alsa-utils -kind: chunk -description: ALSA utilities -build-system: autotools -configure-commands: -- autoreconf -ifv -- ./configure --prefix="$PREFIX" --disable-xmlto diff --git a/strata/audio-bluetooth/avahi.morph b/strata/audio-bluetooth/avahi.morph deleted file mode 100644 index a255ce1e..00000000 --- a/strata/audio-bluetooth/avahi.morph +++ /dev/null @@ -1,16 +0,0 @@ -name: avahi -kind: chunk -build-system: autotools -configure-commands: -- | - ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var --disable-werror \ - --with-distro=none --disable-qt3 --disable-qt4 --disable-gtk --disable-gtk3 \ - --disable-pygtk --disable-python-dbus --disable-mono --disable-manpages -system-integration: - avahi-misc: - 00-add-avahi-user: - - groupadd -fg 86 netdev - - groupadd -fg 84 avahi - - useradd -c "Avahi Daemon Owner" -d /var/run/avahi-daemon -u 84 -g avahi -s /bin/false avahi - 00-enable-avahi-service: - - systemctl enable avahi-daemon diff --git a/strata/audio-bluetooth/bluez-tools.morph b/strata/audio-bluetooth/bluez-tools.morph deleted file mode 100644 index 80e47ef5..00000000 --- a/strata/audio-bluetooth/bluez-tools.morph +++ /dev/null @@ -1,10 +0,0 @@ -name: bluez-tools -kind: chunk -description: A set of tools to manage Bluetooth devices for Linux -build-system: autotools -configure-commands: -- sed -i -e 's/-lreadline/-lreadline -lncurses/g' configure.ac -- ./autogen.sh -- ./configure --prefix="$PREFIX" --disable-obex -build-commands: -- LDFLAGS="$LDFLAGS -lncurses" make diff --git a/strata/audio-bluetooth/bluez.morph b/strata/audio-bluetooth/bluez.morph deleted file mode 100644 index e7208da7..00000000 --- a/strata/audio-bluetooth/bluez.morph +++ /dev/null @@ -1,19 +0,0 @@ -name: bluez -kind: chunk -description: Bluetooth protocol stack for Linux -build-system: autotools -configure-commands: -- autoreconf -ivf -- ./configure --prefix="$PREFIX" - --enable-tools - --enable-service - --enable-test - --enable-library - --sysconfdir=/etc - --localstatedir=/var - --libexecdir=/lib -install-commands: -- make DESTDIR="$DESTDIR" install -- mkdir -p "$DESTDIR/etc/systemd/system/bluetooth.target.wants" -- ln -s /lib/systemd/system/bluetooth.service "$DESTDIR/etc/systemd/system/bluetooth.target.wants/bluetooth.service" -- ln -s /lib/systemd/system/bluetooth.service "$DESTDIR/etc/systemd/system/dbus-org.bluez.service" diff --git a/strata/audio-bluetooth/json-c.morph b/strata/audio-bluetooth/json-c.morph deleted file mode 100644 index c3d9243c..00000000 --- a/strata/audio-bluetooth/json-c.morph +++ /dev/null @@ -1,7 +0,0 @@ -name: json-c -kind: chunk -description: JSON C Library -build-system: autotools -install-commands: -- make DESTDIR="$DESTDIR" install -- install -m755 json_object_iterator.h "$DESTDIR/usr/include/json" diff --git a/strata/audio-bluetooth/libical.morph b/strata/audio-bluetooth/libical.morph deleted file mode 100644 index 2ee7c96c..00000000 --- a/strata/audio-bluetooth/libical.morph +++ /dev/null @@ -1,5 +0,0 @@ -name: libical -kind: chunk -build-system: cmake -configure-commands: -- cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_INSTALL_LIBDIR=lib diff --git a/strata/audio-bluetooth/libsndfile.morph b/strata/audio-bluetooth/libsndfile.morph deleted file mode 100644 index 8d6c2fe0..00000000 --- a/strata/audio-bluetooth/libsndfile.morph +++ /dev/null @@ -1,5 +0,0 @@ -name: libsndfile -kind: chunk -build-system: autotools -configure-commands: -- ./configure --prefix="$PREFIX" --disable-external-libs 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/audio-bluetooth/pulseaudio.morph b/strata/audio-bluetooth/pulseaudio.morph deleted file mode 100644 index dfaa9b0d..00000000 --- a/strata/audio-bluetooth/pulseaudio.morph +++ /dev/null @@ -1,18 +0,0 @@ -name: pulseaudio -kind: chunk -description: PulseAudio System -build-system: autotools -pre-configure-commands: -- NOCONFIGURE=1 ./bootstrap.sh -configure-commands: -- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --with-database=simple - --with-systemduserunitdir=/usr/lib/systemd/user - --with-system-user=pulse --with-system-group=pulse --with-access-group=pulse-access - --enable-webrtc-aec -system-integration: - pulseaudio-misc: - 00-add-pulse-users: - - groupadd -rf pulse-access - - groupadd -rf pulse-rt - - groupadd -f -g 171 -r pulse - - useradd -r -g pulse -d /var/run/pulse -s /bin/false -c "PulseAudio System Daemon" pulse || exit 0 diff --git a/strata/audio-bluetooth/webrtc-audio-processing.morph b/strata/audio-bluetooth/webrtc-audio-processing.morph deleted file mode 100644 index ea8cd4e0..00000000 --- a/strata/audio-bluetooth/webrtc-audio-processing.morph +++ /dev/null @@ -1,14 +0,0 @@ -name: webrtc-audio-processing -kind: chunk -build-system: autotools -configure-commands: -- | - NOCONFIGURE=1 ./autogen.sh - - case "$MORPH_ARCH" in - x86_32) - sed -i -e "s/-O2/& -msse2/" configure - ;; - esac - - ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var 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/bluetooth/bluez-tools.morph b/strata/bluetooth/bluez-tools.morph new file mode 100644 index 00000000..80e47ef5 --- /dev/null +++ b/strata/bluetooth/bluez-tools.morph @@ -0,0 +1,10 @@ +name: bluez-tools +kind: chunk +description: A set of tools to manage Bluetooth devices for Linux +build-system: autotools +configure-commands: +- sed -i -e 's/-lreadline/-lreadline -lncurses/g' configure.ac +- ./autogen.sh +- ./configure --prefix="$PREFIX" --disable-obex +build-commands: +- LDFLAGS="$LDFLAGS -lncurses" make diff --git a/strata/bluetooth/bluez.morph b/strata/bluetooth/bluez.morph new file mode 100644 index 00000000..e7208da7 --- /dev/null +++ b/strata/bluetooth/bluez.morph @@ -0,0 +1,19 @@ +name: bluez +kind: chunk +description: Bluetooth protocol stack for Linux +build-system: autotools +configure-commands: +- autoreconf -ivf +- ./configure --prefix="$PREFIX" + --enable-tools + --enable-service + --enable-test + --enable-library + --sysconfdir=/etc + --localstatedir=/var + --libexecdir=/lib +install-commands: +- make DESTDIR="$DESTDIR" install +- mkdir -p "$DESTDIR/etc/systemd/system/bluetooth.target.wants" +- ln -s /lib/systemd/system/bluetooth.service "$DESTDIR/etc/systemd/system/bluetooth.target.wants/bluetooth.service" +- ln -s /lib/systemd/system/bluetooth.service "$DESTDIR/etc/systemd/system/dbus-org.bluez.service" diff --git a/strata/bluetooth/libical.morph b/strata/bluetooth/libical.morph new file mode 100644 index 00000000..2ee7c96c --- /dev/null +++ b/strata/bluetooth/libical.morph @@ -0,0 +1,5 @@ +name: libical +kind: chunk +build-system: cmake +configure-commands: +- cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$PREFIX" -DCMAKE_INSTALL_LIBDIR=lib 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/sound-server-pulseaudio.morph b/strata/sound-server-pulseaudio.morph new file mode 100644 index 00000000..ae66a5f3 --- /dev/null +++ b/strata/sound-server-pulseaudio.morph @@ -0,0 +1,80 @@ +name: sound-server-pulseaudio +kind: stratum +description: Components required for pulseaudio. +build-depends: +- morph: strata/bluetooth.morph +chunks: +- name: libatomic_ops + repo: upstream:libatomic_ops + ref: 0a58f5d63969c10d2141af89cb7a53df786909ab + unpetrify-ref: baserock/morph + build-system: autotools +- name: alsa-lib + repo: upstream:alsa-lib + ref: 16c956e598a2b22459538ec7eb46b7a8421bb80a + # Note: ref anchored because alsa-lib is known for rebasing + # tags, and master + unpetrify-ref: baserock/v1.0.29 + build-system: autotools +- name: alsa-utils + morph: strata/sound-server-pulseaudio/alsa-utils.morph + repo: upstream:alsa-utils + ref: 85c622e2984b557e6bd79c13cea466012dfb3761 + # Note: ref anchored because alsa-utils is known for rebasing + # tags, and master + unpetrify-ref: baserock/v1.0.29 + build-depends: + - alsa-lib +- name: speex + repo: upstream:speex + ref: e5dc987a403426ee3d0d81768afffa0fe74e20fa + unpetrify-ref: baserock/morph + build-system: autotools +- name: json-c + 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/sound-server-pulseaudio/libsndfile.morph + repo: upstream:libsndfile + ref: 6c05c615c95ffef7a8a5a707cde0bb52bdd74244 + unpetrify-ref: baserock/morph +- name: libdaemon + repo: upstream:libdaemon + ref: 9fcc28e0e8f84968d1fb8b6d544a42efb13803ec + unpetrify-ref: v0.14 + build-system: autotools +- name: avahi + morph: strata/sound-server-pulseaudio/avahi.morph + repo: upstream:avahi + ref: 031d6323b5abb785fbe3601b2f163316a1eb54bc + unpetrify-ref: v0.6.31 + build-depends: + - libdaemon +- name: sbc + repo: upstream:sbc + ref: f64b34a770bc7fbf180d2a733fe63d352f281ea2 + unpetrify-ref: "1.3" + build-system: autotools + build-depends: + - libsndfile +- name: webrtc-audio-processing + morph: strata/sound-server-pulseaudio/webrtc-audio-processing.morph + repo: upstream:webrtc-audio-processing + ref: 9a0e28cab06f43d10cd00b69fc14dee78a73c2d0 + unpetrify-ref: v0.2 +- name: pulseaudio + morph: strata/sound-server-pulseaudio/pulseaudio.morph + repo: upstream:pulseaudio + ref: 8887f256e0f1167e579a217387a4efc5397edf93 + unpetrify-ref: v9.0 + build-depends: + - avahi + - libsndfile + - libatomic_ops + - speex + - json-c + - alsa-lib + - sbc + - webrtc-audio-processing diff --git a/strata/sound-server-pulseaudio/alsa-utils.morph b/strata/sound-server-pulseaudio/alsa-utils.morph new file mode 100644 index 00000000..a6a1e041 --- /dev/null +++ b/strata/sound-server-pulseaudio/alsa-utils.morph @@ -0,0 +1,7 @@ +name: alsa-utils +kind: chunk +description: ALSA utilities +build-system: autotools +configure-commands: +- autoreconf -ifv +- ./configure --prefix="$PREFIX" --disable-xmlto diff --git a/strata/sound-server-pulseaudio/avahi.morph b/strata/sound-server-pulseaudio/avahi.morph new file mode 100644 index 00000000..a255ce1e --- /dev/null +++ b/strata/sound-server-pulseaudio/avahi.morph @@ -0,0 +1,16 @@ +name: avahi +kind: chunk +build-system: autotools +configure-commands: +- | + ./autogen.sh --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var --disable-werror \ + --with-distro=none --disable-qt3 --disable-qt4 --disable-gtk --disable-gtk3 \ + --disable-pygtk --disable-python-dbus --disable-mono --disable-manpages +system-integration: + avahi-misc: + 00-add-avahi-user: + - groupadd -fg 86 netdev + - groupadd -fg 84 avahi + - useradd -c "Avahi Daemon Owner" -d /var/run/avahi-daemon -u 84 -g avahi -s /bin/false avahi + 00-enable-avahi-service: + - systemctl enable avahi-daemon diff --git a/strata/sound-server-pulseaudio/json-c.morph b/strata/sound-server-pulseaudio/json-c.morph new file mode 100644 index 00000000..c3d9243c --- /dev/null +++ b/strata/sound-server-pulseaudio/json-c.morph @@ -0,0 +1,7 @@ +name: json-c +kind: chunk +description: JSON C Library +build-system: autotools +install-commands: +- make DESTDIR="$DESTDIR" install +- install -m755 json_object_iterator.h "$DESTDIR/usr/include/json" diff --git a/strata/sound-server-pulseaudio/libsndfile.morph b/strata/sound-server-pulseaudio/libsndfile.morph new file mode 100644 index 00000000..8d6c2fe0 --- /dev/null +++ b/strata/sound-server-pulseaudio/libsndfile.morph @@ -0,0 +1,5 @@ +name: libsndfile +kind: chunk +build-system: autotools +configure-commands: +- ./configure --prefix="$PREFIX" --disable-external-libs diff --git a/strata/sound-server-pulseaudio/pulseaudio.morph b/strata/sound-server-pulseaudio/pulseaudio.morph new file mode 100644 index 00000000..dfaa9b0d --- /dev/null +++ b/strata/sound-server-pulseaudio/pulseaudio.morph @@ -0,0 +1,18 @@ +name: pulseaudio +kind: chunk +description: PulseAudio System +build-system: autotools +pre-configure-commands: +- NOCONFIGURE=1 ./bootstrap.sh +configure-commands: +- ./configure --prefix="$PREFIX" --localstatedir=/var --sysconfdir=/etc --with-database=simple + --with-systemduserunitdir=/usr/lib/systemd/user + --with-system-user=pulse --with-system-group=pulse --with-access-group=pulse-access + --enable-webrtc-aec +system-integration: + pulseaudio-misc: + 00-add-pulse-users: + - groupadd -rf pulse-access + - groupadd -rf pulse-rt + - groupadd -f -g 171 -r pulse + - useradd -r -g pulse -d /var/run/pulse -s /bin/false -c "PulseAudio System Daemon" pulse || exit 0 diff --git a/strata/sound-server-pulseaudio/webrtc-audio-processing.morph b/strata/sound-server-pulseaudio/webrtc-audio-processing.morph new file mode 100644 index 00000000..ea8cd4e0 --- /dev/null +++ b/strata/sound-server-pulseaudio/webrtc-audio-processing.morph @@ -0,0 +1,14 @@ +name: webrtc-audio-processing +kind: chunk +build-system: autotools +configure-commands: +- | + NOCONFIGURE=1 ./autogen.sh + + case "$MORPH_ARCH" in + x86_32) + sed -i -e "s/-O2/& -msse2/" configure + ;; + esac + + ./configure --prefix="$PREFIX" --sysconfdir=/etc --localstatedir=/var 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 diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index ccf59f81..20d17638 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -17,8 +17,10 @@ strata: morph: strata/connman-common.morph - name: device-management morph: strata/device-management.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph +- name: bluetooth + morph: strata/bluetooth.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph - name: glib-common morph: strata/glib-common.morph - name: libdrm-common diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph index 74493383..3f42ff43 100644 --- a/systems/genivi-baseline-system-armv7lhf-versatile.morph +++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph @@ -17,8 +17,10 @@ strata: morph: strata/connman-common.morph - name: device-management morph: strata/device-management.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph +- name: bluetooth + morph: strata/bluetooth.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph - name: glib-common morph: strata/glib-common.morph - name: libdrm-common diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph index bbef3ee3..dcfb3762 100644 --- a/systems/genivi-baseline-system-x86_64-generic.morph +++ b/systems/genivi-baseline-system-x86_64-generic.morph @@ -17,8 +17,10 @@ strata: morph: strata/connman-common.morph - name: device-management morph: strata/device-management.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph +- name: bluetooth + morph: strata/bluetooth.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph - name: glib-common morph: strata/glib-common.morph - name: libdrm-common diff --git a/systems/genivi-demo-platform-armv7lhf-jetson.morph b/systems/genivi-demo-platform-armv7lhf-jetson.morph index 08700b8f..8593fac8 100644 --- a/systems/genivi-demo-platform-armv7lhf-jetson.morph +++ b/systems/genivi-demo-platform-armv7lhf-jetson.morph @@ -23,8 +23,10 @@ strata: morph: strata/connman-common.morph - name: device-management morph: strata/device-management.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph +- name: bluetooth + morph: strata/bluetooth.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph - name: libdrm-common morph: strata/libdrm-common.morph - name: multimedia-common diff --git a/systems/genivi-demo-platform-x86_32-generic.morph b/systems/genivi-demo-platform-x86_32-generic.morph index afacbe97..77276e2d 100644 --- a/systems/genivi-demo-platform-x86_32-generic.morph +++ b/systems/genivi-demo-platform-x86_32-generic.morph @@ -23,8 +23,10 @@ strata: morph: strata/connman-common.morph - name: device-management morph: strata/device-management.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph +- name: bluetooth + morph: strata/bluetooth.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph - name: libdrm-common morph: strata/libdrm-common.morph - name: multimedia-common diff --git a/systems/genivi-demo-platform-x86_64-generic.morph b/systems/genivi-demo-platform-x86_64-generic.morph index cfdb5c82..3063eb1f 100644 --- a/systems/genivi-demo-platform-x86_64-generic.morph +++ b/systems/genivi-demo-platform-x86_64-generic.morph @@ -23,8 +23,10 @@ strata: morph: strata/connman-common.morph - name: device-management morph: strata/device-management.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph +- name: bluetooth + morph: strata/bluetooth.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph - name: libdrm-common morph: strata/libdrm-common.morph - name: multimedia-common diff --git a/systems/gnome-system-armv7lhf-jetson.morph b/systems/gnome-system-armv7lhf-jetson.morph index df82e800..96c6e5bb 100644 --- a/systems/gnome-system-armv7lhf-jetson.morph +++ b/systems/gnome-system-armv7lhf-jetson.morph @@ -3,8 +3,8 @@ kind: system description: A GNOME system system. arch: armv7lhf strata: -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph +- name: bluetooth + morph: strata/bluetooth.morph - name: bsp-jetson morph: strata/bsp-jetson.morph - name: build-essential @@ -55,6 +55,8 @@ strata: morph: strata/ruby.morph - name: libdrm-common morph: strata/libdrm-common.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph - name: wayland-generic morph: strata/wayland-generic.morph - name: weston-common diff --git a/systems/gnome-system-x86_64.morph b/systems/gnome-system-x86_64.morph index 3a53ab87..80c86b28 100644 --- a/systems/gnome-system-x86_64.morph +++ b/systems/gnome-system-x86_64.morph @@ -3,8 +3,8 @@ kind: system description: A GNOME system system. arch: x86_64 strata: -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph +- name: bluetooth + morph: strata/bluetooth.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph - name: build-essential @@ -85,6 +85,8 @@ strata: morph: strata/samba.morph - name: secret-service morph: strata/secret-service.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph - name: spell-checking morph: strata/spell-checking.morph - name: storage-management diff --git a/systems/ivi-system-armv7lhf-jetson.morph b/systems/ivi-system-armv7lhf-jetson.morph index 5e10db6d..175c2e7b 100644 --- a/systems/ivi-system-armv7lhf-jetson.morph +++ b/systems/ivi-system-armv7lhf-jetson.morph @@ -3,8 +3,8 @@ kind: system description: A generic IVI system with components from GENIVI and AGL arch: armv7lhf strata: -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph +- name: bluetooth + morph: strata/bluetooth.morph - name: bsp-x86_64-generic morph: strata/bsp-x86_64-generic.morph - name: build-essential @@ -73,6 +73,8 @@ strata: morph: strata/samba.morph - name: secret-service morph: strata/secret-service.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph - name: spell-checking morph: strata/spell-checking.morph - name: storage-management diff --git a/systems/ivi-system-x86_32.morph b/systems/ivi-system-x86_32.morph index 2f7c4145..f88325ed 100644 --- a/systems/ivi-system-x86_32.morph +++ b/systems/ivi-system-x86_32.morph @@ -3,8 +3,8 @@ kind: system description: A generic IVI system with components from GENIVI and AGL arch: x86_32 strata: -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph +- name: bluetooth + morph: strata/bluetooth.morph - name: bsp-x86_both-tools morph: strata/bsp-x86_both-tools.morph - name: bsp-x86_32-ivi @@ -81,6 +81,8 @@ strata: morph: strata/samba.morph - name: secret-service morph: strata/secret-service.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph - name: spell-checking morph: strata/spell-checking.morph - name: storage-management diff --git a/systems/ivi-system-x86_64.morph b/systems/ivi-system-x86_64.morph index bbf7b998..146c2821 100644 --- a/systems/ivi-system-x86_64.morph +++ b/systems/ivi-system-x86_64.morph @@ -3,8 +3,8 @@ kind: system description: A generic IVI system with components from GENIVI and AGL arch: x86_64 strata: -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph +- name: bluetooth + morph: strata/bluetooth.morph - name: bsp-x86_both-tools morph: strata/bsp-x86_both-tools.morph - name: bsp-x86_64-ivi @@ -81,6 +81,8 @@ strata: morph: strata/samba.morph - name: secret-service morph: strata/secret-service.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph - name: spell-checking morph: strata/spell-checking.morph - name: storage-management diff --git a/systems/java-build-system-x86_64-generic.morph b/systems/java-build-system-x86_64-generic.morph index b60637ba..275d84e8 100644 --- a/systems/java-build-system-x86_64-generic.morph +++ b/systems/java-build-system-x86_64-generic.morph @@ -73,8 +73,10 @@ strata: morph: strata/java.morph - name: graphics-common morph: strata/graphics-common.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph +- name: bluetooth + morph: strata/bluetooth.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph configuration-extensions: - extensions/set-hostname - extensions/add-config-files diff --git a/systems/qt4-devel-system-x86_64-generic.morph b/systems/qt4-devel-system-x86_64-generic.morph index d6a84fd6..6197088b 100644 --- a/systems/qt4-devel-system-x86_64-generic.morph +++ b/systems/qt4-devel-system-x86_64-generic.morph @@ -10,8 +10,10 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph +- name: bluetooth + morph: strata/bluetooth.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph - name: multimedia-common morph: strata/multimedia-common.morph - name: multimedia-gstreamer-0.10 diff --git a/systems/qt5-devel-system-x86_64-generic.morph b/systems/qt5-devel-system-x86_64-generic.morph index eb393f12..61be08f6 100644 --- a/systems/qt5-devel-system-x86_64-generic.morph +++ b/systems/qt5-devel-system-x86_64-generic.morph @@ -10,8 +10,10 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph +- name: bluetooth + morph: strata/bluetooth.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph - name: multimedia-common morph: strata/multimedia-common.morph - name: multimedia-gstreamer diff --git a/systems/weston-qt5-system-x86_64.morph b/systems/weston-qt5-system-x86_64.morph index 13ccd9d8..1d739dad 100644 --- a/systems/weston-qt5-system-x86_64.morph +++ b/systems/weston-qt5-system-x86_64.morph @@ -14,8 +14,10 @@ strata: morph: strata/device-management.morph - name: foundation morph: strata/foundation.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph +- name: bluetooth + morph: strata/bluetooth.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph - name: libdrm-common morph: strata/libdrm-common.morph - name: multimedia-common diff --git a/systems/weston-system-armv7lhf-jetson.morph b/systems/weston-system-armv7lhf-jetson.morph index 5b25ebd0..93bfb6db 100644 --- a/systems/weston-system-armv7lhf-jetson.morph +++ b/systems/weston-system-armv7lhf-jetson.morph @@ -18,8 +18,8 @@ strata: morph: strata/bsp-jetson.morph - name: connectivity morph: strata/connectivity.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph +- name: bluetooth + morph: strata/bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph - name: multimedia-common @@ -36,6 +36,8 @@ strata: morph: strata/llvm-common.morph - name: mesa-common morph: strata/mesa-common.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph - name: weston-common morph: strata/weston-common.morph - name: x-common diff --git a/systems/weston-system-x86_64-generic.morph b/systems/weston-system-x86_64-generic.morph index 5e91fb71..65514cbb 100644 --- a/systems/weston-system-x86_64-generic.morph +++ b/systems/weston-system-x86_64-generic.morph @@ -17,8 +17,8 @@ strata: morph: strata/bsp-x86_64-generic.morph - name: connectivity morph: strata/connectivity.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph +- name: bluetooth + morph: strata/bluetooth.morph - name: libdrm-common morph: strata/libdrm-common.morph - name: multimedia-common @@ -35,6 +35,8 @@ strata: morph: strata/llvm-common.morph - name: mesa-common morph: strata/mesa-common.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph - name: weston-common morph: strata/weston-common.morph - name: x-common diff --git a/systems/xfce-system-x86_64.morph b/systems/xfce-system-x86_64.morph index 807a6309..dbf5f56c 100644 --- a/systems/xfce-system-x86_64.morph +++ b/systems/xfce-system-x86_64.morph @@ -23,8 +23,10 @@ strata: morph: strata/connman-common.morph - name: input-common morph: strata/input-common.morph -- name: audio-bluetooth - morph: strata/audio-bluetooth.morph +- name: bluetooth + morph: strata/bluetooth.morph +- name: sound-server-pulseaudio + morph: strata/sound-server-pulseaudio.morph - name: libdrm-common morph: strata/libdrm-common.morph - name: mesa-common -- cgit v1.2.1