[vlc-commits] contrib: HarfBuzz 0.9.19

[Naohiro KORIYAMA]

vlc/vlc-2.1 | branch: master | Naohiro KORIYAMA <nkoriyama at gmail.com> | Thu Nov 15 21:16:16 2012 +0900| [a6c654897012ba530da6c1148dc72612e3600912] | committer: Rafaël Carré

contrib: HarfBuzz 0.9.19

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>
(cherry picked from commit d326912f6747297d8d81f92191a650ddd2cd4231)
Signed-off-by: Rafaël Carré <funman at videolan.org>

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

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

diff --git a/contrib/src/harfbuzz/SHA512SUMS b/contrib/src/harfbuzz/SHA512SUMS
index 5beddac..2a014b6 100644
--- a/contrib/src/harfbuzz/SHA512SUMS
+++ b/contrib/src/harfbuzz/SHA512SUMS
@@ -1 +1 @@
-778d68998f652f37fc5295c09683a294ab50f9ab5c4c0937c89ee4838d5ff042ab9f9d30eeabf5e48f755af2fa78bca03d79d777fb1e014c1592a583cf2fd1cc  harfbuzz-0.9.5.tar.bz2
+8df19497485acef4febc71bf908d4c983e6963766210bc400a79f6d59b8f405c53fe5a88c21683fa9c37a9e6befefe2efb0434f774d7f37924c522eae3b4ddd4  harfbuzz-0.9.19.tar.bz2
diff --git a/contrib/src/harfbuzz/disable-backends.patch b/contrib/src/harfbuzz/disable-backends.patch
deleted file mode 100644
index 69ba6b7..0000000
--- a/contrib/src/harfbuzz/disable-backends.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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/rules.mak b/contrib/src/harfbuzz/rules.mak
index 6761857..a40bc5f 100644
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -1,6 +1,6 @@
 # HARFBUZZ
 
-HARFBUZZ_VERSION := 0.9.5
+HARFBUZZ_VERSION := 0.9.19
 HARFBUZZ_URL := http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$(HARFBUZZ_VERSION).tar.bz2
 PKGS += harfbuzz
 ifeq ($(call need_pkg,"harfbuzz"),)
@@ -14,7 +14,6 @@ $(TARBALLS)/harfbuzz-$(HARFBUZZ_VERSION).tar.bz2:
 
 harfbuzz: harfbuzz-$(HARFBUZZ_VERSION).tar.bz2 .sum-harfbuzz
 	$(UNPACK)
-	$(APPLY) $(SRC)/harfbuzz/disable-backends.patch
 	$(UPDATE_AUTOCONFIG)
 	$(MOVE)