[vlc-commits] contrib/harfbuzz: modernize discovery of the CoreText framework

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat Aug 13 14:42:21 2016 +0200| [e3ba1d8b2f2e91b694de8b95cc5203ac4f8f16f3] | committer: Felix Paul Kühne

contrib/harfbuzz: modernize discovery of the CoreText framework

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e3ba1d8b2f2e91b694de8b95cc5203ac4f8f16f3
---

 contrib/src/harfbuzz/harfbuzz-coretext.patch | 32 ++++++++++++++++++++++++++++
 contrib/src/harfbuzz/rules.mak               |  1 +
 2 files changed, 33 insertions(+)

diff --git a/contrib/src/harfbuzz/harfbuzz-coretext.patch b/contrib/src/harfbuzz/harfbuzz-coretext.patch
new file mode 100644
index 0000000..30205d7
--- /dev/null
+++ b/contrib/src/harfbuzz/harfbuzz-coretext.patch
@@ -0,0 +1,32 @@
+diff -ru harfbuzz/configure.ac harfbuzz/configure.ac
+--- harfbuzz/configure.ac	2016-08-13 14:38:34.000000000 +0200
++++ harfbuzz/configure.ac	2016-08-13 14:39:02.000000000 +0200
+@@ -383,25 +383,13 @@
+ 	[with_coretext=no])
+ have_coretext=false
+ if test "x$with_coretext" = "xyes" -o "x$with_coretext" = "xauto"; then
+-	AC_CHECK_TYPE(CTFontRef, have_coretext=true,, [#include <ApplicationServices/ApplicationServices.h>])
++	AC_CHECK_TYPE(CTFontRef, have_coretext=true,, [#include <CoreText/CoreText.h>])
+ 
+ 	if $have_coretext; then
+-		CORETEXT_CFLAGS=
+-		CORETEXT_LIBS="-framework ApplicationServices"
++    	CORETEXT_CFLAGS=
++		CORETEXT_LIBS="-framework CoreText -framework CoreGraphics -framework CoreFoundation"
+ 		AC_SUBST(CORETEXT_CFLAGS)
+ 		AC_SUBST(CORETEXT_LIBS)
+-	else
+-		# On iOS CoreText and CoreGraphics are stand-alone frameworks
+-		if test "x$have_coretext" != "xtrue"; then
+-			AC_CHECK_TYPE(CTFontRef, have_coretext=true,, [#include <CoreText/CoreText.h>])
+-		fi
+-
+-		if $have_coretext; then
+-			CORETEXT_CFLAGS=
+-			CORETEXT_LIBS="-framework CoreText -framework CoreGraphics"
+-			AC_SUBST(CORETEXT_CFLAGS)
+-			AC_SUBST(CORETEXT_LIBS)
+-		fi
+ 	fi
+ fi
+ if test "x$with_coretext" = "xyes" -a "x$have_coretext" != "xtrue"; then
diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index 1129e82..d247782 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -23,6 +23,7 @@ harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
 	$(UPDATE_AUTOCONFIG)
 	$(APPLY) $(SRC)/harfbuzz/harfbuzz-aarch64.patch
 	$(APPLY) $(SRC)/harfbuzz/harfbuzz-clang.patch
+	$(APPLY) $(SRC)/harfbuzz/harfbuzz-coretext.patch
 	$(MOVE)
 
 DEPS_harfbuzz = freetype2 $(DEPS_freetype2)