initial buildroot for linux 5.15
This commit is contained in:
Huan.Feng
@@ -0,0 +1,29 @@
|
||||
test: fix build when SHOULD_FORK is false
|
||||
|
||||
The code in test/cairo-test-runner.c properly takes into account
|
||||
platforms that do have fork() support, and uses the SHOULD_FORK define
|
||||
to know whether fork is available or not.
|
||||
|
||||
However, this SHOULD_FORK macro is used to guard the inclusion of
|
||||
<unistd.h>, which is needed to get the prototype of other functions
|
||||
(namely readlink and getppid), that are used in portions of this file
|
||||
not guarded by SHOULD_FORK.
|
||||
|
||||
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
|
||||
|
||||
Index: b/test/cairo-test-runner.c
|
||||
===================================================================
|
||||
--- a/test/cairo-test-runner.c
|
||||
+++ b/test/cairo-test-runner.c
|
||||
@@ -36,10 +36,10 @@
|
||||
#include <pixman.h> /* for version information */
|
||||
|
||||
#define SHOULD_FORK HAVE_FORK && HAVE_WAITPID
|
||||
-#if SHOULD_FORK
|
||||
#if HAVE_UNISTD_H
|
||||
#include <unistd.h>
|
||||
#endif
|
||||
+#if SHOULD_FORK
|
||||
#if HAVE_SIGNAL_H
|
||||
#include <signal.h>
|
||||
#endif
|
||||
+33
@@ -0,0 +1,33 @@
|
||||
From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001
|
||||
From: Carlos Garcia Campos <cgarcia@igalia.com>
|
||||
Date: Mon, 19 Nov 2018 12:33:07 +0100
|
||||
Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in
|
||||
cairo_ft_apply_variations
|
||||
|
||||
Fixes a crash when using freetype >= 2.9
|
||||
[Retrieved from:
|
||||
https://gitlab.freedesktop.org/cairo/cairo/-/commit/90e85c2493fdfa3551f202ff10282463f1e36645]
|
||||
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
|
||||
---
|
||||
src/cairo-ft-font.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
|
||||
index 325dd61b4..981973f78 100644
|
||||
--- a/src/cairo-ft-font.c
|
||||
+++ b/src/cairo-ft-font.c
|
||||
@@ -2393,7 +2393,11 @@ skip:
|
||||
done:
|
||||
free (coords);
|
||||
free (current_coords);
|
||||
+#if HAVE_FT_DONE_MM_VAR
|
||||
+ FT_Done_MM_Var (face->glyph->library, ft_mm_var);
|
||||
+#else
|
||||
free (ft_mm_var);
|
||||
+#endif
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.24.1
|
||||
|
||||
@@ -0,0 +1,48 @@
|
||||
config BR2_PACKAGE_CAIRO
|
||||
bool "cairo"
|
||||
select BR2_PACKAGE_PIXMAN
|
||||
select BR2_PACKAGE_FONTCONFIG
|
||||
select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
|
||||
select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
|
||||
help
|
||||
Cairo is a 2D graphics library with support for multiple
|
||||
output devices. Currently supported output targets include
|
||||
the X Window System, Win32, image buffers, and PostScript,
|
||||
PDF, and SVG file output. Experimental backends include
|
||||
OpenGL (through glitz), Quartz, and XCB.
|
||||
|
||||
http://cairographics.org/
|
||||
|
||||
if BR2_PACKAGE_CAIRO
|
||||
|
||||
config BR2_PACKAGE_CAIRO_PS
|
||||
bool "postscript support"
|
||||
select BR2_PACKAGE_ZLIB
|
||||
select BR2_PACKAGE_CAIRO_PDF
|
||||
|
||||
config BR2_PACKAGE_CAIRO_PDF
|
||||
bool "pdf support"
|
||||
select BR2_PACKAGE_ZLIB
|
||||
|
||||
config BR2_PACKAGE_CAIRO_PNG
|
||||
bool "png support"
|
||||
select BR2_PACKAGE_LIBPNG
|
||||
select BR2_PACKAGE_ZLIB
|
||||
|
||||
config BR2_PACKAGE_CAIRO_SCRIPT
|
||||
bool "script support"
|
||||
select BR2_PACKAGE_CAIRO_PNG
|
||||
|
||||
config BR2_PACKAGE_CAIRO_SVG
|
||||
bool "svg support"
|
||||
select BR2_PACKAGE_CAIRO_PNG
|
||||
select BR2_PACKAGE_CAIRO_PDF
|
||||
|
||||
config BR2_PACKAGE_CAIRO_TEE
|
||||
bool "tee support"
|
||||
|
||||
config BR2_PACKAGE_CAIRO_XML
|
||||
bool "xml support"
|
||||
select BR2_PACKAGE_CAIRO_PNG
|
||||
|
||||
endif
|
||||
@@ -0,0 +1,9 @@
|
||||
# From https://www.cairographics.org/releases/cairo-1.16.0.tar.xz.sha1
|
||||
sha1 00e81842ae5e81bb0343108884eb5205be0eac14 cairo-1.16.0.tar.xz
|
||||
# Calculated based on the hash above
|
||||
sha256 5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331 cairo-1.16.0.tar.xz
|
||||
|
||||
# Hash for license files:
|
||||
sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING
|
||||
sha256 9e9e8608c4cdda51a78cc3a385f4ec9a2e4c96d5ecad74ac8bca5fca3e563b7d COPYING-LGPL-2.1
|
||||
sha256 53692a2ed6c6a2c6ec9b32dd0b820dfae91e0a1fcdf625ca9ed0bdf8705fcc4f COPYING-MPL-1.1
|
||||
@@ -0,0 +1,175 @@
|
||||
################################################################################
|
||||
#
|
||||
# cairo
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CAIRO_VERSION = 1.16.0
|
||||
CAIRO_SOURCE = cairo-$(CAIRO_VERSION).tar.xz
|
||||
CAIRO_LICENSE = LGPL-2.1 or MPL-1.1 (library)
|
||||
CAIRO_LICENSE_FILES = COPYING COPYING-LGPL-2.1 COPYING-MPL-1.1
|
||||
CAIRO_CPE_ID_VENDOR = cairographics
|
||||
CAIRO_SITE = http://cairographics.org/releases
|
||||
CAIRO_INSTALL_STAGING = YES
|
||||
|
||||
# 0002-ft-Use-FT_Done_MM_Var-instead-of-free-when-available-in-cairo_ft_apply_variation.patch
|
||||
CAIRO_IGNORE_CVES += CVE-2018-19876
|
||||
|
||||
# relocation truncated to fit: R_68K_GOT16O
|
||||
ifeq ($(BR2_m68k_cf),y)
|
||||
CAIRO_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -mxgot"
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_THREADS),)
|
||||
CAIRO_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) -DCAIRO_NO_MUTEX=1"
|
||||
endif
|
||||
|
||||
# cairo can use C++11 atomics when available, so we need to link with
|
||||
# libatomic for the architectures who need libatomic.
|
||||
ifeq ($(BR2_TOOLCHAIN_HAS_LIBATOMIC),y)
|
||||
CAIRO_CONF_ENV += LIBS="-latomic"
|
||||
endif
|
||||
|
||||
CAIRO_CONF_OPTS = \
|
||||
--enable-trace=no \
|
||||
--enable-interpreter=no
|
||||
|
||||
CAIRO_DEPENDENCIES = host-pkgconf fontconfig pixman
|
||||
|
||||
# Just the bare minimum to make other host-* packages happy
|
||||
HOST_CAIRO_CONF_OPTS = \
|
||||
--enable-trace=no \
|
||||
--enable-interpreter=no \
|
||||
--disable-directfb \
|
||||
--enable-ft \
|
||||
--enable-gobject \
|
||||
--disable-glesv2 \
|
||||
--disable-vg \
|
||||
--disable-xlib \
|
||||
--disable-xcb \
|
||||
--without-x \
|
||||
--disable-xlib-xrender \
|
||||
--disable-ps \
|
||||
--disable-pdf \
|
||||
--enable-png \
|
||||
--enable-script \
|
||||
--disable-svg \
|
||||
--disable-tee \
|
||||
--disable-xml
|
||||
HOST_CAIRO_DEPENDENCIES = \
|
||||
host-freetype \
|
||||
host-fontconfig \
|
||||
host-libglib2 \
|
||||
host-libpng \
|
||||
host-pixman \
|
||||
host-pkgconf
|
||||
|
||||
# DirectFB svg support rely on Cairo and Cairo DirectFB support depends on
|
||||
# DirectFB. Break circular dependency by disabling DirectFB support in Cairo
|
||||
# (which is experimental)
|
||||
ifeq ($(BR2_PACKAGE_DIRECTFB)x$(BR2_PACKAGE_DIRECTFB_SVG),yx)
|
||||
CAIRO_CONF_OPTS += --enable-directfb
|
||||
CAIRO_DEPENDENCIES += directfb
|
||||
else
|
||||
CAIRO_CONF_OPTS += --disable-directfb
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_FREETYPE),y)
|
||||
CAIRO_CONF_OPTS += --enable-ft
|
||||
CAIRO_DEPENDENCIES += freetype
|
||||
else
|
||||
CAIRO_CONF_OPTS += --disable-ft
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LIBGLIB2),y)
|
||||
CAIRO_CONF_OPTS += --enable-gobject
|
||||
CAIRO_DEPENDENCIES += libglib2
|
||||
else
|
||||
CAIRO_CONF_OPTS += --disable-gobject
|
||||
endif
|
||||
|
||||
# Can use GL or GLESv2 but not both
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
|
||||
CAIRO_CONF_OPTS += --enable-gl --disable-glesv2
|
||||
CAIRO_DEPENDENCIES += libgl
|
||||
else
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y)
|
||||
CAIRO_CONF_OPTS += --disable-gl --enable-glesv2
|
||||
CAIRO_DEPENDENCIES += libgles
|
||||
else
|
||||
CAIRO_CONF_OPTS += --disable-gl --disable-glesv2
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_HAS_LIBOPENVG),y)
|
||||
CAIRO_CONF_OPTS += --enable-vg
|
||||
CAIRO_DEPENDENCIES += libopenvg
|
||||
else
|
||||
CAIRO_CONF_OPTS += --disable-vg
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_LZO),y)
|
||||
CAIRO_DEPENDENCIES += lzo
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XORG7),y)
|
||||
CAIRO_CONF_OPTS += --enable-xlib --enable-xcb --with-x
|
||||
CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext
|
||||
else
|
||||
CAIRO_CONF_OPTS += --disable-xlib --disable-xcb --without-x
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBXRENDER),y)
|
||||
CAIRO_CONF_OPTS += --enable-xlib-xrender
|
||||
CAIRO_DEPENDENCIES += xlib_libXrender
|
||||
else
|
||||
CAIRO_CONF_OPTS += --disable-xlib-xrender
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CAIRO_PS),y)
|
||||
CAIRO_CONF_OPTS += --enable-ps
|
||||
CAIRO_DEPENDENCIES += zlib
|
||||
else
|
||||
CAIRO_CONF_OPTS += --disable-ps
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CAIRO_PDF),y)
|
||||
CAIRO_CONF_OPTS += --enable-pdf
|
||||
CAIRO_DEPENDENCIES += zlib
|
||||
else
|
||||
CAIRO_CONF_OPTS += --disable-pdf
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CAIRO_PNG),y)
|
||||
CAIRO_CONF_OPTS += --enable-png
|
||||
CAIRO_DEPENDENCIES += libpng
|
||||
else
|
||||
CAIRO_CONF_OPTS += --disable-png
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CAIRO_SCRIPT),y)
|
||||
CAIRO_CONF_OPTS += --enable-script
|
||||
else
|
||||
CAIRO_CONF_OPTS += --disable-script
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CAIRO_SVG),y)
|
||||
CAIRO_CONF_OPTS += --enable-svg
|
||||
else
|
||||
CAIRO_CONF_OPTS += --disable-svg
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CAIRO_TEE),y)
|
||||
CAIRO_CONF_OPTS += --enable-tee
|
||||
else
|
||||
CAIRO_CONF_OPTS += --disable-tee
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CAIRO_XML),y)
|
||||
CAIRO_CONF_OPTS += --enable-xml
|
||||
else
|
||||
CAIRO_CONF_OPTS += --disable-xml
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
$(eval $(host-autotools-package))
|
||||
Reference in New Issue
Block a user