vlc | branch: master | Steve Lhomme <rob...@ycbcr.xyz> | Thu May 24 15:17:02 2018 +0200| [b9341db73d42ef8773a545d5e946c9cfe067537e] | committer: Steve Lhomme
contrib: harfbuzz: don't build tests on winstore builds it tries to link with .lib files > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b9341db73d42ef8773a545d5e946c9cfe067537e --- contrib/src/harfbuzz/harfbuzz-no-tests.patch | 18 ++++++++++++++++++ contrib/src/harfbuzz/rules.mak | 1 + 2 files changed, 19 insertions(+) diff --git a/contrib/src/harfbuzz/harfbuzz-no-tests.patch b/contrib/src/harfbuzz/harfbuzz-no-tests.patch new file mode 100644 index 0000000000..5ba52030da --- /dev/null +++ b/contrib/src/harfbuzz/harfbuzz-no-tests.patch @@ -0,0 +1,18 @@ +--- harfbuzz/CMakeLists.txt.notests 2018-05-24 15:14:05.682443200 +0200 ++++ harfbuzz/CMakeLists.txt 2018-05-24 15:14:17.437916300 +0200 +@@ -808,6 +808,7 @@ endif () + + + ## src/ executables ++if(NOT WIN32 OR NOT ${CMAKE_SYSTEM_NAME} MATCHES "WindowsStore") + foreach (prog main test test-would-substitute test-size-params test-buffer-serialize hb-ot-tag test-unicode-ranges) + set (prog_name ${prog}) + if (${prog_name} STREQUAL "test") +@@ -818,6 +819,7 @@ foreach (prog main test test-would-subst + target_link_libraries(${prog_name} harfbuzz ${THIRD_PARTY_LIBS}) + endforeach () + set_target_properties(hb-ot-tag PROPERTIES COMPILE_FLAGS "-DMAIN") ++endif() + + ## Tests + if (UNIX OR MINGW) diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak index 259df80c86..c9c3d4ae2e 100644 --- a/contrib/src/harfbuzz/rules.mak +++ b/contrib/src/harfbuzz/rules.mak @@ -22,6 +22,7 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz $(APPLY) $(SRC)/harfbuzz/harfbuzz-clang.patch $(APPLY) $(SRC)/harfbuzz/0001-Skip-using-the-_BitScan-intrinsics-on-mingw.patch $(APPLY) $(SRC)/harfbuzz/harfbuzz-fix-freetype-detect.patch + $(APPLY) $(SRC)/harfbuzz/harfbuzz-no-tests.patch $(MOVE) DEPS_harfbuzz = freetype2 $(DEPS_freetype2) _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits