vlc | branch: master | Jean-Baptiste Kempf <j...@videolan.org> | Fri May 18 18:03:21 2018 +0200| [f683a4430647564aac0a9517ba3110570dab0c9c] | committer: Jean-Baptiste Kempf
contrib: harfbuzz: force freetype detection with Cmake Remove outdated conf and fix upstream linking for tests > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f683a4430647564aac0a9517ba3110570dab0c9c --- contrib/src/harfbuzz/Cmake-test.patch | 11 +++++++++++ contrib/src/harfbuzz/rules.mak | 5 ++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/contrib/src/harfbuzz/Cmake-test.patch b/contrib/src/harfbuzz/Cmake-test.patch new file mode 100644 index 0000000000..e9bda83b5c --- /dev/null +++ b/contrib/src/harfbuzz/Cmake-test.patch @@ -0,0 +1,11 @@ +--- harfbuzz/CMakeLists.txt.old 2018-02-28 22:59:53.000000000 +0100 ++++ harfbuzz/CMakeLists.txt 2018-05-18 18:00:47.589767685 +0200 +@@ -272,7 +272,7 @@ + message(FATAL_ERROR "HB_HAVE_FREETYPE was set, but we failed to find it. Maybe add a CMAKE_PREFIX_PATH= to your Freetype2 install prefix") + endif () + +- list(APPEND THIRD_PARTY_LIBS ${FREETYPE_LIBRARIES}) ++ list(APPEND THIRD_PARTY_LIBS ${FREETYPE_LIBRARIES} -lz) + include_directories(AFTER ${FREETYPE_INCLUDE_DIRS}) + add_definitions(-DHAVE_FREETYPE=1) + diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak index 3ccdcc7ca5..294deb2ca9 100644 --- a/contrib/src/harfbuzz/rules.mak +++ b/contrib/src/harfbuzz/rules.mak @@ -7,8 +7,6 @@ ifeq ($(call need_pkg,"harfbuzz"),) PKGS_FOUND += harfbuzz endif -HARFBUZZCONF = --with-icu=no --with-glib=no --with-fontconfig=no - ifdef HAVE_DARWIN_OS HARFBUZZCONF += --with-coretext=yes endif @@ -22,13 +20,14 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz $(UNPACK) $(APPLY) $(SRC)/harfbuzz/harfbuzz-aarch64.patch $(APPLY) $(SRC)/harfbuzz/harfbuzz-clang.patch + $(APPLY) $(SRC)/harfbuzz/Cmake-test.patch $(MOVE) DEPS_harfbuzz = freetype2 $(DEPS_freetype2) .harfbuzz: harfbuzz toolchain.cmake cd $< && mkdir -p build && cd build && $(HOSTVARS_PIC) $(CMAKE) \ - -DBUILD_SHARED_LIBS:BOOL=OFF \ + -DBUILD_SHARED_LIBS:BOOL=OFF -DHB_HAVE_FREETYPE:BOOL=ON \ .. && $(MAKE) cd $< && cd build && $(MAKE) install touch $@ _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits
