[packages] pulseaudio: fix whitespace error in previous commit

[openwrt/svn-archive/archive.git] / sound / pulseaudio / Makefile

diff --git a/sound/pulseaudio/Makefile b/sound/pulseaudio/Makefile
index 734ca2f3d133811454274ba67ebe2f1688d37e61..947feb9add63b130eb9a6a5c33cf742d8b977240 100644 (file)
--- a/sound/pulseaudio/Makefile
+++ b/sound/pulseaudio/Makefile
@@ -8,32 +8,46 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pulseaudio
-PKG_VERSION:=0.9.13
+PKG_VERSION:=0.9.22
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://0pointer.de/lennart/projects/pulseaudio/
-PKG_MD5SUM:=279fb92f08393a6a992d55e3ac9a006b
+PKG_MD5SUM:=ca85ab470669b05e100861654cf5eb3c
+
+PKG_BUILD_DEPENDS:=intltool/host
 
 PKG_FIXUP = libtool
 
+PKG_INSTALL = 1
+
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
 
+#TODO: split pulse into executable and library (or even better into several libraries since they're used as loadable modules, so not linked into)
 define Package/pulseaudio
   SECTION:=sound
   CATEGORY:=Sound
-  DEPENDS:=+libspeex +libgdbm +liboil +libsamplerate +libsndfile +libatomicops +libltdl +dbus +libintl +libiconv @BROKEN
+  DEPENDS:=+libspeexdsp +libgdbm +libsndfile \
+       +libltdl +libpthread +librt +dbus \
+       +alsa-lib $(ICONV_DEPENDS) $(INTL_DEPENDS)
   TITLE:=Network sound server
   URL:=http://www.pulseaudio.org
 endef
 
+define Package/pa-tools
+  SECTION:=sound
+  CATEGORY:=Sound
+  DEPENDS:=+libgdbm +libsndfile +pulseaudio #+libpulse
+  TITLE:=Tools for Pulseaudio
+  URL:=http://www.pulseaudio.org
+endef
+
 CONFIGURE_ARGS += \
        --with-system-user=root \
        --with-system-group=root \
-       --with-realtime-group=root \
        --with-access-group=root \
-       --without-x \
-       --disable-dbus \
+       --enable-alsa \
        --disable-hal \
        --disable-gconf \
        --disable-tcpwrap \
@@ -42,30 +56,73 @@ CONFIGURE_ARGS += \
        --disable-glib2 \
        --disable-jack \
        --disable-asyncns \
-       --disable-polkit \
-       --disable-samplerate \
        --disable-lirc \
        --disable-bluez \
        --without-caps
 
+
 CONFIGURE_VARS += \
        PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
 
-SUPP_LIBS:=-L$(STAGING_DIR)/usr/lib/libintl/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib
+#SUPP_LIBS:=-L$(INTL_PREFIX)/lib -L$(ICONV_PREFIX)/lib
+TARGET_CFLAGS += -std=gnu99
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
-               LDFLAGS="$(TARGET_LDFLAGS) $(SUPP_LIBS)" \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               LIBLTDL="$(STAGING_DIR)/usr/lib/libltdl.la" \
-               X_CFLAGS="" \
-               all install
+define Build/InstallDev
+       $(INSTALL_DIR) \
+               $(1)/usr/lib/pkgconfig \
+               $(1)/usr/include/pulse \
+               $(1)/usr/lib
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/include/pulse/* \
+               $(1)/usr/include/pulse
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
+               $(1)/usr/lib/pkgconfig
+       $(CP) \
+               $(PKG_INSTALL_DIR)/usr/lib/*.so* \
+               $(1)/usr/lib/
 endef
 
-define Package/pulseaudio/install      
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+define Package/pulseaudio/install
+       $(INSTALL_DIR) \
+               $(1)/usr/bin \
+               $(1)/usr/lib \
+               $(1)/usr/lib/pulse-$(PKG_VERSION)/modules \
+               $(1)/etc/pulse \
+               $(1)/etc/init.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/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/
+endef
+
+define Package/pa-tools/install
+       $(INSTALL_DIR) \
+               $(1)/usr/bin
+
+       $(INSTALL_BIN) \
+               $(PKG_INSTALL_DIR)/usr/bin/pa* \
+               $(1)/usr/bin/
 endef
 
 $(eval $(call BuildPackage,pulseaudio))
+$(eval $(call BuildPackage,pa-tools))