cleanup Makefile, add missing dependencies, packages tools seperately - still broken: segfaults in system mode / fails to allocate memory in user mode
git-svn-id: svn://svn.openwrt.org/openwrt/packages@24205 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
9bedd610b8
commit
656a2884b4
@ -17,16 +17,27 @@ PKG_MD5SUM:=ca85ab470669b05e100861654cf5eb3c
|
|||||||
|
|
||||||
PKG_FIXUP = libtool
|
PKG_FIXUP = libtool
|
||||||
|
|
||||||
|
PKG_INSTALL = 1
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/package.mk
|
include $(INCLUDE_DIR)/package.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
|
define Package/pulseaudio
|
||||||
SECTION:=sound
|
SECTION:=sound
|
||||||
CATEGORY:=Sound
|
CATEGORY:=Sound
|
||||||
DEPENDS:=+libspeexdsp +libgdbm +liboil +libsamplerate +libsndfile +libatomicops +libltdl +dbus +libintl +libiconv @BROKEN
|
DEPENDS:=+libspeexdsp +libgdbm +liboil +libsamplerate +libsndfile +libatomicops +libltdl +dbus +libpthread +librt +libintl +libiconv @BROKEN
|
||||||
TITLE:=Network sound server
|
TITLE:=Network sound server
|
||||||
URL:=http://www.pulseaudio.org
|
URL:=http://www.pulseaudio.org
|
||||||
endef
|
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 += \
|
CONFIGURE_ARGS += \
|
||||||
--with-system-user=root \
|
--with-system-user=root \
|
||||||
--with-system-group=root \
|
--with-system-group=root \
|
||||||
@ -48,24 +59,45 @@ CONFIGURE_ARGS += \
|
|||||||
--disable-bluez \
|
--disable-bluez \
|
||||||
--without-caps
|
--without-caps
|
||||||
|
|
||||||
|
|
||||||
CONFIGURE_VARS += \
|
CONFIGURE_VARS += \
|
||||||
PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig"
|
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$(STAGING_DIR)/usr/lib/libintl/lib -L$(STAGING_DIR)/usr/lib/libiconv/lib
|
||||||
|
TARGET_CFLAGS += -std=gnu99
|
||||||
|
|
||||||
define Build/Compile
|
define Package/pulseaudio/install
|
||||||
$(MAKE) -C $(PKG_BUILD_DIR) \
|
$(INSTALL_DIR) \
|
||||||
CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
|
$(1)/usr/bin \
|
||||||
LDFLAGS="$(TARGET_LDFLAGS) $(SUPP_LIBS)" \
|
$(1)/usr/lib \
|
||||||
DESTDIR="$(PKG_INSTALL_DIR)" \
|
$(1)/usr/lib/pulse-$(PKG_VERSION)/modules \
|
||||||
LIBLTDL="$(STAGING_DIR)/usr/lib/libltdl.la" \
|
$(1)/etc/pulse
|
||||||
X_CFLAGS="" \
|
|
||||||
all install
|
$(INSTALL_BIN) \
|
||||||
|
$(PKG_INSTALL_DIR)/usr/bin/pulseaudio \
|
||||||
|
$(1)/usr/bin/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/*.so \
|
||||||
|
$(1)/usr/lib/pulse-$(PKG_VERSION)/modules/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
define Package/pulseaudio/install
|
define Package/pa-tools/install
|
||||||
$(INSTALL_DIR) $(1)/usr/bin
|
$(INSTALL_DIR) \
|
||||||
$(CP) $(PKG_INSTALL_DIR)/* $(1)/
|
$(1)/usr/bin
|
||||||
|
|
||||||
|
$(INSTALL_BIN) \
|
||||||
|
$(PKG_INSTALL_DIR)/usr/bin/pa* \
|
||||||
|
$(1)/usr/bin/
|
||||||
endef
|
endef
|
||||||
|
|
||||||
$(eval $(call BuildPackage,pulseaudio))
|
$(eval $(call BuildPackage,pulseaudio))
|
||||||
|
$(eval $(call BuildPackage,pa-tools))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user