diff options
| -rw-r--r-- | package/ympd/Makefile | 12 | ||||
| -rw-r--r-- | package/ympd/patches/patch-CMakeLists_txt | 27 | ||||
| -rw-r--r-- | package/ympd/patches/patch-htdocs_mkdata_c | 35 |
3 files changed, 4 insertions, 70 deletions
diff --git a/package/ympd/Makefile b/package/ympd/Makefile index a883a0663..c55403632 100644 --- a/package/ympd/Makefile +++ b/package/ympd/Makefile @@ -4,27 +4,23 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= ympd -PKG_VERSION:= 1.2.2 +PKG_VERSION:= 3df5b36b97b7a5b0c9adeba39b9987d9aa58a7fb PKG_RELEASE:= 1 -PKG_HASH:= c4da2549fd65f6d69642348c9ff134cd4bed6a1b2a9be21daa504b6d19517806 -PKG_DESCR:= standalone mpd web gui written in c +PKG_DESCR:= standalone music player daemon web gui PKG_SECTION:= net/http PKG_DEPENDS:= libmpdclient PKG_BUILDDEP:= cmake-host libmpdclient PKG_URL:= http://www.ympd.org/ -PKG_SITES:= http://www.openadk.org/distfiles/ +PKG_SITES:= https://github.com/notandy/ympd.git include $(ADK_TOPDIR)/mk/package.mk $(eval $(call PKG_template,YMPD,ympd,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +XAKE_FLAGS+= GCC_HONOUR_COPTS=s CONFIG_STYLE:= cmake TARGET_CFLAGS+= -std=c99 -pre-build: - $(HOST_CC) -o $(WRKBUILD)/mkdata $(WRKBUILD)/htdocs/mkdata.c - chmod 755 $(WRKBUILD)/mkdata - ympd-install: $(INSTALL_DIR) $(IDIR_YMPD)/usr/bin $(INSTALL_BIN) $(WRKINST)/usr/bin/ympd \ diff --git a/package/ympd/patches/patch-CMakeLists_txt b/package/ympd/patches/patch-CMakeLists_txt deleted file mode 100644 index 762e46601..000000000 --- a/package/ympd/patches/patch-CMakeLists_txt +++ /dev/null @@ -1,27 +0,0 @@ ---- ympd-1.2.2.orig/CMakeLists.txt 2014-09-28 13:39:27.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) - --set(CMAKE_C_FLAGS "-std=gnu99 -Wall") --set(CMAKE_C_FLAGS_DEBUG "-ggdb -pedantic") -- - file(GLOB RESOURCES - RELATIVE ${PROJECT_SOURCE_DIR} - htdocs/js/* -@@ -28,11 +25,11 @@ file(GLOB RESOURCES - htdocs/index.html - ) - --add_executable(mkdata htdocs/mkdata.c) --get_target_property(MKDATA_EXE mkdata LOCATION) -+#add_executable(mkdata htdocs/mkdata.c) -+#get_target_property(MKDATA_EXE mkdata LOCATION) - - add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/assets.c -- COMMAND ${MKDATA_EXE} ${RESOURCES} > ${PROJECT_BINARY_DIR}/assets.c -+ COMMAND ./mkdata ${RESOURCES} > ${PROJECT_BINARY_DIR}/assets.c - WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} - DEPENDS ${RESOURCES} mkdata - ) diff --git a/package/ympd/patches/patch-htdocs_mkdata_c b/package/ympd/patches/patch-htdocs_mkdata_c deleted file mode 100644 index e285e5dc3..000000000 --- a/package/ympd/patches/patch-htdocs_mkdata_c +++ /dev/null @@ -1,35 +0,0 @@ ---- 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) |