[vlc-commits] Contribs: update harfbuzz to 1.4.5

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Apr  8 11:59:03 2017 +0200| [fc9ba60b4a4be95d2a539f1a7b629dbb4785e46c] | committer: Jean-Baptiste Kempf

Contribs: update harfbuzz to 1.4.5

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

 contrib/src/harfbuzz/SHA512SUMS              |  2 +-
 contrib/src/harfbuzz/harfbuzz-coretext.patch | 32 ----------------------------
 contrib/src/harfbuzz/rules.mak               |  3 +--
 3 files changed, 2 insertions(+), 35 deletions(-)

diff --git a/contrib/src/harfbuzz/SHA512SUMS b/contrib/src/harfbuzz/SHA512SUMS
index 9cc4319..54b8d1e 100644
--- a/contrib/src/harfbuzz/SHA512SUMS
+++ b/contrib/src/harfbuzz/SHA512SUMS
@@ -1 +1 @@
-6a5b917e47233eebd8ecb36f24b4eb189c3bacc920b7ca8f8f1bc1036fedaba0b415727a4cc2836956eea48e8dabc63b117789331a9b27201731ab99bf0c2399  harfbuzz-1.3.0.tar.bz2
+dd505ef950ef1d702a820987d8e93097e4c4fd9f725d18e69dd756ea21d4d5624eb2edfc8563f89947e3913bf5efa1834092e06ea02821744b0b588ce2ceb00e  harfbuzz-1.4.5.tar.bz2
diff --git a/contrib/src/harfbuzz/harfbuzz-coretext.patch b/contrib/src/harfbuzz/harfbuzz-coretext.patch
deleted file mode 100644
index 30205d7..0000000
--- a/contrib/src/harfbuzz/harfbuzz-coretext.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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 d247782..9eea552 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -1,6 +1,6 @@
 # HARFBUZZ
 
-HARFBUZZ_VERSION := 1.3.0
+HARFBUZZ_VERSION := 1.4.5
 HARFBUZZ_URL := http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$(HARFBUZZ_VERSION).tar.bz2
 PKGS += harfbuzz
 ifeq ($(call need_pkg,"harfbuzz"),)
@@ -23,7 +23,6 @@ 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)