From eed583b7ebbfbcabad609a6a32bf281137332f24 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Wed, 9 Dec 2015 20:23:43 +0900 Subject: Adding avahi to audio-bluetooth stratum This needs to be a dependency of pulseaudio so that higher level applications can discover the pulseaudio service over avahi. Added some sed magick here because avahi-ui does not build with the deprecated symbols disabled, and this is hard-coded into the avahi makefiles. Change-Id: Iee6bff1d63d002e3e239fc76804e6010fa2c299b --- strata/audio-bluetooth.morph | 8 ++++++++ strata/audio-bluetooth/avahi.morph | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 strata/audio-bluetooth/avahi.morph diff --git a/strata/audio-bluetooth.morph b/strata/audio-bluetooth.morph index e9f1c454..12b55e13 100644 --- a/strata/audio-bluetooth.morph +++ b/strata/audio-bluetooth.morph @@ -96,12 +96,20 @@ chunks: 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: pulseaudio morph: strata/audio-bluetooth/pulseaudio.morph repo: upstream:pulseaudio ref: 53ad8aa7caa33caac52e35f71253e29d5a15f6e7 unpetrify-ref: v6.0 build-depends: + - avahi - libsndfile - libatomic_ops - speex diff --git a/strata/audio-bluetooth/avahi.morph b/strata/audio-bluetooth/avahi.morph new file mode 100644 index 00000000..49d249d5 --- /dev/null +++ b/strata/audio-bluetooth/avahi.morph @@ -0,0 +1,18 @@ +name: avahi +kind: chunk +build-system: autotools +pre-configure-commands: +- sed -i 's/AM_CFLAGS=-I$(top_srcdir) -DG_DISABLE_DEPRECATED=1 -DGDK_DISABLE_DEPRECATED=1 -DGTK_DISABLE_DEPRECATED=1/AM_CFLAGS=-I$(top_srcdir)/g' avahi-ui/Makefile.am +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 -- cgit v1.2.1