resolve merge conflict

package/libupnp/Makefile

@@ -4,9 +4,9 @@
 include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		libupnp
-PKG_VERSION:=		1.6.6
-PKG_RELEASE:=		3
-PKG_MD5SUM:=		8918dcf7428cd119d0c8275765ff2833
+PKG_VERSION:=		1.6.19
+PKG_RELEASE:=		1
+PKG_MD5SUM:=		ee16e5d33a3ea7506f38d71facc057dd
 PKG_DESCR:=		The Universal Plug and Play (UPnP) SDK library
 PKG_SECTION:=		libs
 PKG_BUILDDEP:=		autotool

package/mt-daapd/Makefile

@@ -5,7 +5,7 @@ include ${TOPDIR}/rules.mk
 
 PKG_NAME:=		mt-daapd
 PKG_VERSION:=		0.2.4.2
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_MD5SUM:=		67bef9fb14d487693b0dfb792c3f1b05
 PKG_DESCR:=		a multi-threaded DAAP daemon
 PKG_SECTION:=		multimedia

package/mt-daapd/patches/patch-src_mp3-scanner_c

@@ -0,0 +1,10 @@
+--- mt-daapd-0.2.4.2.orig/src/mp3-scanner.c	2008-04-19 21:17:23.000000000 +0200
++++ mt-daapd-0.2.4.2/src/mp3-scanner.c	2014-01-20 12:19:42.000000000 +0100
+@@ -40,6 +40,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <sys/param.h>
+ 
+ #include <netinet/in.h>  /* htons and friends */
+ #include <sys/stat.h>

package/pulseaudio/Makefile

@@ -11,9 +11,10 @@ PKG_DESCR:=		a sound system for POSIX OSes
 PKG_SECTION:=		multimedia
 PKG_DEPENDS:=		libltdl json-c libsndfile libudev libspeex libncurses
 PKG_DEPENDS+=		libflac libvorbis libogg libuuid libsndfile dbus
-PKG_DEPENDS+=		libgcc libpthread librt alsa-lib
+PKG_DEPENDS+=		libgcc libpthread librt alsa-lib libsamplerate
 PKG_BUILDDEP:=		libtool json-c libsndfile eudev speex libsndfile
 PKG_BUILDDEP+=		flac libvorbis libogg util-linux dbus ncurses alsa-lib
+PKG_BUILDDEP+=		libsamplerate
 PKG_URL:=		http://www.freedesktop.org/wiki/Software/PulseAudio/
 PKG_SITES:=		http://freedesktop.org/software/pulseaudio/releases/
 PKG_OPTS:=		dev
@@ -31,7 +32,16 @@ CONFIGURE_ARGS+=	--disable-systemd \
 			--disable-manpages \
 			--disable-neon-opt \
 			--disable-x11 \
+			--disable-avahi \
+			--disable-lirc \
 			--disable-openssl \
+			--disable-orc \
+			--disable-libwrap \
+			--disable-oss \
+			--disable-esound \
+			--disable-jack \
+			--disable-gconf \
+			--enable-samplerate \
 			--enable-alsa \
 			--enable-dbus \
 			--enable-udev \