From 70f00b35b934878125244bf89834248303460c63 Mon Sep 17 00:00:00 2001 From: vanhofen Date: Sun, 11 Nov 2018 11:55:44 +0100 Subject: [PATCH] - add targets for bzip2, fontconfig, pixman, cairo and harfbuff --- archive-patches/bzip2-1.0.6.patch | 40 ++++ .../cairo-1.16.0-get_bitmap_surface.diff | 22 +++ .../harfbuzz-1.8.8-disable-docs.patch | 12 ++ .../libjpeg-turbo-tiff-ojpeg.patch | 39 ++++ ...-workarounds-in-cpu-features-detecti.patch | 144 +++++++++++++++ ...-for-FE_INVALID-definition-before-us.patch | 33 ++++ .../pixman-0.34.0-asm_include.patch | 29 +++ make/system-libs-extra.mk | 173 +++++++++++++++++- 8 files changed, 489 insertions(+), 3 deletions(-) create mode 100644 archive-patches/bzip2-1.0.6.patch create mode 100644 archive-patches/cairo-1.16.0-get_bitmap_surface.diff create mode 100644 archive-patches/harfbuzz-1.8.8-disable-docs.patch create mode 100644 archive-patches/libjpeg-turbo-tiff-ojpeg.patch create mode 100644 archive-patches/pixman-0.34.0-0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch create mode 100644 archive-patches/pixman-0.34.0-0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch create mode 100644 archive-patches/pixman-0.34.0-asm_include.patch diff --git a/archive-patches/bzip2-1.0.6.patch b/archive-patches/bzip2-1.0.6.patch new file mode 100644 index 00000000..756246b0 --- /dev/null +++ b/archive-patches/bzip2-1.0.6.patch @@ -0,0 +1,40 @@ +--- a/Makefile-libbz2_so ++++ b/Makefile-libbz2_so +@@ -22,9 +22,8 @@ + + + SHELL=/bin/sh +-CC=gcc + BIGFILES=-D_FILE_OFFSET_BITS=64 +-CFLAGS=-fpic -fPIC -Wall -Winline -O2 -g $(BIGFILES) ++CFLAGS=-fpic -fPIC -Wall -pipe -Os -g0 $(BIGFILES) + + OBJS= blocksort.o \ + huffman.o \ +@@ -35,7 +35,7 @@ + bzlib.o + + all: $(OBJS) +- $(CC) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) ++ $(CC) $(CFLAGS) -shared -Wl,-soname -Wl,libbz2.so.1.0 -o libbz2.so.1.0.6 $(OBJS) + $(CC) $(CFLAGS) -o bzip2-shared bzip2.c libbz2.so.1.0.6 + rm -f libbz2.so.1.0 + ln -s libbz2.so.1.0.6 libbz2.so.1.0 +@@ -57,3 +56,17 @@ + $(CC) $(CFLAGS) -c decompress.c + bzlib.o: bzlib.c + $(CC) $(CFLAGS) -c bzlib.c ++ ++install: ++ if ( test ! -d $(PREFIX)/bin ) ; then mkdir -p $(PREFIX)/bin ; fi ++ cp -f bzip2-shared $(PREFIX)/bin/bzip2 ++ chmod a+x $(PREFIX)/bin/bzip2 ++ if ( test ! -d $(PREFIX)/include ) ; then mkdir -p $(PREFIX)/include ; fi ++ cp -f bzlib.h $(PREFIX)/include ++ chmod a+r $(PREFIX)/include/bzlib.h ++ if ( test ! -d $(PREFIX)/lib ) ; then mkdir -p $(PREFIX)/lib ; fi ++ cp -f libbz2.so.1.0.6 $(PREFIX)/lib ++ chmod a+r $(PREFIX)/lib/libbz2.so.1.0.6 ++ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1.0 ++ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so.1 ++ ln -sf libbz2.so.1.0.6 $(PREFIX)/lib/libbz2.so diff --git a/archive-patches/cairo-1.16.0-get_bitmap_surface.diff b/archive-patches/cairo-1.16.0-get_bitmap_surface.diff new file mode 100644 index 00000000..7aaad2ee --- /dev/null +++ b/archive-patches/cairo-1.16.0-get_bitmap_surface.diff @@ -0,0 +1,22 @@ +Cairo: Fix Denial-of-Service Attack due to Logical Problem in Program + +https://bugs.freedesktop.org/show_bug.cgi?id=100763 + +CVE: CVE-2017-7475 +Upstream-Status: Submitted + +Signed-off-by: Fan Xin + +Index: cairo-1.15.4/src/cairo-ft-font.c +=================================================================== +--- cairo-1.15.4.orig/src/cairo-ft-font.c ++++ cairo-1.15.4/src/cairo-ft-font.c +@@ -1149,7 +1149,7 @@ _get_bitmap_surface (FT_Bitmap *bi + width = bitmap->width; + height = bitmap->rows; + +- if (width == 0 || height == 0) { ++ if (width == 0 || height == 0 || bitmap->buffer == NULL) { + *surface = (cairo_image_surface_t *) + cairo_image_surface_create_for_data (NULL, format, 0, 0, 0); + return (*surface)->base.status; diff --git a/archive-patches/harfbuzz-1.8.8-disable-docs.patch b/archive-patches/harfbuzz-1.8.8-disable-docs.patch new file mode 100644 index 00000000..00aecf2f --- /dev/null +++ b/archive-patches/harfbuzz-1.8.8-disable-docs.patch @@ -0,0 +1,12 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -4,7 +4,7 @@ + + ACLOCAL_AMFLAGS = -I m4 + +-SUBDIRS = src util test docs ++SUBDIRS = src util test + + EXTRA_DIST = \ + autogen.sh \ + diff --git a/archive-patches/libjpeg-turbo-tiff-ojpeg.patch b/archive-patches/libjpeg-turbo-tiff-ojpeg.patch new file mode 100644 index 00000000..6c4253ef --- /dev/null +++ b/archive-patches/libjpeg-turbo-tiff-ojpeg.patch @@ -0,0 +1,39 @@ +--- a/jdhuff.c ++++ b/jdhuff.c +@@ -820,3 +820,35 @@ + entropy->dc_derived_tbls[i] = entropy->ac_derived_tbls[i] = NULL; + } + } ++/* ++ * BEWARE OF KLUDGE: This subroutine is a hack for decoding illegal JPEG-in- ++ * TIFF encapsulations produced by Microsoft's Wang Imaging ++ * for Windows application with the public-domain TIFF Library. Based upon an ++ * examination of selected output files, this program apparently divides a JPEG ++ * bit-stream into consecutive horizontal TIFF "strips", such that the JPEG ++ * encoder's/decoder's DC coefficients for each image component are reset before ++ * each "strip". Moreover, a "strip" is not necessarily encoded in a multiple ++ * of 8 bits, so one must sometimes discard 1-7 bits at the end of each "strip" ++ * for alignment to the next input-Byte storage boundary. IJG JPEG Library ++ * decoder state is not normally exposed to client applications, so this sub- ++ * routine provides the TIFF Library with a "hook" to make these corrections. ++ * It should be called after "jpeg_start_decompress()" and before ++ * "jpeg_finish_decompress()", just before decoding each "strip" using ++ * "jpeg_read_raw_data()" or "jpeg_read_scanlines()". ++ * ++ * This kludge is not sanctioned or supported by the Independent JPEG Group, and ++ * future changes to the IJG JPEG Library might invalidate it. Do not send bug ++ * reports about this code to IJG developers. Instead, contact the author for ++ * advice: Scott B. Marovich , Hewlett-Packard Labs, 6/01. ++ */ ++GLOBAL(void) ++jpeg_reset_huff_decode (register j_decompress_ptr cinfo,register float *refbw) ++{ register huff_entropy_ptr entropy = (huff_entropy_ptr)cinfo->entropy; ++ register int ci = 0; ++ ++ /* Re-initialize DC predictions */ ++ do entropy->saved.last_dc_val[ci] = -refbw[ci << 1]; ++ while (++ci < cinfo->comps_in_scan); ++ /* Discard encoded input bits, up to the next Byte boundary */ ++ entropy->bitstate.bits_left &= ~7; ++} + diff --git a/archive-patches/pixman-0.34.0-0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch b/archive-patches/pixman-0.34.0-0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch new file mode 100644 index 00000000..4569dca0 --- /dev/null +++ b/archive-patches/pixman-0.34.0-0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch @@ -0,0 +1,144 @@ +From a0f53e1dbb3851bb0f0efcfdbd565b05e4be9cac Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Thu, 23 Aug 2012 18:10:57 +0200 +Subject: [PATCH 1/2] ARM: qemu related workarounds in cpu features detection + code +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This was ported from meta-oe's patch [1]. The original pixman patch is found +at [2]. + +[1] http://cgit.openembedded.org/meta-openembedded/tree/meta-oe/recipes-graphics/xorg-lib/pixman-0.26.2/0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch +[2] http://lists.freedesktop.org/archives/pixman/2011-January/000906.html + +Upstream-Status: Inappropriate [other] qemu fix + +Signed-off-by: Andreas Müller +--- + pixman/pixman-arm.c | 82 ++++++++++++++++++++++++++++++++++++++++---------- + 1 files changed, 65 insertions(+), 17 deletions(-) + +diff --git a/pixman/pixman-arm.c b/pixman/pixman-arm.c +index 23374e4..d98bda6 100644 +--- a/pixman/pixman-arm.c ++++ b/pixman/pixman-arm.c +@@ -129,16 +129,35 @@ detect_cpu_features (void) + #include + #include + #include ++#include + #include + #include + #include + ++/* ++ * The whole CPU capabilities detection is a bit ugly: when running in ++ * userspace qemu, we see /proc/self/auxv from the host system. To make ++ * everything even worse, the size of each value is 64-bit when running ++ * on a 64-bit host system. So the data is totally bogus because we expect ++ * 32-bit values. As AT_PLATFORM value is used as a pointer, it may cause ++ * segfault (null pointer dereference on x86-64 host). So in order to be ++ * on a safe side, we require that AT_PLATFORM value is found only once, ++ * and it has non-zero value (this is still not totally reliable for a big ++ * endian 64-bit host system running qemu and may theoretically fail). ++ */ ++#define ARM_HWCAP_VFP 64 ++#define ARM_HWCAP_IWMMXT 512 ++#define ARM_HWCAP_NEON 4096 ++ + static arm_cpu_features_t + detect_cpu_features (void) + { + arm_cpu_features_t features = 0; + Elf32_auxv_t aux; + int fd; ++ uint32_t hwcap = 0; ++ const char *plat = NULL; ++ int plat_cnt = 0; + + fd = open ("/proc/self/auxv", O_RDONLY); + if (fd >= 0) +@@ -147,32 +166,61 @@ detect_cpu_features (void) + { + if (aux.a_type == AT_HWCAP) + { +- uint32_t hwcap = aux.a_un.a_val; +- +- /* hardcode these values to avoid depending on specific +- * versions of the hwcap header, e.g. HWCAP_NEON +- */ +- if ((hwcap & 64) != 0) +- features |= ARM_VFP; +- if ((hwcap & 512) != 0) +- features |= ARM_IWMMXT; +- /* this flag is only present on kernel 2.6.29 */ +- if ((hwcap & 4096) != 0) +- features |= ARM_NEON; ++ hwcap = aux.a_un.a_val; + } + else if (aux.a_type == AT_PLATFORM) + { +- const char *plat = (const char*) aux.a_un.a_val; +- +- if (strncmp (plat, "v7l", 3) == 0) ++ plat = (const char*) aux.a_un.a_val; ++ plat_cnt++; ++ } ++ } ++ close (fd); ++ if (plat == NULL || plat_cnt != 1 || *plat != 'v') ++ { ++ /* ++ * Something seems to be really wrong, most likely we are ++ * running under qemu. Let's use machine type from "uname" for ++ * CPU capabilities detection: ++ * http://www.mail-archive.com/qemu-devel at nongnu.org/msg22212.html ++ */ ++ struct utsname u; ++ hwcap = 0; /* clear hwcap, because it is bogus */ ++ if (uname (&u) == 0) ++ { ++ if (strcmp (u.machine, "armv7l") == 0) ++ { + features |= (ARM_V7 | ARM_V6); +- else if (strncmp (plat, "v6l", 3) == 0) ++ hwcap |= ARM_HWCAP_VFP; /* qemu is supposed to emulate vfp */ ++ hwcap |= ARM_HWCAP_NEON; /* qemu is supposed to emulate neon */ ++ } ++ else if (strcmp (u.machine, "armv6l") == 0) ++ { + features |= ARM_V6; ++ hwcap |= ARM_HWCAP_VFP; /* qemu is supposed to emulate vfp */ ++ } + } + } +- close (fd); ++ else if (strncmp (plat, "v7l", 3) == 0) ++ { ++ features |= (ARM_V7 | ARM_V6); ++ } ++ else if (strncmp (plat, "v6l", 3) == 0) ++ { ++ features |= ARM_V6; ++ } + } + ++ /* hardcode these values to avoid depending on specific ++ * versions of the hwcap header, e.g. HWCAP_NEON ++ */ ++ if ((hwcap & ARM_HWCAP_VFP) != 0) ++ features |= ARM_VFP; ++ if ((hwcap & ARM_HWCAP_IWMMXT) != 0) ++ features |= ARM_IWMMXT; ++ /* this flag is only present on kernel 2.6.29 */ ++ if ((hwcap & ARM_HWCAP_NEON) != 0) ++ features |= ARM_NEON; ++ + return features; + } + +-- +1.7.6.5 + diff --git a/archive-patches/pixman-0.34.0-0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch b/archive-patches/pixman-0.34.0-0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch new file mode 100644 index 00000000..782c1db0 --- /dev/null +++ b/archive-patches/pixman-0.34.0-0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch @@ -0,0 +1,33 @@ +From 0ccd906b904d21536d5ab41c6196760e3e5d72cb Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 17 May 2016 17:30:00 -0700 +Subject: [PATCH] test/utils: Check for FE_INVALID definition before use + +Some architectures e.g. nios2 do not support all exceptions + +Signed-off-by: Khem Raj +--- +Upstream-Status: Submitted + + test/utils.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/test/utils.c b/test/utils.c +index f8e42a5..fe32b1e 100644 +--- a/test/utils.c ++++ b/test/utils.c +@@ -978,9 +978,11 @@ enable_invalid_exceptions (void) + { + #ifdef HAVE_FENV_H + #ifdef HAVE_FEENABLEEXCEPT ++#ifdef FE_INVALID + feenableexcept (FE_INVALID); + #endif + #endif ++#endif + } + + void * +-- +2.8.2 + diff --git a/archive-patches/pixman-0.34.0-asm_include.patch b/archive-patches/pixman-0.34.0-asm_include.patch new file mode 100644 index 00000000..b52a5707 --- /dev/null +++ b/archive-patches/pixman-0.34.0-asm_include.patch @@ -0,0 +1,29 @@ +Fixes errors like + +Assembler messages: +Fatal error: can't create .libs/pixman-mips-dspr2-asm.o: No such file or directory + +it works with glibc because it uses gcc fixed-headers but thats not right. + +We move the include under C block + +Signed-off-by: Khem Raj +Upstream-Status: Pending +Index: pixman-0.32.6/pixman/pixman-private.h +=================================================================== +--- pixman-0.32.6.orig/pixman/pixman-private.h ++++ pixman-0.32.6/pixman/pixman-private.h +@@ -1,4 +1,3 @@ +-#include + + #ifndef PIXMAN_PRIVATE_H + #define PIXMAN_PRIVATE_H +@@ -17,6 +16,8 @@ + + #ifndef __ASSEMBLER__ + ++#include ++ + #ifndef PACKAGE + # error config.h must be included before pixman-private.h + #endif diff --git a/make/system-libs-extra.mk b/make/system-libs-extra.mk index b6641ee8..b50e49de 100644 --- a/make/system-libs-extra.mk +++ b/make/system-libs-extra.mk @@ -3,7 +3,8 @@ # # ----------------------------------------------------------------------------- -LIBID3TAG_VER=0.15.1b +LIBID3TAG_VER = 0.15.1b + $(ARCHIVE)/libid3tag-$(LIBID3TAG_VER).tar.gz: $(WGET) http://downloads.sourceforge.net/project/mad/libid3tag/$(LIBID3TAG_VER)/libid3tag-$(LIBID3TAG_VER).tar.gz @@ -25,7 +26,8 @@ $(D)/libid3tag: $(D)/zlib $(ARCHIVE)/libid3tag-$(LIBID3TAG_VER).tar.gz | $(TARGE # ----------------------------------------------------------------------------- -LIBFLAC_VER=1.3.2 +LIBFLAC_VER = 1.3.2 + $(ARCHIVE)/flac-$(LIBFLAC_VER).tar.xz: $(WGET) http://prdownloads.sourceforge.net/sourceforge/flac/flac-$(LIBFLAC_VER).tar.xz @@ -55,7 +57,8 @@ $(D)/libFLAC: $(ARCHIVE)/flac-$(LIBFLAC_VER).tar.xz | $(TARGET_DIR) # ----------------------------------------------------------------------------- -LIBROXML_VER=2.3.0 +LIBROXML_VER = 2.3.0 + $(ARCHIVE)/libroxml-$(LIBROXML_VER).tar.gz: $(WGET) http://download.libroxml.net/pool/v2.x/libroxml-$(LIBROXML_VER).tar.gz @@ -75,3 +78,167 @@ $(D)/libroxml: $(ARCHIVE)/libroxml-$(LIBROXML_VER).tar.gz | $(TARGET_DIR) $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/libroxml.pc $(REMOVE)/libroxml-$(LIBROXML_VER) $(TOUCH) + +# ----------------------------------------------------------------------------- + +BZIP2_VER = 1.0.6 +BZIP2_SOURCE = bzip2-$(BZIP2_VER).tar.gz + +$(ARCHIVE)/$(BZIP2_SOURCE): + $(WGET) http://sources.buildroot.net/$(BZIP2_SOURCE) + +BZIP2_Patch = bzip2-$(BZIP2_VER).patch + +$(D)/bzip2: $(ARCHIVE)/$(BZIP2_SOURCE) | $(TARGET_DIR) + $(REMOVE)/bzip2-$(BZIP2_VER) + $(UNTAR)/$(BZIP2_SOURCE) + $(CHDIR)/bzip2-$(BZIP2_VER); \ + $(call apply_patches, $(BZIP2_Patch)); \ + mv Makefile-libbz2_so Makefile; \ + $(MAKE) all CC=$(TARGET)-gcc AR=$(TARGET)-ar RANLIB=$(TARGET)-ranlib; \ + $(MAKE) install PREFIX=$(TARGET_DIR) + rm -f $(TARGET_DIR)/bin/bzip2 + $(REMOVE)/bzip2-$(BZIP2_VER) + $(TOUCH) + +# ----------------------------------------------------------------------------- + +FONTCONFIG_VER = 2.11.93 +FONTCONFIG_SOURCE = fontconfig-$(FONTCONFIG_VER).tar.bz2 + +$(ARCHIVE)/$(FONTCONFIG_SOURCE): + $(WGET) https://www.freedesktop.org/software/fontconfig/release/$(FONTCONFIG_SOURCE) + +$(D)/fontconfig: $(D)/freetype $(D)/expat $(ARCHIVE)/$(FONTCONFIG_SOURCE) | $(TARGET_DIR) + $(REMOVE)/fontconfig-$(FONTCONFIG_VER) + $(UNTAR)/$(FONTCONFIG_SOURCE) + $(CHDIR)/fontconfig-$(FONTCONFIG_VER); \ + $(CONFIGURE) \ + --prefix= \ + --with-freetype-config=$(HOST_DIR)/bin/freetype-config \ + --with-expat-includes=$(TARGET_INCLUDE_DIR) \ + --with-expat-lib=$(TARGET_LIB_DIR) \ + --sysconfdir=/etc \ + --disable-docs \ + ; \ + $(MAKE) all; \ + $(MAKE) install DESTDIR=$(TARGET_DIR) + $(REWRITE_LIBTOOL)/libfontconfig.la + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/fontconfig.pc + $(REMOVE)/fontconfig-$(FONTCONFIG_VER) + $(TOUCH) + +# ----------------------------------------------------------------------------- + +PIXMAN_VER = 0.34.0 +PIXMAN_SOURCE = pixman-$(PIXMAN_VER).tar.gz + +$(ARCHIVE)/$(PIXMAN_SOURCE): + $(WGET) https://www.cairographics.org/releases/$(PIXMAN_SOURCE) + +PIXMAN_PATCH = pixman-$(PIXMAN_VER)-0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch +PIXMAN_PATCH += pixman-$(PIXMAN_VER)-asm_include.patch +PIXMAN_PATCH += pixman-$(PIXMAN_VER)-0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch + +$(D)/pixman: $(D)/zlib $(D)/libpng $(ARCHIVE)/$(PIXMAN_SOURCE) | $(TARGET_DIR) + $(REMOVE)/pixman-$(PIXMAN_VER) + $(UNTAR)/$(PIXMAN_SOURCE) + $(CHDIR)/pixman-$(PIXMAN_VER); \ + $(call apply_patches,$(PIXMAN_PATCH)); \ + $(CONFIGURE) \ + --prefix= \ + --disable-gtk \ + --disable-arm-simd \ + --disable-loongson-mmi \ + --disable-docs \ + ; \ + $(MAKE) all; \ + $(MAKE) install DESTDIR=$(TARGET_DIR) + $(REWRITE_LIBTOOL)/libpixman-1.la + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/pixman-1.pc + $(REMOVE)/pixman-$(PIXMAN_VER) + $(TOUCH) + +# ----------------------------------------------------------------------------- + +CAIRO_VER = 1.16.0 +CAIRO_SOURCE = cairo-$(CAIRO_VER).tar.xz + +$(ARCHIVE)/$(CAIRO_SOURCE): + $(WGET) https://www.cairographics.org/releases/$(CAIRO_SOURCE) + +CAIRO_PATCH = cairo-$(CAIRO_VER)-get_bitmap_surface.diff + +$(D)/cairo: $(D)/fontconfig $(D)/libglib2 $(D)/libpng $(D)/pixman $(D)/zlib $(ARCHIVE)/$(CAIRO_SOURCE) | $(TARGET_DIR) + $(REMOVE)/cairo-$(CAIRO_VER) + $(UNTAR)/$(CAIRO_SOURCE) + $(CHDIR)/cairo-$(CAIRO_VER); \ + $(call apply_patches,$(CAIRO_PATCH)); \ + $(BUILDENV) \ + ax_cv_c_float_words_bigendian="no" \ + ./configure $(CONFIGURE_OPTS) \ + --prefix= \ + --with-x=no \ + --disable-xlib \ + --disable-xcb \ + --disable-egl \ + --disable-glesv2 \ + --disable-gl \ + --enable-tee \ + ; \ + $(MAKE) all; \ + $(MAKE) install DESTDIR=$(TARGET_DIR) + rm -rf $(TARGET_DIR)/usr/bin/cairo-sphinx + rm -rf $(TARGET_LIB_DIR)/cairo/cairo-fdr* + rm -rf $(TARGET_LIB_DIR)/cairo/cairo-sphinx* + rm -rf $(TARGET_LIB_DIR)/cairo/.debug/cairo-fdr* + rm -rf $(TARGET_LIB_DIR)/cairo/.debug/cairo-sphinx* + $(REWRITE_LIBTOOL)/libcairo.la + $(REWRITE_LIBTOOL)/libcairo-script-interpreter.la + $(REWRITE_LIBTOOL)/libcairo-gobject.la + $(REWRITE_LIBTOOL)/cairo/libcairo-trace.la + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo.pc + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo-fc.pc + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo-ft.pc + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo-gobject.pc + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo-pdf.pc + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo-png.pc + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo-ps.pc + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo-script.pc + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo-svg.pc + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/cairo-tee.pc + $(REMOVE)/cairo-$(CAIRO_VER) + $(TOUCH) + +# ----------------------------------------------------------------------------- + +HARFBUZZ_VER = 1.8.8 +HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VER).tar.bz2 + +$(ARCHIVE)/$(HARFBUZZ_SOURCE): + $(WGET) https://www.freedesktop.org/software/harfbuzz/release/$(HARFBUZZ_SOURCE) + +HARFBUZZ_PATCH = harfbuzz-$(HARFBUZZ_VER)-disable-docs.patch + +$(D)/harfbuzz: $(D)/fontconfig $(D)/libglib2 $(D)/cairo $(D)/freetype $(ARCHIVE)/$(HARFBUZZ_SOURCE) | $(TARGET_DIR) + $(REMOVE)/harfbuzz-$(HARFBUZZ_VER) + $(UNTAR)/$(HARFBUZZ_SOURCE) + $(CHDIR)/harfbuzz-$(HARFBUZZ_VER); \ + $(call apply_patches,$(HARFBUZZ_PATCH)); \ + $(CONFIGURE) \ + --prefix= \ + --with-cairo \ + --with-fontconfig \ + --with-freetype \ + --with-glib \ + --without-graphite2 \ + --without-icu \ + ; \ + $(MAKE) all; \ + $(MAKE) install DESTDIR=$(TARGET_DIR) + $(REWRITE_LIBTOOL)/libharfbuzz.la + $(REWRITE_LIBTOOL)/libharfbuzz-subset.la + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/harfbuzz.pc + $(REWRITE_PKGCONF) $(PKG_CONFIG_PATH)/harfbuzz-subset.pc + $(REMOVE)/harfbuzz-$(HARFBUZZ_VER) + $(TOUCH)