From cf30b42b711829a86e994060ab72726b18209410 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 30 Mar 2015 00:35:45 +0200 Subject: update to latest development version, fetch via git --- package/ympd/patches/patch-CMakeLists_txt | 27 ----------------------- package/ympd/patches/patch-htdocs_mkdata_c | 35 ------------------------------ 2 files changed, 62 deletions(-) delete mode 100644 package/ympd/patches/patch-CMakeLists_txt delete mode 100644 package/ympd/patches/patch-htdocs_mkdata_c (limited to 'package/ympd/patches') 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 - #include --#include - #include - #include - -@@ -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 [file2, ...] > embedded_data.c", argv[0]); -+ if(argc <= 1) { -+ printf("Usage: ./%s [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) -- cgit v1.2.3