[vlc-devel] [PATCH] contrib: harfbuzz: disable non-native backends

[Grigori Goronzy]

From: Grigori Goronzy <greg at blackbox>

Disable Uniscribe, CoreText and hb-old backends. They're not required
anymore due to inclusion of UCDN.
---
 contrib/src/harfbuzz/disable-backends.patch | 29 +++++++++++++++++++++++++++++
 contrib/src/harfbuzz/harfbuzz-osx.patch     |  9 ---------
 contrib/src/harfbuzz/rules.mak              |  8 ++------
 contrib/src/harfbuzz/win32.patch            |  9 ---------
 4 files changed, 31 insertions(+), 24 deletions(-)
 create mode 100644 contrib/src/harfbuzz/disable-backends.patch
 delete mode 100644 contrib/src/harfbuzz/harfbuzz-osx.patch
 delete mode 100644 contrib/src/harfbuzz/win32.patch

diff --git a/contrib/src/harfbuzz/disable-backends.patch b/contrib/src/harfbuzz/disable-backends.patch
new file mode 100644
index 0000000..69ba6b7
--- /dev/null
+++ b/contrib/src/harfbuzz/disable-backends.patch
@@ -0,0 +1,29 @@
+--- harfbuzz-0.9.5/configure.ac.orig	2012-10-18 15:58:56.940962618 +0200
++++ harfbuzz-0.9.5/configure.ac	2012-10-18 15:59:24.348963620 +0200
+@@ -117,7 +117,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
+@@ -208,7 +208,7 @@
+ 
+ dnl ===========================================================================
+ 
+-AC_CHECK_HEADERS(usp10.h windows.h, have_uniscribe=true, have_uniscribe=false)
++have_uniscribe=false
+ if $have_uniscribe; then
+ 	UNISCRIBE_CFLAGS=
+ 	UNISCRIBE_LIBS="-lusp10 -lgdi32"
+@@ -220,7 +220,7 @@
+ 
+ dnl ===========================================================================
+ 
+-AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, have_coretext=true, have_coretext=false)
++have_coretext=false
+ if $have_coretext; then
+ 	CORETEXT_CFLAGS=
+ 	CORETEXT_LIBS="-framework ApplicationServices"
diff --git a/contrib/src/harfbuzz/harfbuzz-osx.patch b/contrib/src/harfbuzz/harfbuzz-osx.patch
deleted file mode 100644
index af7c983..0000000
--- a/contrib/src/harfbuzz/harfbuzz-osx.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- harfbuzz-0.9.2/harfbuzz.pc.in.orig	2012-08-12 12:05:38.000000000 +0900
-+++ harfbuzz-0.9.2/harfbuzz.pc.in	2012-08-12 12:15:08.000000000 +0900
-@@ -7,5 +7,5 @@
- Description: Text shaping library
- Version: @VERSION@
- 
--Libs: -L${libdir} -lharfbuzz
-+Libs: -L${libdir} -Wl,-framework,ApplicationServices -lharfbuzz
- Cflags: -I${includedir}/harfbuzz
diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index ea39e4b..6761857 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -14,12 +14,7 @@ $(TARBALLS)/harfbuzz-$(HARFBUZZ_VERSION).tar.bz2:
 
 harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
 	$(UNPACK)
-ifdef HAVE_WIN32
-	$(APPLY) $(SRC)/harfbuzz/win32.patch
-endif
-ifdef HAVE_MACOSX
-	$(APPLY) $(SRC)/harfbuzz/harfbuzz-osx.patch
-endif
+	$(APPLY) $(SRC)/harfbuzz/disable-backends.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)
 
@@ -28,6 +23,7 @@ DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
 HARFBUZZ_CONF=
 
 .harfbuzz: harfbuzz
+	cd $< && env NOCONFIGURE=1 sh autogen.sh
 	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS)" ./configure $(HOSTCONF) $(HARFBUZZ_CONF)
 	cd $< && $(MAKE) install
 	touch $@
diff --git a/contrib/src/harfbuzz/win32.patch b/contrib/src/harfbuzz/win32.patch
deleted file mode 100644
index 4b49fc4..0000000
--- a/contrib/src/harfbuzz/win32.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- harfbuzz/harfbuzz.pc.in.orig	2012-09-13 16:21:46.883843416 +0200
-+++ harfbuzz/harfbuzz.pc.in	2012-09-13 16:21:54.771843345 +0200
-@@ -7,5 +7,5 @@
- Description: Text shaping library
- Version: @VERSION@
- 
--Libs: -L${libdir} -lharfbuzz
-+Libs: -L${libdir} -lharfbuzz -lusp10 -lgdi32
- Cflags: -I${includedir}/harfbuzz
-- 
1.7.11.3