[vlc-devel] [PATCH 2/3] contrib: added HarfBuzz 0.9.2

[Naohiro KORIYAMA]

To support complex scripts (e.g. Thai) in libass, HarfBuzz support is required.
---
 contrib/src/harfbuzz/SHA512SUMS         |  1 +
 contrib/src/harfbuzz/harfbuzz-osx.patch | 20 ++++++++++++++++++++
 contrib/src/harfbuzz/rules.mak          | 33 +++++++++++++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100644 contrib/src/harfbuzz/SHA512SUMS
 create mode 100644 contrib/src/harfbuzz/harfbuzz-osx.patch
 create mode 100644 contrib/src/harfbuzz/rules.mak

diff --git a/contrib/src/harfbuzz/SHA512SUMS b/contrib/src/harfbuzz/SHA512SUMS
new file mode 100644
index 0000000..69f5e25
--- /dev/null
+++ b/contrib/src/harfbuzz/SHA512SUMS
@@ -0,0 +1 @@
+6b3d313287e4b9baba864bcdd2e29d20b4c0573b4b538a2979d53996406bfbb819b13e7fd87b9d3918c055134377f6d9abd2fec7ce3b566869ecd56ca04c87b7  harfbuzz-0.9.2.tar.bz2
diff --git a/contrib/src/harfbuzz/harfbuzz-osx.patch b/contrib/src/harfbuzz/harfbuzz-osx.patch
new file mode 100644
index 0000000..fa8e216
--- /dev/null
+++ b/contrib/src/harfbuzz/harfbuzz-osx.patch
@@ -0,0 +1,20 @@
+--- harfbuzz-0.9.2/configure.ac.orig	2012-08-04 23:49:48.000000000 +0900
++++ harfbuzz-0.9.0/configure.ac	2012-08-05 00:46:52.000000000 +0900
+@@ -197,7 +197,7 @@
+ AC_CHECK_HEADERS(ApplicationServices/ApplicationServices.h, have_coretext=true, have_coretext=false)
+ if $have_coretext; then
+ 	CORETEXT_CFLAGS=
+-	CORETEXT_LIBS=
++	CORETEXT_LIBS="-Wl,-framework,ApplicationServices"
+ 	AC_SUBST(CORETEXT_CFLAGS)
+ 	AC_SUBST(CORETEXT_LIBS)
+ 	AC_DEFINE(HAVE_CORETEXT, 1, [Have Core Text backend])
+--- 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
new file mode 100644
index 0000000..a35d7fe
--- /dev/null
+++ b/contrib/src/harfbuzz/rules.mak
@@ -0,0 +1,33 @@
+# HARFBUZZ
+
+HARFBUZZ_VERSION := 0.9.2
+HARFBUZZ_URL := http://www.freedesktop.org/software/harfbuzz/snapshot/harfbuzz-$(HARFBUZZ_VERSION).tar.bz2
+PKGS += harfbuzz
+ifeq ($(call need_pkg,"harfbuzz"),)
+PKGS_FOUND += harfbuzz
+endif
+
+$(TARBALLS)/harfbuzz-$(HARFBUZZ_VERSION).tar.bz2:
+	$(call download,$(HARFBUZZ_URL))
+
+.sum-harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2
+
+harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
+	$(UNPACK)
+ifdef HAVE_MACOSX
+	$(APPLY) $(SRC)/harfbuzz/harfbuzz-osx.patch
+endif
+	$(MOVE)
+
+DEPS_harfbuzz = freetype2 $(DEPS_freetype2)
+
+HARFBUZZ_CONF=
+
+.harfbuzz: harfbuzz
+ifdef HAVE_MACOSX
+	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS)"  ./autogen.sh $(HOSTCONF) $(HARFBUZZ_CONF)
+else
+	cd $< && $(HOSTVARS) CFLAGS="$(CFLAGS)" ./configure $(HOSTCONF) $(HARFBUZZ_CONF)
+endif
+	cd $< && $(MAKE) install
+	touch $@
-- 
1.7.11.3