diff options
| author | Peter Wagner <tripolar@gmx.at> | 2014-06-30 15:28:57 +0200 |
|---|---|---|
| committer | Peter Wagner <tripolar@gmx.at> | 2014-06-30 15:28:57 +0200 |
| commit | 4b1fad86f85bed0d867324c21d7e4a75d9957bfc (patch) | |
| tree | 635619edaa330d1229ad4dd36cfe696032a8b630 /sound | |
| parent | 5a6ac78c5a31e01e0dbf6e95e2c9840999f38ff5 (diff) | |
pulseaudio: remove avahi support
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/pulseaudio/Makefile | 79 |
1 files changed, 1 insertions, 78 deletions
diff --git a/sound/pulseaudio/Makefile b/sound/pulseaudio/Makefile index 24ac2db50..1571b256a 100644 --- a/sound/pulseaudio/Makefile +++ b/sound/pulseaudio/Makefile @@ -40,14 +40,6 @@ endef define Package/pulseaudio-daemon $(call Package/pulseaudio/Default) - VARIANT:=noavahi -endef - -define Package/pulseaudio-daemon-avahi - $(call Package/pulseaudio/Default) - DEPENDS+=+dbus +libavahi-client +avahi-daemon - TITLE+= (avahi) - VARIANT:=avahi endef define Package/pulseaudio/Default/description @@ -58,11 +50,6 @@ define Package/pulseaudio-daemon/description $(call Package/pulseaudio/Default/description) endef -define Package/pulseaudio-daemon-avahi/description - $(call Package/pulseaudio/Default/description) - This package is compiled against dbus and avahi. -endef - define Package/pulseaudio-daemon/conffiles /etc/pulse/client.conf /etc/pulse/daemon.conf @@ -70,20 +57,12 @@ define Package/pulseaudio-daemon/conffiles /etc/pulse/system.pa endef -define Package/pulseaudio-daemon-avahi/conffiles -/etc/pulse/client.conf -/etc/pulse/daemon.conf -/etc/pulse/default.pa -/etc/pulse/system.pa -endef - define Package/pulseaudio-tools SECTION:=sound CATEGORY:=Sound DEPENDS:=+libsndfile pulseaudio TITLE:=Tools for Pulseaudio URL:=http://www.pulseaudio.org - VARIANT:=noavahi endef define Package/pulseaudio-profiles @@ -116,19 +95,9 @@ CONFIGURE_ARGS += \ --disable-lirc \ --disable-bluez \ --disable-udev \ - --without-fftw - -ifeq ($(BUILD_VARIANT),avahi) -CONFIGURE_ARGS += \ - --enable-avahi \ - --enable-dbus -endif - -ifeq ($(BUILD_VARIANT),noavahi) -CONFIGURE_ARGS += \ + --without-fftw \ --disable-avahi \ --disable-dbus -endif CONFIGURE_VARS += \ PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig" @@ -196,51 +165,6 @@ define Package/pulseaudio-daemon/install chmod -R 0644 $(1)/etc/pulse/* endef -define Package/pulseaudio-daemon-avahi/install - $(INSTALL_DIR) \ - $(1)/etc/pulse \ - $(1)/etc/init.d \ - $(1)/usr/bin \ - $(1)/usr/lib \ - $(1)/usr/lib/pulseaudio \ - $(1)/usr/lib/pulse-$(PKG_VERSION)/modules \ - $(1)/etc/dbus-1/system.d - - $(INSTALL_BIN) \ - $(PKG_INSTALL_DIR)/usr/bin/pulseaudio \ - $(1)/usr/bin/pulseaudio - - $(INSTALL_BIN) \ - ./files/pulseaudio.init \ - $(1)/etc/init.d/pulseaudio - - $(INSTALL_CONF) \ - $(PKG_INSTALL_DIR)/etc/pulse/* \ - $(1)/etc/pulse - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/*.so* \ - $(1)/usr/lib/ - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/pulseaudio/* \ - $(1)/usr/lib/pulseaudio/ - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/lib*.so \ - $(1)/usr/lib/ - - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/module*.so \ - $(1)/usr/lib/pulse-$(PKG_VERSION)/modules/ - - $(INSTALL_CONF) \ - $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/pulseaudio-system.conf \ - $(1)/etc/dbus-1/system.d/pulseaudio-system.conf - - chmod -R 0644 $(1)/etc/pulse/* $(1)/etc/dbus-1/system.d/pulseaudio-system.conf -endef - define Package/pulseaudio-tools/install $(INSTALL_DIR) \ $(1)/usr/bin @@ -265,6 +189,5 @@ define Package/pulseaudio-profiles/install endef $(eval $(call BuildPackage,pulseaudio-daemon)) -$(eval $(call BuildPackage,pulseaudio-daemon-avahi)) $(eval $(call BuildPackage,pulseaudio-tools)) $(eval $(call BuildPackage,pulseaudio-profiles)) |