7 files changed, 79 insertions, 84 deletions
diff --git a/tools/darwin/Configurations/App.xcconfig.in b/tools/darwin/Configurations/App.xcconfig.in
index ec2290a516..560db9f3cd 100644
--- a/tools/darwin/Configurations/App.xcconfig.in
+++ b/tools/darwin/Configurations/App.xcconfig.in
@@ -25,7 +25,7 @@ HEADER_SEARCH_PATHS = $(inherited) $SRCROOT xbmc xbmc/linux xbmc/cores/VideoPlay
 LIBRARY_SEARCH_PATHS = $(inherited) $(SRCROOT) $(SRCROOT)/xbmc/interfaces/json-rpc "$(SRCROOT)/xbmc/interfaces/python" "$(SRCROOT)/xbmc/interfaces/legacy"
 FRAMEWORK_SEARCH_PATHS = $(inherited) "$(SDKROOT)/System/Library/PrivateFrameworks/" "$(SDKROOT)/System/Library/Frameworks/"
 
-XBMC_OTHER_LDFLAGS_COMMON = $(inherited) -Wl,-headerpad_max_install_names -Wl,-all_load -L$XBMC_DEPENDS/lib -lbz2 -lintl -lexpat -lssl -lgpg-error -lresolv -lffi -lssh -llzo2 -lpcre -lpcrecpp -lfribidi -lfreetype -lfontconfig -lsqlite3 -ltinyxml -lmicrohttpd -lsmbclient -lpython2.7 -lyajl -lcrypto -lgcrypt -lavdevice -lavfilter -lavcodec -lavformat -lpostproc -lavutil -lswresample -lswscale -ltag -L$XBMC_DEPENDS/lib/mysql -lmysqlclient -lxml2 -lxslt -lnettle -lgmp -lhogweed -lgnutls -lcrossguid -lz -lm -liconv
+XBMC_OTHER_LDFLAGS_COMMON = $(inherited) -Wl,-headerpad_max_install_names -Wl,-all_load -L$XBMC_DEPENDS/lib -lbz2 -lintl -lexpat -lssl -lgpg-error -lresolv -lffi -lssh -llzo2 -lpcre -lpcrecpp -lfribidi -lfreetype -lfontconfig -lsqlite3 -ltinyxml -lmicrohttpd -lsmbclient -lpython2.7 -lcrypto -lgcrypt -lavdevice -lavfilter -lavcodec -lavformat -lpostproc -lavutil -lswresample -lswscale -ltag -L$XBMC_DEPENDS/lib/mysql -lmysqlclient -lxml2 -lxslt -lnettle -lgmp -lhogweed -lgnutls -lcrossguid -lz -lm -liconv
 
 CLANG_CXX_LANGUAGE_STANDARD = c++0x
 CLANG_CXX_LIBRARY = libc++
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
index a47d19bb1f..6029f4c11f 100644
--- a/tools/depends/target/Makefile
+++ b/tools/depends/target/Makefile
@@ -9,7 +9,7 @@ DEPENDS = \
 	libgcrypt bzip2 liblzo2 libzip freetype2 fontconfig \
 	openssl gmp nettle gnutls curl \
 	libjpeg-turbo libpng fribidi libass \
-	libxml2 yajl libmicrohttpd mysql libffi \
+	libxml2 rapidjson libmicrohttpd mysql libffi \
 	python27 libshairplay libfmt \
 	libplist libcec libbluray tinyxml dummy-libxbmc \
 	libssh taglib libusb libnfs \
diff --git a/tools/depends/target/rapidjson/0001-remove_custom_cxx_flags.patch b/tools/depends/target/rapidjson/0001-remove_custom_cxx_flags.patch
new file mode 100644
index 0000000000..d15e861917
--- /dev/null
+++ b/tools/depends/target/rapidjson/0001-remove_custom_cxx_flags.patch
@@ -0,0 +1,18 @@
+diff -rupN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2015-09-10 18:33:21.048580591 +0200
++++ b/CMakeLists.txt	2015-09-10 18:34:19.136579486 +0200
+@@ -25,14 +25,6 @@ if(RAPIDJSON_HAS_STDSTRING)
+     add_definitions(-DRAPIDJSON_HAS_STDSTRING)
+ endif()
+ 
+-if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
+-elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=native -Wall -Wextra")
+-elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
+-    add_definitions(-D_CRT_SECURE_NO_WARNINGS=1)
+-endif()
+-
+ #add extra search paths for libraries and includes
+ SET(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in")
+ SET(LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE STRING "Directory where lib will install")
diff --git a/tools/depends/target/rapidjson/Makefile b/tools/depends/target/rapidjson/Makefile
new file mode 100644
index 0000000000..f97156ffb0
--- /dev/null
+++ b/tools/depends/target/rapidjson/Makefile
@@ -0,0 +1,59 @@
+include ../../Makefile.include
+DEPS = Makefile 0001-remove_custom_cxx_flags.patch
+
+# lib name, version
+LIBNAME=rapidjson
+VERSION=1.0.2
+SOURCE=$(LIBNAME)-$(VERSION)
+ARCHIVE=$(SOURCE).tar.gz
+
+CMAKE_OPTIONS=-DRAPIDJSON_HAS_STDSTRING=ON -DRAPIDJSON_BUILD_DOC=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF -DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_THIRDPARTY_GTEST=OFF
+
+ifeq ($(CROSS_COMPILING), yes)
+  DEPS += ../../Makefile.include
+else
+  CXXFLAGS += -std=c++11
+  ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+
+  ifeq ($(PLATFORM),)
+    PLATFORM = native
+    TARBALLS_LOCATION = $(ROOT_DIR)
+    BASE_URL := http://mirrors.kodi.tv/build-deps/sources
+    RETRIEVE_TOOL := curl
+    RETRIEVE_TOOL_FLAGS := -Ls --create-dirs -f -O
+    ARCHIVE_TOOL := tar
+    ARCHIVE_TOOL_FLAGS := --strip-components=1 -xf
+    CMAKE := cmake
+    CMAKE_OPTIONS := -DCMAKE_INSTALL_PREFIX=$(PREFIX) $(CMAKE_OPTIONS)
+  endif
+endif
+
+all: .installed-$(PLATFORM)
+
+$(TARBALLS_LOCATION)/$(ARCHIVE):
+	cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
+
+$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
+ifeq ($(PREFIX),)
+	@echo
+	@echo "ERROR: please set PREFIX to the kodi install path e.g. make PREFIX=/usr/local"
+	@exit 1
+endif
+	rm -rf $(PLATFORM); mkdir -p $(PLATFORM)
+	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
+	cd $(PLATFORM); rm -rf build; mkdir -p build
+	cd $(PLATFORM); patch -p1 < ../0001-remove_custom_cxx_flags.patch
+	cd $(PLATFORM)/build; $(CMAKE) $(CMAKE_OPTIONS) ..
+
+.installed-$(PLATFORM): $(PLATFORM)
+	make -C $(PLATFORM)/build
+	make -C $(PLATFORM)/build install
+	rm -rf $(PREFIX)/share/doc/RapidJSON
+	touch $@
+
+clean:
+	$(MAKE) -C $(PLATFORM)/build clean
+	rm -f .installed-$(PLATFORM)
+
+distclean:
+	rm -rf $(PLATFORM) .installed-$(PLATFORM)
diff --git a/tools/depends/target/yajl/Makefile b/tools/depends/target/yajl/Makefile
deleted file mode 100644
index caf87843d0..0000000000
--- a/tools/depends/target/yajl/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-include ../../Makefile.include
-DEPS= ../../Makefile.include Makefile static.patch
-
-# lib name, version
-LIBNAME=yajl
-VERSION=2.0.1
-SOURCE=lloyd-$(LIBNAME)-f4b2b1a
-ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
-# configuration settings
-LIBDYLIB=$(PLATFORM)/build/$(LIBNAME)-$(VERSION)/lib/libyajl.a
-
-CLEAN_FILES=$(ARCHIVE) $(PLATFORM)
-
-all: .installed-$(PLATFORM)
-
-$(TARBALLS_LOCATION)/$(ARCHIVE):
-	cd $(TARBALLS_LOCATION); $(RETRIEVE_TOOL) $(RETRIEVE_TOOL_FLAGS) $(BASE_URL)/$(ARCHIVE)
-
-$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE) $(DEPS)
-	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
-	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	sed -ie "s|ADD_CUSTOM_TARGET|#ADD_CUSTOM_TARGET|g" "$(PLATFORM)/CMakeLists.txt"
-	sed -ie "s|./run_tests.sh|#./run_tests.sh|g" "$(PLATFORM)/CMakeLists.txt"
-	sed -ie "s|WORKING_DIRECTORY|#WORKING_DIRECTORY|g" "$(PLATFORM)/CMakeLists.txt"
-	sed -ie "s|ADD_SUBDIRECTORY(reformatter)|#ADD_SUBDIRECTORY(reformatter)|g" "$(PLATFORM)/CMakeLists.txt"
-	cd $(PLATFORM); patch -p0 < ../static.patch
-	cd $(PLATFORM); patch -p0 < ../shared.patch
-	cd $(PLATFORM); rm -rf build; mkdir -p build
-	cd $(PLATFORM)/build; $(CMAKE) ..
-
-$(LIBDYLIB): $(PLATFORM)
-	$(MAKE) -C $(PLATFORM)/build
-
-.installed-$(PLATFORM): $(LIBDYLIB)
-	$(MAKE) -C $(PLATFORM)/build install
-	touch $@
-
-clean:
-	$(MAKE) -C $(PLATFORM)/build clean
-	rm -f .installed-$(PLATFORM)
-
-distclean::
-	rm -rf $(PLATFORM) .installed-$(PLATFORM)
diff --git a/tools/depends/target/yajl/shared.patch b/tools/depends/target/yajl/shared.patch
deleted file mode 100644
index 13ea0c7464..0000000000
--- a/tools/depends/target/yajl/shared.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/CMakeLists.txt.orig	2012-06-22 21:09:34.000000000 +0200
-+++ src/CMakeLists.txt	2012-06-22 21:11:49.000000000 +0200
-@@ -40,6 +40,8 @@
- 
- TARGET_LINK_LIBRARIES(yajl_s m) 
- 
-+TARGET_LINK_LIBRARIES(yajl m) 
-+
- #### setup shared library version number
- SET_TARGET_PROPERTIES(yajl PROPERTIES
-                       DEFINE_SYMBOL YAJL_SHARED
-@@ -79,7 +79,7 @@
- IF(NOT WIN32)
-   # at build time you may specify the cmake variable LIB_SUFFIX to handle
-   # 64-bit systems which use 'lib64'
--  INSTALL(TARGETS yajl LIBRARY DESTINATION lib${LIB_SUFFIX})
-+#  INSTALL(TARGETS yajl LIBRARY DESTINATION lib${LIB_SUFFIX})
-   INSTALL(TARGETS yajl_s ARCHIVE DESTINATION lib${LIB_SUFFIX})
-   INSTALL(FILES ${PUB_HDRS} DESTINATION include/yajl)
-   INSTALL(FILES ${incDir}/yajl_version.h DESTINATION include/yajl)
diff --git a/tools/depends/target/yajl/static.patch b/tools/depends/target/yajl/static.patch
deleted file mode 100644
index ca1a9433ef..0000000000
--- a/tools/depends/target/yajl/static.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/CMakeLists.txt.orig	2011-04-28 04:48:41.000000000 +0200
-+++ src/CMakeLists.txt	2012-06-22 21:07:59.000000000 +0200
-@@ -38,12 +38,16 @@
- 
- ADD_LIBRARY(yajl SHARED ${SRCS} ${HDRS} ${PUB_HDRS})
- 
-+TARGET_LINK_LIBRARIES(yajl_s m) 
-+
- #### setup shared library version number
- SET_TARGET_PROPERTIES(yajl PROPERTIES
-                       DEFINE_SYMBOL YAJL_SHARED
-                       SOVERSION ${YAJL_MAJOR}
-                       VERSION ${YAJL_MAJOR}.${YAJL_MINOR}.${YAJL_MICRO})
- 
-+SET_TARGET_PROPERTIES(yajl_s PROPERTIES OUTPUT_NAME yajl) 
-+
- #### ensure a .dylib has correct absolute installation paths upon installation
- IF(APPLE)
-   MESSAGE("INSTALL_NAME_DIR: ${CMAKE_INSTALL_PREFIX}/lib")