openRuyi-tutorials/buildroot
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/cairo: bump to 1.18.4

Browse Source 
News:
- https://www.cairographics.org/news/cairo-1.18.4/

Other changes:
- 0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch
  has been dropped because it's upstream. [1]

- c_std=gnu11 override has been dropped because
  it's upstream. [2]

- Use the new 'lzo' option. [3]

[1] 9607e19a9e
[2] b60f47dfd5
[3] c1748e79f0

Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Thomas Devoogdt
2025-03-29 21:03:53 +01:00
committed by Julien Olivain
parent b896dca532
commit 90bbe4f469
3 changed files with 8 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
package/cairo/0001-cairo-ft-private.h-fix-missing-FT_Color-error.patch
View File

@@ -1,32 +0,0 @@
From da698db0c20507f0e07492cbe40dbaf1c9053f71 Mon Sep 17 00:00:00 2001
From: Thomas Devoogdt <thomas@devoogdt.com>
Date: Sun, 12 Nov 2023 09:58:05 +0100
Subject: [PATCH] cairo-ft-private.h: fix missing FT_Color error
In file included from ../src/cairo-colr-glyph-render.c:37:
../src/cairo-ft-private.h:87:30: error: unknown type name 'FT_Color'
87 | FT_Color *palette,
| ^~~~~~~~
Upstream: https://gitlab.freedesktop.org/cairo/cairo/-/issues/792
Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
---
src/cairo-ft-private.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/cairo-ft-private.h b/src/cairo-ft-private.h
index 836f7e523..6b0e30223 100644
--- a/src/cairo-ft-private.h
+++ b/src/cairo-ft-private.h
@@ -43,6 +43,8 @@
#if CAIRO_HAS_FT_FONT
+#include FT_COLOR_H
+
CAIRO_BEGIN_DECLS
typedef struct _cairo_ft_unscaled_font cairo_ft_unscaled_font_t;
--
2.34.1

4
package/cairo/cairo.hash
View File

@@ -1,5 +1,5 @@
# From https://www.cairographics.org/releases/cairo-1.18.2.tar.xz.sha256sum
sha256 a62b9bb42425e844cc3d6ddde043ff39dbabedd1542eba57a2eb79f85889d45a cairo-1.18.2.tar.xz
# From https://www.cairographics.org/releases/cairo-1.18.4.tar.xz.sha256sum
sha256 445ed8208a6e4823de1226a74ca319d3600e83f6369f99b14265006599c32ccb cairo-1.18.4.tar.xz
# Hash for license files:
sha256 67228a9f7c5f9b67c58f556f1be178f62da4d9e2e6285318d8c74d567255abdf COPYING

11
package/cairo/cairo.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
CAIRO_VERSION = 1.18.2
CAIRO_VERSION = 1.18.4
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
@@ -37,8 +37,7 @@ CAIRO_CONF_OPTS = \
-Dtests=disabled \
-Dspectre=disabled \
-Dsymbol-lookup=disabled \
-Dgtk_doc=false \
-Dc_std=gnu11
-Dgtk_doc=false
CAIRO_DEPENDENCIES = \
host-pkgconf \
fontconfig \
@@ -59,8 +58,7 @@ HOST_CAIRO_CONF_OPTS = \
-Dglib=enabled \
-Dspectre=disabled \
-Dsymbol-lookup=disabled \
-Dgtk_doc=false \
-Dc_std=gnu11
-Dgtk_doc=false
HOST_CAIRO_DEPENDENCIES = \
host-freetype \
host-fontconfig \
@@ -71,7 +69,10 @@ HOST_CAIRO_DEPENDENCIES = \
host-zlib
ifeq ($(BR2_PACKAGE_LZO),y)
CAIRO_CONF_OPTS += -Dlzo=enabled
CAIRO_DEPENDENCIES += lzo
else
CAIRO_CONF_OPTS += -Dlzo=disabled
endif
ifeq ($(BR2_PACKAGE_FREETYPE),y)