diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-21 08:34:35 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-21 08:34:35 +0100 |
| commit | fd88ee34fa5f069412ec9572407babafb74d6554 (patch) | |
| tree | 764dffa7a25d192f368fb48eb5606d85d35a0e79 | |
| parent | e7fbbc95bc3a73e938d7c0159978a73ee7c3d22a (diff) | |
| parent | 1a3b09a9daae7dc8e116900f2a45a5d6f0bd12f0 (diff) | |
resolve merge conflict
| -rw-r--r-- | package/libupnp/Makefile | 6 | ||||
| -rw-r--r-- | package/mt-daapd/Makefile | 2 | ||||
| -rw-r--r-- | package/mt-daapd/patches/patch-src_mp3-scanner_c | 10 | ||||
| -rw-r--r-- | package/pulseaudio/Makefile | 12 |
4 files changed, 25 insertions, 5 deletions
diff --git a/package/libupnp/Makefile b/package/libupnp/Makefile index 4b01731bc..18eda96b6 100644 --- a/package/libupnp/Makefile +++ b/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 diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile index 7303c86e7..d1baa41e4 100644 --- a/package/mt-daapd/Makefile +++ b/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 diff --git a/package/mt-daapd/patches/patch-src_mp3-scanner_c b/package/mt-daapd/patches/patch-src_mp3-scanner_c new file mode 100644 index 000000000..e5defb78f --- /dev/null +++ b/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> diff --git a/package/pulseaudio/Makefile b/package/pulseaudio/Makefile index e7d71a48d..eba650096 100644 --- a/package/pulseaudio/Makefile +++ b/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 \ |