Commit 24ea755b authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Contribs: update harfbuzz to 1.0.6

parent 818f41da
0d10ba7075338b912f19a1a26d64502b772f5574a45fb43d92eaa56434cf5d2a844f23897ecb0abbdd26e1a0aec5f6ded7e533451ee6e4a03725f42aed7f9bcd harfbuzz-0.9.17.tar.bz2
20ee169389a784e4ad4e2ff006a59a36879dba0a37a999ff51c2b4d76da9496a1a747d5176e9611998187452e6d18f880295bdfb9f45338acddf772fc3f16021 harfbuzz-1.0.6.tar.bz2
--- 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 -ru harfbuzz/src/hb-atomic-private.hh harfbuzz-fied/src/hb-atomic-private.hh
--- harfbuzz/src/hb-atomic-private.hh 2013-04-04 21:01:42.000000000 +0200
+++ harfbuzz-fied/src/hb-atomic-private.hh 2014-01-22 14:57:21.000000000 +0100
@@ -65,10 +65,8 @@
--- harfbuzz-1.0.6/src/hb-atomic-private.hh.orig 2015-09-29 15:48:46.947083938 +0200
+++ harfbuzz-1.0.6/src/hb-atomic-private.hh 2015-10-26 00:06:08.564306388 +0100
@@ -73,10 +73,8 @@
#elif !defined(HB_NO_MT) && defined(__APPLE__)
#include <libkern/OSAtomic.h>
......@@ -12,16 +11,16 @@ diff -ru harfbuzz/src/hb-atomic-private.hh harfbuzz-fied/src/hb-atomic-private.h
-#include <Availability.h>
#endif
typedef int32_t hb_atomic_int_t;
@@ -76,7 +74,11 @@
#define hb_atomic_ptr_get(P) (OSMemoryBarrier (), (void *) *(P))
@@ -86,7 +84,11 @@
#define hb_atomic_ptr_impl_get(P) (OSMemoryBarrier (), (void *) *(P))
#if (MAC_OS_X_VERSION_MIN_REQUIRED > MAC_OS_X_VERSION_10_4 || __IPHONE_VERSION_MIN_REQUIRED >= 20100)
+#if __aarch64__
+#define hb_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P))
+#define hb_atomic_ptr_impl_cmpexch(P,O,N) OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P))
+#else
#define hb_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P))
#define hb_atomic_ptr_impl_cmpexch(P,O,N) OSAtomicCompareAndSwapPtrBarrier ((void *) (O), (void *) (N), (void **) (P))
+#endif
#else
#if __ppc64__ || __x86_64__
#define hb_atomic_ptr_cmpexch(P,O,N) OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P))
#if __ppc64__ || __x86_64__ || __aarch64__
#define hb_atomic_ptr_impl_cmpexch(P,O,N) OSAtomicCompareAndSwap64Barrier ((int64_t) (O), (int64_t) (N), (int64_t*) (P))
--- harfbuzz/configure.ac 2013-07-16 22:04:08.000000000 +0200
+++ harfbuzz/configure.ac 2014-03-12 14:46:36.000000000 +0100
@@ -80,13 +80,6 @@
CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
--- harfbuzz-1.0.6/configure.ac.orig 2015-10-26 00:06:30.060254321 +0100
+++ harfbuzz-1.0.6/configure.ac 2015-10-26 00:07:17.364140612 +0100
@@ -93,14 +93,6 @@
;;
esac
-
- case "$host" in
- arm-*-*)
- # Request byte alignment on arm
- CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8"
- if test "x$ac_cv_alignof_struct_char__" != x1; then
- # Request byte alignment
- CXXFLAGS="$CXXFLAGS -mstructure-size-boundary=8"
- fi
- ;;
- esac
fi
......
# HARFBUZZ
HARFBUZZ_VERSION := 0.9.17
HARFBUZZ_VERSION := 1.0.6
HARFBUZZ_URL := http://www.freedesktop.org/software/harfbuzz/release/harfbuzz-$(HARFBUZZ_VERSION).tar.bz2
PKGS += harfbuzz
ifeq ($(call need_pkg,"harfbuzz"),)
......@@ -17,7 +17,6 @@ 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)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment