mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-26 12:00:48 -09:00
package/cairo: bump to 1.18.0
News: - https://www.cairographics.org/news/cairo-1.17.8/ - https://www.cairographics.org/news/cairo-1.18.0/ Some options are renamed/dropped so fix that along. - GL and GLES drawing has been dropped in 1.17.8. - The XML surface has been removed in 1.18.0. - xlib-xcb was added [1] Patches: - drop 0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch, upstream: [2] - drop 0002-Fix-mask-usage-in-image-compositor.patch, upstream: [3] - drop 0004-meson-allow-skipping-of-run-check-for-IPC_RMID_DEFER.patch, upstream: [4] [1]:3468c67fe9[2]:ab2c5ee21e[3]:03a820b173[4]:1bec56ea8aSigned-off-by: Thomas Devoogdt <thomas@devoogdt.com> [Arnout: fix patch so it has fuzz 0] Signed-off-by: Arnout Vandecappelle <arnout@mind.be>
This commit is contained in:
Thomas Devoogdt
committed by
Arnout Vandecappelle
Arnout Vandecappelle
parent
1fa58814c0
commit
f041540ef5
@@ -387,8 +387,6 @@ package/c-icap/0001-Required-fixes-to-compile-and-run-under-cygwin.patch lib_pat
|
||||
package/c-icap/S96cicap Shellcheck lib_sysv.Indent lib_sysv.Variables
|
||||
package/ca-certificates/0001-mozilla-certdata2pem.py-make-cryptography-module-opt.patch lib_patch.Upstream
|
||||
package/cache-calibrator/0001-Fix-conflicting-round-function.patch lib_patch.Upstream
|
||||
package/cairo/0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch lib_patch.Upstream
|
||||
package/cairo/0002-Fix-mask-usage-in-image-compositor.patch lib_patch.Upstream
|
||||
package/caps/0001-Fix-stdint-types-with-musl.patch lib_patch.Upstream
|
||||
package/cdrkit/0001-fix-build-with-uClibc.patch lib_patch.Upstream
|
||||
package/cdrkit/0002-define-__THROW-to-avoid-build-issue-with-musl.patch lib_patch.Upstream
|
||||
|
||||
@@ -1,39 +0,0 @@
|
||||
From ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0 Mon Sep 17 00:00:00 2001
|
||||
From: Heiko Lewin <hlewin@gmx.de>
|
||||
Date: Sun, 1 Aug 2021 11:16:03 +0000
|
||||
Subject: [PATCH] _arc_max_angle_for_tolerance_normalized: fix infinite loop
|
||||
|
||||
[Retrieved from:
|
||||
https://gitlab.freedesktop.org/cairo/cairo/-/commit/ab2c5ee21e5f3d3ee4b3f67cfcd5811a4f99c3a0]
|
||||
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
|
||||
---
|
||||
src/cairo-arc.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/cairo-arc.c b/src/cairo-arc.c
|
||||
index 390397bae..1c891d1a0 100644
|
||||
--- a/src/cairo-arc.c
|
||||
+++ b/src/cairo-arc.c
|
||||
@@ -90,16 +90,18 @@ _arc_max_angle_for_tolerance_normalized (double tolerance)
|
||||
{ M_PI / 11.0, 9.81410988043554039085e-09 },
|
||||
};
|
||||
int table_size = ARRAY_LENGTH (table);
|
||||
+ const int max_segments = 1000; /* this value is chosen arbitrarily. this gives an error of about 1.74909e-20 */
|
||||
|
||||
for (i = 0; i < table_size; i++)
|
||||
if (table[i].error < tolerance)
|
||||
return table[i].angle;
|
||||
|
||||
++i;
|
||||
+
|
||||
do {
|
||||
angle = M_PI / i++;
|
||||
error = _arc_error_normalized (angle);
|
||||
- } while (error > tolerance);
|
||||
+ } while (error > tolerance && i < max_segments);
|
||||
|
||||
return angle;
|
||||
}
|
||||
--
|
||||
2.38.1
|
||||
|
||||
@@ -1,56 +0,0 @@
|
||||
From 03a820b173ed1fdef6ff14b4468f5dbc02ff59be Mon Sep 17 00:00:00 2001
|
||||
From: Heiko Lewin <heiko.lewin@worldiety.de>
|
||||
Date: Tue, 15 Dec 2020 16:48:19 +0100
|
||||
Subject: [PATCH] Fix mask usage in image-compositor
|
||||
|
||||
[Retrieved from
|
||||
https://gitlab.freedesktop.org/cairo/cairo/-/commit/03a820b173ed1fdef6ff14b4468f5dbc02ff59be]
|
||||
[Removed changes in test/ directory to remove binary diff so that the
|
||||
patch can be applied by `patch` tool]
|
||||
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
|
||||
---
|
||||
src/cairo-image-compositor.c | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/cairo-image-compositor.c b/src/cairo-image-compositor.c
|
||||
index bbf4cf228..2352c478e 100644
|
||||
--- a/src/cairo-image-compositor.c
|
||||
+++ b/src/cairo-image-compositor.c
|
||||
@@ -2601,14 +2601,14 @@ _inplace_src_spans (void *abstract_renderer, int y, int h,
|
||||
unsigned num_spans)
|
||||
{
|
||||
cairo_image_span_renderer_t *r = abstract_renderer;
|
||||
- uint8_t *m;
|
||||
+ uint8_t *m, *base = (uint8_t*)pixman_image_get_data(r->mask);
|
||||
int x0;
|
||||
|
||||
if (num_spans == 0)
|
||||
return CAIRO_STATUS_SUCCESS;
|
||||
|
||||
x0 = spans[0].x;
|
||||
- m = r->_buf;
|
||||
+ m = base;
|
||||
do {
|
||||
int len = spans[1].x - spans[0].x;
|
||||
if (len >= r->u.composite.run_length && spans[0].coverage == 0xff) {
|
||||
@@ -2646,7 +2646,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h,
|
||||
spans[0].x, y,
|
||||
spans[1].x - spans[0].x, h);
|
||||
|
||||
- m = r->_buf;
|
||||
+ m = base;
|
||||
x0 = spans[1].x;
|
||||
} else if (spans[0].coverage == 0x0) {
|
||||
if (spans[0].x != x0) {
|
||||
@@ -2675,7 +2675,7 @@ _inplace_src_spans (void *abstract_renderer, int y, int h,
|
||||
#endif
|
||||
}
|
||||
|
||||
- m = r->_buf;
|
||||
+ m = base;
|
||||
x0 = spans[1].x;
|
||||
} else {
|
||||
*m++ = spans[0].coverage;
|
||||
--
|
||||
2.38.1
|
||||
|
||||
@@ -28,7 +28,7 @@ diff --git a/meson.build b/meson.build
|
||||
index 9efe91978..6a670bf94 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -267,7 +267,7 @@ if x11_dep.found() and xext_dep.found()
|
||||
@@ -369,7 +369,7 @@ if x11_dep.found() and xext_dep.found()
|
||||
|
||||
# Can skip the run check by providing the result in a cross file or
|
||||
# native file as bool property value.
|
||||
@@ -36,6 +36,6 @@ index 9efe91978..6a670bf94 100644
|
||||
+ prop = meson.get_external_property('ipc_rmid_deferred_release', meson.is_cross_build() ? 'false' : 'auto')
|
||||
# We don't know the type of prop (bool, string) but need to differentiate
|
||||
# between a set value (bool) or the fallback value (string), so convert to
|
||||
# a string and chec the string value.
|
||||
# a string and check the string value.
|
||||
--
|
||||
2.34.1
|
||||
@@ -1,62 +0,0 @@
|
||||
From 39cbc3c1f1caf558188bd2203c976bae8de2f6a7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
|
||||
Date: Thu, 25 Feb 2021 10:52:45 +0000
|
||||
Subject: [PATCH] meson: allow skipping of run check for
|
||||
IPC_RMID_DEFERRED_RELEASE
|
||||
|
||||
The run check is particularly annoying in cross-compile scenarios,
|
||||
so allow bypassing the check by having the user provide the value
|
||||
via a cross file or native file:
|
||||
|
||||
[properties]
|
||||
ipc_rmid_deferred_release = true
|
||||
|
||||
Closes #408
|
||||
|
||||
Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/commit/1bec56ea8a931e1ae1c74cc740134497ec365267
|
||||
Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
|
||||
---
|
||||
meson.build | 25 ++++++++++++++++++++-----
|
||||
1 file changed, 20 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/meson.build b/meson.build
|
||||
index b159b4071..5f593e54d 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -264,13 +264,28 @@ if x11_dep.found() and xext_dep.found()
|
||||
['X11/extensions/shmstr.h', {'extra-headers': extra_headers}],
|
||||
]
|
||||
deps += [x11_dep, xext_dep]
|
||||
- res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'),
|
||||
- dependencies: [x11_dep, xext_dep],
|
||||
- name: 'shmctl IPC_RMID allowes subsequent attaches')
|
||||
|
||||
- if res.returncode() == 0
|
||||
- conf.set('IPC_RMID_DEFERRED_RELEASE', 1)
|
||||
+ # Can skip the run check by providing the result in a cross file or
|
||||
+ # native file as bool property value.
|
||||
+ prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto')
|
||||
+ # We don't know the type of prop (bool, string) but need to differentiate
|
||||
+ # between a set value (bool) or the fallback value (string), so convert to
|
||||
+ # a string and chec the string value.
|
||||
+ prop_str = '@0@'.format(prop)
|
||||
+ if prop_str in ['true', 'false']
|
||||
+ ipc_rmid_deferred_release = (prop_str == 'true')
|
||||
+ message('IPC_RMID_DEFERRED_RELEASE:', ipc_rmid_deferred_release)
|
||||
+ elif prop_str == 'auto'
|
||||
+ res = cc.run(files('meson-cc-tests/ipc_rmid_deferred_release.c'),
|
||||
+ dependencies: [x11_dep, xext_dep],
|
||||
+ name: 'shmctl IPC_RMID allowes subsequent attaches')
|
||||
+
|
||||
+ ipc_rmid_deferred_release = (res.returncode() == 0)
|
||||
+ else
|
||||
+ error('Unexpected value for external property ipc_rmid_deferred_release: @0@'.format(prop_str))
|
||||
endif
|
||||
+
|
||||
+ conf.set10('IPC_RMID_DEFERRED_RELEASE', ipc_rmid_deferred_release)
|
||||
endif
|
||||
|
||||
if feature_conf.get('CAIRO_HAS_XLIB_SURFACE', 0) == 1
|
||||
--
|
||||
2.34.1
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
# From https://www.cairographics.org/snapshots/cairo-1.17.4.tar.xz.sha1
|
||||
sha1 68712ae1039b114347be3b7200bc1c901d47a636 cairo-1.17.4.tar.xz
|
||||
# Calculated based on the hash above
|
||||
sha256 74b24c1ed436bbe87499179a3b27c43f4143b8676d8ad237a6fa787401959705 cairo-1.17.4.tar.xz
|
||||
# From https://www.cairographics.org/releases/cairo-1.18.0.tar.xz.sha256sum
|
||||
sha256 243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64 cairo-1.18.0.tar.xz
|
||||
|
||||
# Hash for license files:
|
||||
sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING
|
||||
|
||||
@@ -4,19 +4,14 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
CAIRO_VERSION = 1.17.4
|
||||
CAIRO_VERSION = 1.18.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/snapshots
|
||||
CAIRO_SITE = http://cairographics.org/releases
|
||||
CAIRO_INSTALL_STAGING = YES
|
||||
|
||||
# 0001-_arc_max_angle_for_tolerance_normalized-fix-infinite.patch
|
||||
CAIRO_IGNORE_CVES += CVE-2019-6462
|
||||
# 0002-Fix-mask-usage-in-image-compositor.patch
|
||||
CAIRO_IGNORE_CVES += CVE-2020-35492
|
||||
|
||||
CAIRO_CFLAGS = $(TARGET_CFLAGS)
|
||||
CAIRO_LDFLAGS = $(TARGET_LDFLAGS)
|
||||
|
||||
@@ -32,9 +27,13 @@ CAIRO_LDFLAGS += -latomic
|
||||
endif
|
||||
|
||||
CAIRO_CONF_OPTS = \
|
||||
-Ddwrite=disabled \
|
||||
-Dfontconfig=enabled \
|
||||
-Dquartz=disabled \
|
||||
-Dtests=disabled \
|
||||
-Dspectre=disabled \
|
||||
-Dsymbol-lookup=disabled \
|
||||
-Dgtk_doc=false \
|
||||
-Dc_std=gnu11
|
||||
CAIRO_DEPENDENCIES = \
|
||||
host-pkgconf \
|
||||
@@ -43,9 +42,11 @@ CAIRO_DEPENDENCIES = \
|
||||
|
||||
# Just the bare minimum to make other host-* packages happy
|
||||
HOST_CAIRO_CONF_OPTS = \
|
||||
-Ddwrite=disabled \
|
||||
-Dfontconfig=enabled \
|
||||
-Dfreetype=enabled \
|
||||
-Dpng=enabled \
|
||||
-Dquartz=disabled \
|
||||
-Dtee=disabled \
|
||||
-Dxcb=disabled \
|
||||
-Dxlib=disabled \
|
||||
@@ -53,6 +54,8 @@ HOST_CAIRO_CONF_OPTS = \
|
||||
-Dtests=disabled \
|
||||
-Dglib=enabled \
|
||||
-Dspectre=disabled \
|
||||
-Dsymbol-lookup=disabled \
|
||||
-Dgtk_doc=false \
|
||||
-Dc_std=gnu11
|
||||
HOST_CAIRO_DEPENDENCIES = \
|
||||
host-freetype \
|
||||
@@ -82,10 +85,10 @@ CAIRO_CONF_OPTS += -Dglib=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XORG7),y)
|
||||
CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled
|
||||
CAIRO_CONF_OPTS += -Dxcb=enabled -Dxlib=enabled -Dxlib-xcb=enabled
|
||||
CAIRO_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXrender
|
||||
else
|
||||
CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled
|
||||
CAIRO_CONF_OPTS += -Dxcb=disabled -Dxlib=disabled -Dxlib-xcb=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_CAIRO_PNG),y)
|
||||
|
||||
Reference in New Issue
Block a user