summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-01-24 15:24:03 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2014-01-24 15:24:03 +0100
commit3b82435b7e5671a1a9d6dbee3a28d41be1f9871c (patch)
treeb4dba74bee9886d3bf2dcd5953d12383c6b67523
parent1de32ab616744add3f1748084610e7a5b3d654cd (diff)
parent53d5800eb6fb9431f61c2e0941efcd1a20ce2b4a (diff)
Merge branch 'master' of git+ssh://openadk.org/git/openadk
-rw-r--r--mk/vars.mk2
-rw-r--r--package/libsamplerate/Makefile4
-rw-r--r--package/mpd/Makefile6
3 files changed, 7 insertions, 5 deletions
diff --git a/mk/vars.mk b/mk/vars.mk
index e217a9dca..617316e29 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -218,7 +218,7 @@ QUIET:=
else
QUIET:= --quiet
endif
-FETCH_CMD?= wget --timeout=5 -t 3 $(QUIET)
+FETCH_CMD?= wget --timeout=10 -t 3 $(QUIET)
ifeq ($(ADK_HOST_CYGWIN),y)
EXEEXT:= .exe
diff --git a/package/libsamplerate/Makefile b/package/libsamplerate/Makefile
index a8f8d04ce..5c73458d1 100644
--- a/package/libsamplerate/Makefile
+++ b/package/libsamplerate/Makefile
@@ -5,7 +5,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:= libsamplerate
PKG_VERSION:= 0.1.8
-PKG_RELEASE:= 2
+PKG_RELEASE:= 3
PKG_MD5SUM:= 1c7fb25191b4e6e3628d198a66a84f47
PKG_DESCR:= sample rate converter for audio
PKG_SECTION:= libs
@@ -17,6 +17,8 @@ include $(TOPDIR)/mk/package.mk
$(eval $(call PKG_template,LIBSAMPLERATE,libsamplerate,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+CONFIGURE_ARGS+= --disable-sndfile
+
libsamplerate-install:
$(INSTALL_DIR) $(IDIR_LIBSAMPLERATE)/usr/lib
$(CP) $(WRKINST)/usr/lib/libsamplerate*.so* \
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index da3e2e334..589aa14b4 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -9,9 +9,9 @@ PKG_RELEASE:= 3
PKG_MD5SUM:= 63bcf6ce338caa2ae2cd6dc8e9710d5c
PKG_DESCR:= A music player daemon
PKG_SECTION:= multimedia
-PKG_DEPENDS:= glib libstdcxx libgcc libiconv
-PKG_FDEPENDS:= glib libstdcxx libgcc libiconv
-PKG_BUILDDEP:= glib
+PKG_DEPENDS:= glib libstdcxx libgcc libiconv-tiny libmpdclient
+PKG_FDEPENDS:= glib libstdcxx libgcc libiconv-tiny libmpdclient
+PKG_BUILDDEP:= glib libmpdclient
PKG_URL:= http://www.musicpd.org/
PKG_SITES:= http://www.musicpd.org/download/mpd/0.18/
PKG_NEED_CXX:= 1