[vlc-commits] Contrib: Disable HarfBuzz non-native backends

[Jean-Baptiste Kempf]

vlc/vlc-2.2 | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Fri Dec 19 13:22:55 2014 +0100| [a44d02c500606c956f6b9bc39e496dad7b920db4] | committer: Jean-Baptiste Kempf

Contrib: Disable HarfBuzz non-native backends

(cherry picked from commit 93b2b55f562f38342ceb489ceb560d0d5a584254)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 contrib/src/harfbuzz/disable-backends.patch |   27 +++++++++++++++++++++++++++
 contrib/src/harfbuzz/rules.mak              |    1 +
 2 files changed, 28 insertions(+)

diff --git a/contrib/src/harfbuzz/disable-backends.patch b/contrib/src/harfbuzz/disable-backends.patch
new file mode 100644
index 0000000..7cd27c0
--- /dev/null
+++ b/contrib/src/harfbuzz/disable-backends.patch
@@ -0,0 +1,27 @@
+--- harfbuzz-0.9.17/configure.ac.orig	2014-12-22 10:10:36.334227291 +0100
++++ harfbuzz-0.9.17/configure.ac	2014-12-22 10:13:55.664060127 +0100
+@@ -113,7 +113,7 @@
+ 
+ dnl ===========================================================================
+ 
+-have_hb_old=true
++have_hb_old=false
+ if $have_hb_old; then
+ 	AC_DEFINE(HAVE_HB_OLD, 1, [Have Old HarfBuzz backend])
+ fi
+@@ -249,6 +249,7 @@
+ 	[have_uniscribe=true; AC_MSG_RESULT(yes)],
+ 	[have_uniscribe=false;AC_MSG_RESULT(no)])
+ LIBS=$saved_LIBS
++have_uniscribe=false
+ if $have_uniscribe; then
+ 	UNISCRIBE_CFLAGS=
+ 	UNISCRIBE_LIBS="-lusp10 -lgdi32"
+@@ -261,6 +262,7 @@
+ dnl ===========================================================================
+ 
+ AC_CHECK_TYPE(CTFontRef, have_coretext=true, have_coretext=false, [#include <ApplicationServices/ApplicationServices.h>])
++have_coretext=false
+ if $have_coretext; then
+ 	CORETEXT_CFLAGS=
+ 	CORETEXT_LIBS="-framework ApplicationServices"
diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index e9ea233..27149d4 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -17,6 +17,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/disable-backends.patch
 	$(MOVE)
 
 DEPS_harfbuzz = freetype2 $(DEPS_freetype2)