contrib: HarfBuzz version 0.9.5

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/contrib/src/harfbuzz/SHA512SUMS b/contrib/src/harfbuzz/SHA512SUMS
index 69f5e25d806fde1c530d124f0e413a914bb60a7c..5beddac6ec3b5a2d6a2dc4e104f4a2d30e17f51b 100644 (file)
--- a/contrib/src/harfbuzz/SHA512SUMS
+++ b/contrib/src/harfbuzz/SHA512SUMS
@@ -1 +1 @@
-6b3d313287e4b9baba864bcdd2e29d20b4c0573b4b538a2979d53996406bfbb819b13e7fd87b9d3918c055134377f6d9abd2fec7ce3b566869ecd56ca04c87b7  harfbuzz-0.9.2.tar.bz2
+778d68998f652f37fc5295c09683a294ab50f9ab5c4c0937c89ee4838d5ff042ab9f9d30eeabf5e48f755af2fa78bca03d79d777fb1e014c1592a583cf2fd1cc  harfbuzz-0.9.5.tar.bz2

diff --git a/contrib/src/harfbuzz/harfbuzz-osx.patch b/contrib/src/harfbuzz/harfbuzz-osx.patch
index fa8e216073ca869edec79f62e4b0410f5892853e..af7c9839b3fd2032a10a1ead73cd91d6b5bce298 100644 (file)
--- a/contrib/src/harfbuzz/harfbuzz-osx.patch
+++ b/contrib/src/harfbuzz/harfbuzz-osx.patch
@@ -1,14 +1,3 @@
---- 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 @@

diff --git a/contrib/src/harfbuzz/rules.mak b/contrib/src/harfbuzz/rules.mak
index 6b35342b24378958dd25d5e3a4019470897403e2..ea39e4be395daf40a31e69ab808f7087e022b50e 100644 (file)
--- a/contrib/src/harfbuzz/rules.mak
+++ b/contrib/src/harfbuzz/rules.mak
@@ -1,7 +1,7 @@
 # HARFBUZZ
 
-HARFBUZZ_VERSION := 0.9.2
-HARFBUZZ_URL := http://www.freedesktop.org/software/harfbuzz/snapshot/harfbuzz-$(HARFBUZZ_VERSION).tar.bz2
+HARFBUZZ_VERSION := 0.9.5
+HARFBUZZ_URL := http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$(HARFBUZZ_VERSION).tar.bz2
 PKGS += harfbuzz
 ifeq ($(call need_pkg,"harfbuzz"),)
 PKGS_FOUND += harfbuzz
@@ -28,10 +28,6 @@ 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 $@