[packages] fix mocp dependencies

[packages.git] / sound / pulseaudio / Makefile

diff --git a/sound/pulseaudio/Makefile b/sound/pulseaudio/Makefile
index 26d9e0b..7959d8c 100644 (file)
--- a/sound/pulseaudio/Makefile
+++ b/sound/pulseaudio/Makefile
@@ -8,16 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pulseaudio
-PKG_VERSION:=0.99.2
-PKG_RELEASE:=2
+PKG_VERSION:=1.1
+PKG_RELEASE:=6
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://freedesktop.org/software/pulseaudio/releases/
-PKG_MD5SUM:=c4deb071424e4f03fdf1d80bd62db267
+PKG_MD5SUM:=1b76932ca7c4b2aa992941e41ed4594b
 
+PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=intltool/host
 
-PKG_FIXUP = libtool
+PKG_FIXUP:=autoreconf
 
 PKG_INSTALL = 1
 
@@ -29,11 +30,10 @@ define Package/pulseaudio/Default
   SECTION:=sound
   CATEGORY:=Sound
   DEPENDS:=+libspeexdsp +libsndfile +libltdl +libpthread \
-       +librt +alsa-lib +libjson $(ICONV_DEPENDS) $(INTL_DEPENDS) \
-       @!UCLIBC_VERSION_0_9_30_1 @!UCLIBC_VERSION_0_9_30_2 \
-       @!UCLIBC_VERSION_0_9_30_3
+       +librt +alsa-lib +libjson +libopenssl +udev $(ICONV_DEPENDS) $(INTL_DEPENDS)
   TITLE:=Network sound server
   URL:=http://www.pulseaudio.org
+  PROVIDES:=pulseaudio
 endef
 
 define Package/pulseaudio-daemon
@@ -43,7 +43,7 @@ endef
 
 define Package/pulseaudio-daemon-avahi
   $(call Package/pulseaudio/Default)
-  DEPENDS+=+dbus +libavahi-client +avahi-daemon-dbus
+  DEPENDS+=+dbus +libavahi-client +avahi-daemon
   TITLE+= (avahi)
   VARIANT:=avahi
 endef
@@ -78,23 +78,24 @@ endef
 define Package/pulseaudio-tools
   SECTION:=sound
   CATEGORY:=Sound
-  DEPENDS:=+libsndfile @PACKAGE_pulseaudio-daemon||PACKAGE_pulseaudio-daemon-avahi #+libpulse
+  DEPENDS:=+libsndfile pulseaudio
   TITLE:=Tools for Pulseaudio
   URL:=http://www.pulseaudio.org
+  VARIANT:=noavahi
 endef
 
 define Package/pulseaudio-profiles
   SECTION:=sound
   CATEGORY:=Sound
-  DEPENDS:=@PACKAGE_pulseaudio-daemon||PACKAGE_pulseaudio-daemon-avahi
+  DEPENDS:=pulseaudio
   TITLE:=Profiles for Pulseaudio
   URL:=http://www.pulseaudio.org
 endef
 
 CONFIGURE_ARGS += \
-       --with-system-user=root \
-       --with-system-group=root \
-       --with-access-group=root \
+       --with-system-user=pulse \
+       --with-system-group=pulse \
+       --with-access-group=audio \
        --with-database=simple \
        --enable-alsa \
        --disable-hal \
@@ -102,7 +103,7 @@ CONFIGURE_ARGS += \
        --disable-tcpwrap \
        --disable-nls \
        --disable-manpages \
-       --disable-oss-output \
+       --enable-oss-output \
        --disable-oss-wrapper \
        --disable-samplerate \
        --disable-per-user-esound-socket \
@@ -112,21 +113,23 @@ CONFIGURE_ARGS += \
        --disable-asyncns \
        --disable-lirc \
        --disable-bluez \
-       --without-caps
+       --without-caps \
+       --without-fftw
 
 ifeq ($(BUILD_VARIANT),avahi)
 CONFIGURE_ARGS += \
        --enable-avahi \
        --enable-dbus
 endif
+
 ifeq ($(BUILD_VARIANT),noavahi)
 CONFIGURE_ARGS += \
        --disable-avahi \
-       --disable-dbus  
+       --disable-dbus
 endif
 
 CONFIGURE_VARS += \
-       PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
+       PKG_CONFIG_LIBDIR="$(STAGING_DIR)/usr/lib/pkgconfig"
 
 #SUPP_LIBS:=-L$(INTL_PREFIX)/lib -L$(ICONV_PREFIX)/lib
 TARGET_CFLAGS += -std=gnu99
@@ -153,7 +156,7 @@ define Package/pulseaudio-daemon/install
                $(1)/etc/init.d \
                $(1)/usr/bin \
                $(1)/usr/lib \
-               $(1)/usr/lib/pulse-0.99/modules 
+               $(1)/usr/lib/pulse-$(PKG_VERSION)/modules 
 
        $(INSTALL_BIN) \
                $(PKG_INSTALL_DIR)/usr/bin/pulseaudio \
@@ -172,12 +175,14 @@ define Package/pulseaudio-daemon/install
                $(1)/usr/lib/
 
        $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/pulse-0.99/modules/lib*.so \
+               $(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/lib*.so \
                $(1)/usr/lib/
 
        $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/pulse-0.99/modules/module*.so \
-               $(1)/usr/lib/pulse-0.99/modules/
+               $(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/module*.so \
+               $(1)/usr/lib/pulse-$(PKG_VERSION)/modules/
+
+       chmod -R 0644 $(1)/etc/pulse/*
 endef
 
 define Package/pulseaudio-daemon-avahi/install
@@ -186,7 +191,7 @@ define Package/pulseaudio-daemon-avahi/install
                $(1)/etc/init.d \
                $(1)/usr/bin \
                $(1)/usr/lib \
-               $(1)/usr/lib/pulse-0.99/modules \
+               $(1)/usr/lib/pulse-$(PKG_VERSION)/modules \
                $(1)/etc/dbus-1/system.d 
 
        $(INSTALL_BIN) \
@@ -206,20 +211,18 @@ define Package/pulseaudio-daemon-avahi/install
                $(1)/usr/lib/
 
        $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/pulse-0.99/modules/lib*.so \
+               $(PKG_INSTALL_DIR)/usr/lib/pulse-$(PKG_VERSION)/modules/lib*.so \
                $(1)/usr/lib/
 
        $(CP) \
-               $(PKG_INSTALL_DIR)/usr/lib/pulse-0.99/modules/module*.so \
-               $(1)/usr/lib/pulse-0.99/modules/
+               $(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
 
-       $(SED) \
-               's/user="pulse"/user="root"/' \
-               $(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