update mpd, libvirt, php and openldap

- make more features available in mpd
- add libmms package
- do not call redundant clean on cleantarget

4 files changed, 154 insertions, 46 deletions

diff --git a/package/mpd/Config.in b/package/mpd/Config.in
index 89a98f24e..aaf317a91 100644
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@@ -1,19 +1,36 @@
-#menu "mpd............................... Music Player Daemon"
+menu "mpd............................... Music Player Daemon"
 
 config ADK_PACKAGE_MPD
 	prompt "mpd............................... Music Player Daemon"
 	tristate
 	default n
-	select ADK_PACKAGE_ALSA_LIB
 	select ADK_PACKAGE_GLIB
-	select ADK_PACKAGE_LIBCURL
 	help
 	  MPD is a music player supporting flac, mp3 and ogg files.
 	  It is typically controlled over a network using one of it's many
 	  clients including mpc(console), gmpc(gnome), phpmp(php) etc.
-
 	  http://www.musicpd.org/
 
+config ADK_COMPILE_MPD_WITH_ALSA
+	prompt   "ALSA playback support"
+	bool
+	default y
+	depends on ADK_PACKAGE_MPD
+	select ADK_PACKAGE_ALSA_LIB
+	help
+	  Enable ALSA playback support.
+
+config ADK_COMPILE_MPD_WITH_SHOUT
+	prompt   "Shoutcast playback support"
+	bool
+	default y
+	depends on ADK_PACKAGE_MPD
+	select ADK_PACKAGE_LIBSHOUT
+	select ADK_PACKAGE_LIBVORBISENC
+	select ADK_PACKAGE_LIBLAME
+	help
+	  Enable shout support (libshout).
+
 config ADK_COMPILE_MPD_WITH_MP3
 	prompt   "MP3 support"
 	bool
@@ -35,7 +52,7 @@ config ADK_COMPILE_MPD_WITH_MP4
 
 config ADK_COMPILE_MPD_OGG
 	prompt   "Ogg/Vorbis Support"
-	tristate
+	bool
 	depends on ADK_PACKAGE_MPD
 	select ADK_COMPILE_MPD_WITH_OGG if ADK_COMPILE_MPD_OGG_FLOAT
 	select ADK_COMPILE_MPD_WITH_TREMOR if ADK_COMPILE_MPD_OGG_FIXED
@@ -81,16 +98,41 @@ config ADK_COMPILE_MPD_WITH_FLAC
 	help
 	  Enable flac support (libflac).
 
-config ADK_COMPILE_MPD_WITH_SHOUT
-	prompt   "Shout Support (Streaming support)"
+config ADK_COMPILE_MPD_WITH_WAV
+	prompt   "WAVE/AU Support"
 	bool
 	default y
 	depends on ADK_PACKAGE_MPD
-	depends on ADK_COMPILE_MPD_WITH_OGG
-	select ADK_PACKAGE_LIBSHOUT
-	select ADK_PACKAGE_LIBVORBISENC
-	select ADK_PACKAGE_LIBLAME
+	select ADK_PACKAGE_LIBAUDIOFILE
 	help
-	  Enable shout support (libshout).
+	  Enable wave support (libaudiofile).
+
+config ADK_COMPILE_MPD_WITH_CURL
+	prompt   "HTTP streaming support"
+	bool
+	default y
+	depends on ADK_PACKAGE_MPD
+	select ADK_PACKAGE_LIBCURL
+	help
+	  Enable http streaming support (libcurl).
+
+config ADK_COMPILE_MPD_WITH_MMS
+	prompt   "MMS streaming support"
+	bool
+	default n
+	depends on ADK_PACKAGE_MPD
+	select ADK_PACKAGE_LIBMMS
+	help
+	  Enable mms streaming support (libmms).
+
+config ADK_COMPILE_MPD_WITH_FFMPEG
+	prompt   "FFMPEG support"
+	bool
+	default n
+	depends on ADK_PACKAGE_MPD
+	select ADK_PACKAGE_FFMPEG
+	help
+	  Enable FFMPEG support (ffmpeg).
+
 
-#endmenu
+endmenu
diff --git a/package/mpd/Makefile b/package/mpd/Makefile
index b45a96976..e0da5805d 100644
--- a/package/mpd/Makefile
+++ b/package/mpd/Makefile
@@ -4,17 +4,21 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mpd
-PKG_VERSION:=		0.14.2
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		64177135f64aca555887ba378de8cdfb
-PKG_DESCR:=		A music player for flac, mp3 and ogg
+PKG_VERSION:=		0.15.6
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		c78b8933e4902c5dc407d59925f8b10e
+PKG_DESCR:=		A music player daemon
 PKG_SECTION:=		net
-PKG_DEPENDS:=		alsa-lib glib libcurl
+PKG_DEPENDS:=		glib
 PKG_URL:=		http://mpd.wikia.com/wiki/Music_Player_Daemon_Wiki
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=musicpd/}
 
 include ${TOPDIR}/mk/package.mk
 
+ifneq (${ADK_COMPILE_MPD_WITH_ALSA},)
+PKG_DEPENDS+=		alsa-lib
+endif
+
 ifneq (${ADK_COMPILE_MPD_WITH_MP3},)
 PKG_DEPENDS+=		libid3tag libmad
 endif
@@ -23,7 +27,7 @@ ifneq (${ADK_COMPILE_MPD_WITH_MP4},)
 PKG_DEPENDS+=		libfaad2
 endif
 
-ifeq (${ADK_COMPILE_MPD_WITH_OGG},y)
+ifneq (${ADK_COMPILE_MPD_WITH_OGG},)
 PKG_DEPENDS+=		libvorbis libogg
 endif
 
@@ -35,29 +39,56 @@ ifneq (${ADK_COMPILE_MPD_WITH_FLAC},)
 PKG_DEPENDS+=		libflac
 endif
 
+ifneq (${ADK_COMPILE_MPD_WITH_WAV},)
+PKG_DEPENDS+=		libaudiofile
+endif
+
 ifneq (${ADK_COMPILE_MPD_WITH_SHOUT},)
 PKG_DEPENDS+=		libshout liblame
 endif
 
+ifneq (${ADK_COMPILE_MPD_WITH_CURL},)
+PKG_DEPENDS+=		libcurl
+endif
+
+ifneq (${ADK_COMPILE_MPD_WITH_MMS},)
+PKG_DEPENDS+=		libmms
+endif
+
+ifneq (${ADK_COMPILE_MPD_WITH_FFMPEG},)
+PKG_DEPENDS+=		ffmpeg
+endif
+
 $(eval $(call PKG_template,MPD,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
-CONFIGURE_STYLE:=	gnu
+CONFIGURE_STYLE:=	gnu autotool
 BUILD_STYLE:=		auto
 INSTALL_STYLE:=		auto
 XAKE_FLAGS+=		MPD_CFLAGS='-D_GNU_SOURCE'
 
 CONFIGURE_ENV+=		ac_cv_lib_nsl_gethostbyname=no
 CONFIGURE_ARGS+=	\
-			--enable-alsa \
-			--disable-mod \
+			--disable-httpd-output \
+			--disable-ao \
+			--disable-jack \
+			--disable-fifo \
+			--disable-pulse \
 			--disable-oss \
-			--disable-audiofile \
 			--disable-mpc \
+			--disable-wavpack \
+			--disable-sqlite \
+			--with-zeroconf=no
+
+ifneq (${ADK_COMPILE_MPD_WITH_ALSA},)
+CONFIGURE_ARGS+=	--enable-alsa
+else
+CONFIGURE_ARGS+=	--disable-alsa
+endif
 
 ifneq (${ADK_COMPILE_MPD_WITH_MP3},)
-CONFIGURE_ARGS+=	--enable-id3 --enable-mp3
+CONFIGURE_ARGS+=	--enable-id3 --enable-mad
 else
-CONFIGURE_ARGS+=	--disable-id3 --disable-mp3
+CONFIGURE_ARGS+=	--disable-id3 --disable-mad
 endif
 
 ifneq (${ADK_COMPILE_MPD_WITH_MP4},)
@@ -66,15 +97,15 @@ else
 CONFIGURE_ARGS+=	--disable-aac
 endif
 
-ifeq (${ADK_COMPILE_MPD_WITH_OGG},y)
-CONFIGURE_ARGS+=	--enable-oggvorbis 
+ifneq (${ADK_COMPILE_MPD_WITH_OGG},)
+CONFIGURE_ARGS+=	--enable-vorbis 
 else
-CONFIGURE_ARGS+=	--disable-oggvorbis 
+CONFIGURE_ARGS+=	--disable-vorbis 
 endif
 
 ifneq (${ADK_COMPILE_MPD_WITH_TREMOR},)
 CONFIGURE_ARGS+=	\
-			--disable-oggvorbis \
+			--disable-vorbis \
 			--with-tremor \
 			--with-tremor-includes=${STAGING_DIR}/usr/include \
 			--with-tremor-libraries=${STAGING_DIR}/usr/lib
@@ -86,14 +117,40 @@ else
 CONFIGURE_ARGS+=	--disable-flac
 endif
 
+ifneq (${ADK_COMPILE_MPD_WITH_WAV},)
+CONFIGURE_ARGS+=	--enable-audiofile
+else
+CONFIGURE_ARGS+=	--disable-audiofile
+endif
+
 ifneq (${ADK_COMPILE_MPD_WITH_SHOUT},)
-CONFIGURE_ARGS+=	--enable-shout-ogg \
-			--enable-shout-mp3 \
-			--enable-lame
+CONFIGURE_ARGS+=	--enable-shout \
+			--enable-lame-encoder \
+			--enable-vorbis-encoder \
+			--with-lame-includes=${STAGING_DIR}/usr/include \
+			--with-lame-libraries=${STAGING_DIR}/usr/lib
+else
+CONFIGURE_ARGS+=	--disable-shout \
+			--disable-lame-encoder \
+			--disable-vorbis-encoder
+endif
+
+ifneq (${ADK_COMPILE_MPD_WITH_CURL},)
+CONFIGURE_ARGS+=	--enable-curl
+else
+CONFIGURE_ARGS+=	--disable-curl
+endif
+
+ifneq (${ADK_COMPILE_MPD_WITH_MMS},)
+CONFIGURE_ARGS+=	--enable-mms
+else
+CONFIGURE_ARGS+=	--disable-mms
+endif
+
+ifneq (${ADK_COMPILE_MPD_WITH_FFMPEG},)
+CONFIGURE_ARGS+=	--enable-ffmpeg
 else
-CONFIGURE_ARGS+=	--disable-shout-ogg \
-			--disable-shout-mp3 \
-			--disable-lame
+CONFIGURE_ARGS+=	--disable-ffmpeg
 endif
 
 post-install:
diff --git a/package/mpd/patches/patch-m4_lame_m4 b/package/mpd/patches/patch-m4_lame_m4
new file mode 100644
index 000000000..b2f009293
--- /dev/null
+++ b/package/mpd/patches/patch-m4_lame_m4
@@ -0,0 +1,20 @@
+--- mpd-0.15.6.orig/m4/lame.m4	2009-11-19 03:47:51.000000000 +0100
++++ mpd-0.15.6/m4/lame.m4	2009-11-23 23:06:27.000000000 +0100
+@@ -25,8 +25,6 @@ if test "x$lame_prefix" != "xno" ; then
+     LAME_LIBS="-L$lame_libraries"
+   elif test "x$lame_prefix" != "x" ; then
+     LAME_LIBS="-L$lame_prefix/lib"
+-  elif test "x$prefix" != "xNONE" ; then
+-    LAME_LIBS="-L$prefix/lib"
+   fi
+ 
+   LAME_LIBS="$LAME_LIBS -lmp3lame -lm"
+@@ -35,8 +33,6 @@ if test "x$lame_prefix" != "xno" ; then
+     LAME_CFLAGS="-I$lame_includes"
+   elif test "x$lame_prefix" != "x" ; then
+     LAME_CFLAGS="-I$lame_prefix/include"
+-  elif test "x$prefix" != "xNONE"; then
+-    LAME_CFLAGS="-I$prefix/include"
+   fi
+ 
+   AC_MSG_CHECKING(for liblame)
diff --git a/package/mpd/patches/patch-src_listen_h b/package/mpd/patches/patch-src_listen_h
deleted file mode 100644
index e14baa2bb..000000000
--- a/package/mpd/patches/patch-src_listen_h
+++ /dev/null
@@ -1,11 +0,0 @@
-$Id: update-patches 24 2008-08-31 14:56:13Z wbx $
---- mpd-0.14.2.orig/src/listen.h	2009-02-13 17:12:00.000000000 +0100
-+++ mpd-0.14.2/src/listen.h	2009-05-29 00:49:32.000000000 +0200
-@@ -20,6 +20,7 @@
- #define MPD_LISTEN_H
- 
- #include <sys/select.h>
-+#include <linux/socket.h>
- 
- extern int boundPort;
-