vlc/vlc-3.0 | branch: master | Jean-Baptiste Kempf <j...@videolan.org> | Thu 
May 17 17:39:59 2018 +0200| [57fe99e54bdcee13ea9df05d1556d28076b0ff10] | 
committer: Jean-Baptiste Kempf

Contribs: update harfbuzz to 1.7.6

(cherry picked from commit 21d314b28aadc092053aa9ee2897d7cd94bce80d)
Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org>

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

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

diff --git a/contrib/src/harfbuzz/SHA512SUMS b/contrib/src/harfbuzz/SHA512SUMS
index 01a2b1360f..162222ee3e 100644
--- a/contrib/src/harfbuzz/SHA512SUMS
+++ b/contrib/src/harfbuzz/SHA512SUMS
@@ -1 +1 @@
-d5343822f2e7ed33b34f0ecb470d219be161ebb4d2349833a8fcd909cec18a97aed6ca51a97fd73407d5d70ebfc61cafb71bd13ce96c9a278c720681a04f47df
  harfbuzz-1.7.4.tar.bz2
+259656574b1ec2916ada951b759a591f45c11c5c639fa29831e06320312bf951f4f5ef6306f9ffc373abf0d40dbf944db918d4c54aca3bd7eab2c3a886db7a68
  harfbuzz-1.7.6.tar.bz2
diff --git a/contrib/src/harfbuzz/harfbuzz-coretext.patch 
b/contrib/src/harfbuzz/harfbuzz-coretext.patch
deleted file mode 100644
index 15b39c4789..0000000000
--- a/contrib/src/harfbuzz/harfbuzz-coretext.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ru harfbuzz/configure.ac harfbuzz/configure.ac
---- harfbuzz/configure.ac      2017-04-11 19:36:57.000000000 +0200
-+++ harfbuzz/configure.ac      2017-04-12 10:05:34.000000000 +0200
-@@ -419,7 +419,7 @@
- 
-               if $have_coretext; then
-                       CORETEXT_CFLAGS=
--                      CORETEXT_LIBS="-framework CoreText -framework 
CoreGraphics"
-+                      CORETEXT_LIBS="-framework CoreText -framework 
CoreGraphics -framework CoreFoundation"
-                       AC_SUBST(CORETEXT_CFLAGS)
-                       AC_SUBST(CORETEXT_LIBS)
-               fi
\ No newline at end of file
diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index 2677dfc7cc..a7ffab6442 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -1,6 +1,6 @@
 # HARFBUZZ
 
-HARFBUZZ_VERSION := 1.7.4
+HARFBUZZ_VERSION := 1.7.6
 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)

_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to