Merge pull request #7768 from neheb/patch-13

shairport-sync: Allow usage with uclibc++

diff --git a/libs/alsa-lib/Makefile b/libs/alsa-lib/Makefile
index 40d50a543b272d1ee0de3ce0a7003a48f603e8f5..749a0a73e4184c75610b4115b663dae6959d6b92 100644 (file)
--- a/libs/alsa-lib/Makefile
+++ b/libs/alsa-lib/Makefile
@@ -42,6 +42,10 @@ define Package/alsa-lib/description
  You must have enabled the ALSA support in the kernel.
 endef
 
+define Package/alsa-lib/conffiles
+/etc/asound.conf
+endef
+
 TARGET_CFLAGS += $(FPIC)
 
 CONFIGURE_ARGS+= \

diff --git a/libs/libaudiofile/Makefile b/libs/libaudiofile/Makefile
index 41754463484a5337d2d71e28be00b4e24c19b5a3..6dd0af355f0fdd75bdd464a5cf6907983c69e284 100644 (file)
--- a/libs/libaudiofile/Makefile
+++ b/libs/libaudiofile/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=audiofile
 PKG_VERSION:=0.3.6
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/0.3
@@ -18,6 +18,7 @@ PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_FIXUP:=autoreconf
 PKG_INSTALL=1
 
+include $(INCLUDE_DIR)/uclibc++.mk
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libaudiofile
@@ -25,7 +26,7 @@ define Package/libaudiofile
   CATEGORY:=Libraries
   TITLE:=Audio File library
   URL:=http://audiofile.68k.org/
-  DEPENDS:=+libflac +libstdcpp
+  DEPENDS:=$(CXX_DEPENDS) +libflac
 endef
 
 define Package/libaudiofile/description

diff --git a/libs/libsndfile/Makefile b/libs/libsndfile/Makefile
index da46abfe8cf7ef6ceaa7b8b02cdd9e1aa53d7fd5..c136402aa0b3fdebe3906e61615b227845b757ae 100644 (file)
--- a/libs/libsndfile/Makefile
+++ b/libs/libsndfile/Makefile
@@ -12,9 +12,9 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/erikd/libsndfile.git
-PKG_SOURCE_DATE:=2018-11-27
-PKG_SOURCE_VERSION:=b4bd397ca74f4c72b9cabaae66fef0c3d5a8c527
-PKG_MIRROR_HASH:=bbef527d5cdc97ad14ca5337b692b7adf8f725e813ca48b445111669f79f5c5e
+PKG_SOURCE_DATE:=2018-12-24
+PKG_SOURCE_VERSION:=8ddc442d539ca775d80cdbc7af17a718634a743f
+PKG_MIRROR_HASH:=d7be85919067f51c83b74b67ea9e7043710fe009d704aa414ef57c6f48974ae1
 
 PKG_LICENSE:=LGPLv2.1
 PKG_LICENSE_FILES:=COPYING