Merge remote-tracking branch 'origin/httpd' into master-cmake

Conflicts:
	.cproject
	.gitmodules
	.project
	.pydevproject
	.settings/language.settings.xml
	.settings/org.eclipse.cdt.core.prefs
	components/cmd_i2c/CMakeLists.txt
	components/cmd_i2c/cmd_i2ctools.c
	components/cmd_i2c/component.mk
	components/cmd_nvs/cmd_nvs.c
	components/cmd_nvs/component.mk
	components/cmd_system/cmd_system.c
	components/cmd_system/component.mk
	components/config/config.c
	components/config/config.h
	components/config/nvs_utilities.c
	components/display/CMakeLists.txt
	components/driver_bt/CMakeLists.txt
	components/driver_bt/component.mk
	components/raop/raop.c
	components/services/CMakeLists.txt
	components/squeezelite-ota/cmd_ota.c
	components/squeezelite-ota/squeezelite-ota.c
	components/squeezelite-ota/squeezelite-ota.h
	components/squeezelite/component.mk
	components/telnet/CMakeLists.txt
	components/wifi-manager/CMakeLists.txt
	components/wifi-manager/dns_server.c
	components/wifi-manager/http_server.c
	components/wifi-manager/http_server.h
	components/wifi-manager/wifi_manager.c
	components/wifi-manager/wifi_manager.h
	main/CMakeLists.txt
	main/console.c
	main/esp_app_main.c
	main/platform_esp32.h

components/raop/component.mk

@@ -7,7 +7,9 @@
 # please read the SDK documents if you need to do this.
 #
 
-CFLAGS += -fstack-usage \
-	-I$(COMPONENT_PATH)/../tools	\
-	-I$(COMPONENT_PATH)/../codecs/inc/alac \
+CFLAGS += -fstack-usage\
+	-I$(PROJECT_PATH)/components/tools	\
+	-I$(PROJECT_PATH)/components/codecs/inc/alac \
 	-I$(PROJECT_PATH)/main/	
+COMPONENT_ADD_INCLUDEDIRS := .
+COMPONENT_SRCDIRS := . 

components/raop/raop.c

@@ -957,5 +957,4 @@ static void on_dmap_string(void *ctx, const char *code, const char *name, const
 	return q - (unsigned char *) data;
 }
 
-/*----------------------------------------------------------------------------*/
-static void on_dmap_string(void *ctx, const char *code, const char *name, const char *buf, size_t len) {
+/*----------------------------------------------------------------------------*/

components/raop/util.c

@@ -588,7 +588,8 @@ void free_metadata(struct metadata_s *metadata)
 	NFREE(metadata->remote_title);
 }
 
-
+
+/*----------------------------------------------------------------------------*/
 
 int _fprintf(FILE *file, ...)
 {