diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/mpd/Makefile | 22 | ||||
| -rw-r--r-- | package/ympd/patches/patch-CMakeLists_txt | 4 | ||||
| -rw-r--r-- | package/ympd/patches/patch-htdocs_mkdata_c | 35 |
3 files changed, 55 insertions, 6 deletions
diff --git a/package/mpd/Makefile b/package/mpd/Makefile index 3b423d3b4..3d7152bcc 100644 --- a/package/mpd/Makefile +++ b/package/mpd/Makefile @@ -16,11 +16,12 @@ PKG_URL:= http://www.musicpd.org/ PKG_SITES:= http://www.musicpd.org/download/mpd/0.18/ PKG_BUILDDEP_UCLIBC:= libiconv-tiny +PKG_BUILDDEP_UCLIBC_NG:=libiconv-tiny 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 WITH_HTTPD -PKG_FLAVOURS_MPD+= WITH_OPUS WITH_PULSE WITH_AVAHI +PKG_FLAVOURS_MPD+= WITH_SNDFILE WITH_OPUS WITH_PULSE WITH_AVAHI PKGFD_WITH_ALSA:= enable ALSA output PKGFS_WITH_ALSA:= alsa-lib @@ -109,21 +110,28 @@ ifeq ($(ADK_PACKAGE_MPD_WITH_OPUS),y) PKG_FDEPENDS+= libopus endif -PKGFD_WITH_PULSE:= enable PULSE support +PKGFD_WITH_SNDFILE:= enable sndfile support +PKGFS_WITH_SNDFILE:= libsndfile +PKGFB_WITH_SNDFILE:= libsndfile +ifeq ($(ADK_PACKAGE_MPD_WITH_SNDFILE),y) +PKG_FDEPENDS+= libsndfile +endif + +PKGFD_WITH_PULSE:= enable pulse support PKGFS_WITH_PULSE:= pulseaudio PKGFB_WITH_PULSE:= pulseaudio ifeq ($(ADK_PACKAGE_MPD_WITH_PULSE),y) PKG_FDEPENDS+= pulseaudio endif -PKGFD_WITH_AVAHI:= enable AVAHI/zeroconf support +PKGFD_WITH_AVAHI:= enable avahi/zeroconf support PKGFS_WITH_AVAHI:= libavahi libdbus PKGFB_WITH_AVAHI:= avahi ifeq ($(ADK_PACKAGE_MPD_WITH_AVAHI),y) PKG_FDEPENDS+= libavahi endif -PKGFD_WITH_HTTPD:= enable HTTP output +PKGFD_WITH_HTTPD:= enable http output include ${ADK_TOPDIR}/mk/package.mk @@ -145,6 +153,12 @@ CONFIGURE_ARGS+= --disable-jack \ --disable-soundcloud \ --enable-inotify +ifneq (${ADK_PACKAGE_MPD_WITH_SNDFILE},) +CONFIGURE_ARGS+= --enable-sndfile +else +CONFIGURE_ARGS+= --disable-sndfile +endif + ifneq (${ADK_PACKAGE_MPD_WITH_HTTPD},) CONFIGURE_ARGS+= --enable-httpd-output else diff --git a/package/ympd/patches/patch-CMakeLists_txt b/package/ympd/patches/patch-CMakeLists_txt index 779a5d26b..762e46601 100644 --- a/package/ympd/patches/patch-CMakeLists_txt +++ b/package/ympd/patches/patch-CMakeLists_txt @@ -1,5 +1,5 @@ --- ympd-1.2.2.orig/CMakeLists.txt 2014-09-28 13:39:27.000000000 +0200 -+++ ympd-1.2.2/CMakeLists.txt 2014-09-28 16:12:53.000000000 +0200 ++++ ympd-1.2.2/CMakeLists.txt 2014-10-05 00:46:09.000000000 +0200 @@ -16,9 +16,6 @@ include_directories(${PROJECT_BINARY_DIR include(CheckCSourceCompiles) @@ -10,7 +10,7 @@ file(GLOB RESOURCES RELATIVE ${PROJECT_SOURCE_DIR} htdocs/js/* -@@ -28,11 +25,11 @@ file(GLOB RESOURCES +@@ -28,11 +25,11 @@ file(GLOB RESOURCES htdocs/index.html ) diff --git a/package/ympd/patches/patch-htdocs_mkdata_c b/package/ympd/patches/patch-htdocs_mkdata_c new file mode 100644 index 000000000..e285e5dc3 --- /dev/null +++ b/package/ympd/patches/patch-htdocs_mkdata_c @@ -0,0 +1,35 @@ +--- ympd-1.2.2.orig/htdocs/mkdata.c 2014-09-28 13:39:27.000000000 +0200 ++++ ympd-1.2.2/htdocs/mkdata.c 2014-10-05 08:52:52.000000000 +0200 +@@ -7,7 +7,6 @@ + + #include <stdlib.h> + #include <stdio.h> +-#include <error.h> + #include <errno.h> + #include <string.h> + +@@ -58,16 +57,20 @@ int main(int argc, char *argv[]) + int i, j, buf; + FILE *fd; + +- if(argc <= 1) +- error(EXIT_FAILURE, 0, "Usage: ./%s <this_file> <file1> [file2, ...] > embedded_data.c", argv[0]); ++ if(argc <= 1) { ++ printf("Usage: ./%s <this_file> <file1> [file2, ...] > embedded_data.c", argv[0]); ++ exit(EXIT_FAILURE); ++ } + + for(i = 1; i < argc; i++) + { + printf("static const unsigned char v%d[] = {", i); + + fd = fopen(argv[i], "r"); +- if(!fd) +- error(EXIT_FAILURE, errno, "Failed open file %s", argv[i]); ++ if(!fd) { ++ printf("Failed open file %s", argv[i]); ++ exit(EXIT_FAILURE); ++ } + + j = 0; + while((buf = fgetc(fd)) != EOF) |