Commit f1e4707b authored by Thomas Guillem's avatar Thomas Guillem

build: update TESTED_HASH

parent a6b0279b
From 6742c1e3dce9bfbbf86bf0537bfe69a316c78287 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Sat, 26 May 2018 17:55:32 +0200
Subject: [PATCH 17/18] contrib/harfbuzz: fix CoreText detection and linking
---
.../harfbuzz-fix-coretext-detection.patch | 51 +++++++++++++++++++
contrib/src/harfbuzz/rules.mak | 5 +-
2 files changed, 52 insertions(+), 4 deletions(-)
create mode 100644 contrib/src/harfbuzz/harfbuzz-fix-coretext-detection.patch
diff --git a/contrib/src/harfbuzz/harfbuzz-fix-coretext-detection.patch b/contrib/src/harfbuzz/harfbuzz-fix-coretext-detection.patch
new file mode 100644
index 0000000000..977600c5ed
--- /dev/null
+++ b/contrib/src/harfbuzz/harfbuzz-fix-coretext-detection.patch
@@ -0,0 +1,51 @@
+diff -ru harfbuzz/CMakeLists.txt harfbuzz/CMakeLists.txt
+--- harfbuzz/CMakeLists.txt 2018-05-26 17:51:35.000000000 +0200
++++ harfbuzz/CMakeLists.txt 2018-05-26 17:47:57.000000000 +0200
+@@ -364,16 +364,41 @@
+ if (APPLE AND HB_HAVE_CORETEXT)
+ # Apple Advanced Typography
+ add_definitions(-DHAVE_CORETEXT)
++
++ set(CMAKE_FIND_ROOT_PATH ${CMAKE_IOS_DEVELOPER_ROOT} ${CMAKE_OSX_SYSROOT}
++ ${CMAKE_PREFIX_PATH} CACHE string "appleOS find search path root" FORCE)
++ # Default to searching for frameworks first.
++ set(CMAKE_FIND_FRAMEWORK FIRST)
++ # Set up the default search directories for frameworks.
++ set(CMAKE_SYSTEM_FRAMEWORK_PATH
++ ${CMAKE_OSX_SYSROOT}/System/Library/Frameworks
++ ${CMAKE_OSX_SYSROOT}/System/Library/PrivateFrameworks
++ ${CMAKE_OSX_SYSROOT}/Developer/Library/Frameworks)
++ # Only search the specified iOS SDK, not the remainder of the host filesystem.
++ set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
++ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
++ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
+
+ list(APPEND project_sources ${PROJECT_SOURCE_DIR}/src/hb-coretext.cc)
+ list(APPEND project_headers ${PROJECT_SOURCE_DIR}/src/hb-coretext.h)
+
+- find_library(APPLICATION_SERVICES_FRAMEWORK ApplicationServices)
+- if (APPLICATION_SERVICES_FRAMEWORK)
+- list(APPEND THIRD_PARTY_LIBS ${APPLICATION_SERVICES_FRAMEWORK})
+- endif (APPLICATION_SERVICES_FRAMEWORK)
+-
+- mark_as_advanced(APPLICATION_SERVICES_FRAMEWORK)
++ find_library(CORETEXT_FRAMEWORK CoreText)
++ if (CORETEXT_FRAMEWORK)
++ list(APPEND THIRD_PARTY_LIBS ${CORETEXT_FRAMEWORK})
++ endif (CORETEXT_FRAMEWORK)
++ mark_as_advanced(CORETEXT_FRAMEWORK)
++
++ find_library(COREFOUNDATION_FRAMEWORK CoreFoundation)
++ if (COREFOUNDATION_FRAMEWORK)
++ list(APPEND THIRD_PARTY_LIBS ${COREFOUNDATION_FRAMEWORK})
++ endif (COREFOUNDATION_FRAMEWORK)
++ mark_as_advanced(COREFOUNDATION_FRAMEWORK)
++
++ find_library(COREGRAPHICS_FRAMEWORK CoreGraphics)
++ if (COREGRAPHICS_FRAMEWORK)
++ list(APPEND THIRD_PARTY_LIBS ${COREGRAPHICS_FRAMEWORK})
++ endif (COREGRAPHICS_FRAMEWORK)
++ mark_as_advanced(COREGRAPHICS_FRAMEWORK)
+ endif ()
+
+ if (WIN32 AND HB_HAVE_UNISCRIBE)
diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index 473d0ac617..c65b8d1172 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -7,10 +7,6 @@ ifeq ($(call need_pkg,"harfbuzz"),)
PKGS_FOUND += harfbuzz
endif
-ifdef HAVE_DARWIN_OS
-HARFBUZZCONF += --with-coretext=yes
-endif
-
$(TARBALLS)/harfbuzz-$(HARFBUZZ_VERSION).tar.bz2:
$(call download_pkg,$(HARFBUZZ_URL),harfbuzz)
@@ -21,6 +17,7 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
$(APPLY) $(SRC)/harfbuzz/harfbuzz-aarch64.patch
$(APPLY) $(SRC)/harfbuzz/harfbuzz-clang.patch
$(APPLY) $(SRC)/harfbuzz/harfbuzz-fix-freetype-detect.patch
+ $(APPLY) $(SRC)/harfbuzz/harfbuzz-fix-coretext-detection.patch
$(MOVE)
DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
--
2.17.0
From f217c89ace131d33c5ebd64c046de35cf7584f52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Paul=20K=C3=BChne?= <felix@feepk.net>
Date: Sat, 26 May 2018 18:22:54 +0200
Subject: [PATCH 18/18] contrib: escape DarwinOS compilation flags to fix
installations with cmake
---
contrib/src/main.mak | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
index f43bf03d70..6c3b02d0d6 100644
--- a/contrib/src/main.mak
+++ b/contrib/src/main.mak
@@ -472,9 +472,9 @@ endif
endif
ifdef HAVE_DARWIN_OS
echo "set(CMAKE_SYSTEM_NAME Darwin)" >> $@
- echo "set(CMAKE_C_FLAGS $(CFLAGS) $(EXTRA_CFLAGS))" >> $@
- echo "set(CMAKE_CXX_FLAGS $(CFLAGS) $(EXTRA_CXXFLAGS))" >> $@
- echo "set(CMAKE_LD_FLAGS $(LDFLAGS))" >> $@
+ echo "set(CMAKE_C_FLAGS \"$(CFLAGS) $(EXTRA_CFLAGS)\")" >> $@
+ echo "set(CMAKE_CXX_FLAGS \"$(CFLAGS) $(EXTRA_CXXFLAGS)\")" >> $@
+ echo "set(CMAKE_LD_FLAGS \"$(LDFLAGS)\")" >> $@
echo "set(CMAKE_AR ar CACHE FILEPATH "Archiver")" >> $@
ifdef HAVE_IOS
echo "set(CMAKE_OSX_SYSROOT $(IOS_SDK))" >> $@
--
2.17.0
......@@ -25,7 +25,7 @@ OSVERSIONMINLDFLAG=ios_version_min
ROOT_DIR=empty
FARCH="all"
TESTEDHASH="a4d6277" # libvlc hash that this version of VLCKit is build on
TESTEDHASH="1d2d23e" # libvlc hash that this version of VLCKit is build on
if [ -z "$MAKE_JOBS" ]; then
CORE_COUNT=`sysctl -n machdep.cpu.core_count`
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment