Merge branch 'master' of git+ssh://openadk.org/git/openadk

5 files changed, 14 insertions, 7 deletions

diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index a78aa7ffc..7814fbeb6 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -21,7 +21,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.xz
 
 PKG_FLAVOURS_MPD:=	WITH_ALSA WITH_AO WITH_MP3 WITH_MP4 WITH_TREMOR
 PKG_FLAVOURS_MPD+=	WITH_OGG WITH_FLAC WITH_WAV WITH_MMS WITH_FFMPEG
-PKG_FLAVOURS_MPD+=	WITH_SHOUT WITH_CURL WITH_SAMPLERATE
+PKG_FLAVOURS_MPD+=	WITH_SHOUT WITH_CURL WITH_SAMPLERATE WITH_HTTPD
 
 PKGFD_WITH_ALSA:=	enable ALSA output
 PKGFS_WITH_ALSA:=	alsa-lib
@@ -87,7 +87,7 @@ PKGFD_WITH_SHOUT:=	enable Shoutcast output support
 PKGFS_WITH_SHOUT:=	libshout libmp3lame libvorbisenc
 PKGFB_WITH_SHOUT:=	lame libvorbis libshout
 ifeq ($(ADK_PACKAGE_MPD_WITH_SHOUT),y)
-PKG_FDEPENDS+=		libshout liblame libvorbisenc
+PKG_FDEPENDS+=		libshout libmp3lame libvorbisenc
 endif
 PKGFD_WITH_CURL:=	enable CURL support
 PKGFS_WITH_CURL:=	libcurl
@@ -103,6 +103,8 @@ ifeq ($(ADK_PACKAGE_MPD_WITH_SAMPLERATE),y)
 PKG_FDEPENDS+=		libsamplerate
 endif
 
+PKGFD_WITH_HTTPD:=	enable HTTP output
+
 include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,MPD,mpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS},${PKG_DESCR},${PKG_SECTION}))
@@ -110,8 +112,7 @@ $(eval $(call PKG_template,MPD,mpd,${PKG_VERSION}-${PKG_RELEASE},${PKG_FDEPENDS}
 TARGET_CPPFLAGS+=	-D_GNU_SOURCE -D_POSIX_SOURCE
 TARGET_CFLAGS+=		-std=gnu99
 CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
-CONFIGURE_ARGS+=	--disable-httpd-output \
-			--disable-jack \
+CONFIGURE_ARGS+=	--disable-jack \
 			--disable-fifo \
 			--disable-pulse \
 			--disable-oss \
@@ -123,6 +124,12 @@ CONFIGURE_ARGS+=	--disable-httpd-output \
 			--enable-inotify \
 			--with-zeroconf=no
 
+ifneq (${ADK_PACKAGE_MPD_WITH_HTTPD},)
+CONFIGURE_ARGS+=	--enable-httpd-output
+else
+CONFIGURE_ARGS+=	--disable-httpd-output
+endif
+
 ifneq (${ADK_PACKAGE_MPD_WITH_ALSA},)
 CONFIGURE_ARGS+=	--enable-alsa
 else
diff --git a/package/python2/Makefile b/package/python2/Makefile
index 1fa0cce94..36bcdf7fc 100644
--- a/package/python2/Makefile
+++ b/package/python2/Makefile
@@ -97,6 +97,7 @@ CONFIGURE_ARGS:=	--with-threads \
 
 HOST_STYLE:=		auto
 HOST_CONFIGURE_ARGS:=	--with-threads \
+			--enable-shared \
 			--disable-toolbox-glue \
 			--without-cxx-main
 
@@ -106,8 +107,6 @@ hostpost-install:
 
 pre-configure:
 	(cd $(WRKBUILD) && patch -p1 < \
-		$(TOPDIR)/package/python2/files/patch-Lib_distutils_sysconfig_py )
-	(cd $(WRKBUILD) && patch -p1 < \
 		$(TOPDIR)/package/python2/files/patch-Misc_python-config_in )
 	$(SED) "s#@EXENAME@#$(STAGING_HOST_DIR)/usr/bin/python#" \
 		$(WRKBUILD)/Misc/python-config.in
diff --git a/package/python2/files/patch-Lib_distutils_sysconfig_py b/package/python2/patches/patch-Lib_distutils_sysconfig_py
index 30aae0816..30aae0816 100644
--- a/package/python2/files/patch-Lib_distutils_sysconfig_py
+++ b/package/python2/patches/patch-Lib_distutils_sysconfig_py
diff --git a/package/xcb-proto/Makefile b/package/xcb-proto/Makefile
index 62989d836..2db4b605e 100644
--- a/package/xcb-proto/Makefile
+++ b/package/xcb-proto/Makefile
@@ -9,7 +9,7 @@ PKG_RELEASE:=		1
 PKG_DESCR:=		XML-XCB protocol descriptions
 PKG_SECTION:=		devel
 PKG_MD5SUM:=		8d2cdb770129cef563088a90c5bec768
-PKG_BUILDDEP:=		python2-host
+PKG_BUILDDEP:=		autotool python2-host
 PKG_SITES:=		http://xcb.freedesktop.org/dist/
 PKG_OPTS:=		dev devonly
 
diff --git a/target/packages/pkg-available/mpdbox b/target/packages/pkg-available/mpdbox
index 810d546e5..4612e6a31 100644
--- a/target/packages/pkg-available/mpdbox
+++ b/target/packages/pkg-available/mpdbox
@@ -15,6 +15,7 @@ config ADK_PKG_MPDBOX
 	select ADK_PACKAGE_MPD_WITH_SHOUT
 	select ADK_PACKAGE_MPD_WITH_CURL
 	select ADK_PACKAGE_MPD_WITH_SAMPLERATE
+	select ADK_PACKAGE_MPD_WITH_HTTPD
 	select ADK_PACKAGE_FILE
 	select ADK_PACKAGE_FFMPEG
 	select ADK_PACKAGE_FFPROBE