mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-25 19:21:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

cairo.wrap: Update to 1.18.2 and fix MSYS2 build

Browse source 
See 33173d9f1a

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7848>
This commit is contained in:
L. E. Segovia 2024-11-06 12:50:01 -03:00 committed by GStreamer Marge Bot
parent abd9fc5635
commit dd1da457a6
2 changed files with 31 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
subprojects/cairo.wrap
View file

@ -1,10 +1,10 @@
[wrap-file] [wrap-file]
directory = cairo-1.18.0 directory = cairo-1.18.2
source_url = https://www.cairographics.org/releases/cairo-1.18.0.tar.xz source_url = https://www.cairographics.org/releases/cairo-1.18.2.tar.xz
source_filename = cairo-1.18.0.tar.xz source_filename = cairo-1.18.2.tar.xz
source_hash = 243a0736b978a33dee29f9cca7521733b78a65b5418206fef7bd1c3d4cf10b64 source_hash = a62b9bb42425e844cc3d6ddde043ff39dbabedd1542eba57a2eb79f85889d45a
source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/cairo_1.18.0-1/cairo-1.18.0.tar.xz source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/cairo_1.18.2-1/cairo-1.18.2.tar.xz
wrapdb_version = 1.18.0-1 wrapdb_version = 1.18.2-1
diff_files = cairo-1.18.2/0001-dwrite-Fix-build-with-MinGW-11.patch diff_files = cairo-1.18.2/0001-dwrite-Fix-build-with-MinGW-11.patch
[provide] [provide]

29
subprojects/packagefiles/cairo-1.18.2/0001-dwrite-Fix-build-with-MinGW-11.patch
View file

@ -1,4 +1,4 @@
From 50d78e8c788cb791138e07fec25fdf0ee091ac8e Mon Sep 17 00:00:00 2001 From 0835add95c1391164e52c551569a9c46a6fcd90c Mon Sep 17 00:00:00 2001
From: Nirbheek Chauhan <nirbheek@centricular.com> From: Nirbheek Chauhan <nirbheek@centricular.com>
Date: Fri, 18 Oct 2024 02:36:48 +0530 Date: Fri, 18 Oct 2024 02:36:48 +0530
Subject: [PATCH] dwrite: Fix build with MinGW 11 Subject: [PATCH] dwrite: Fix build with MinGW 11
@ -20,9 +20,30 @@ C:/msys64/ucrt64/include/dcommon.h:67:1: note: 'DWRITE_GLYPH_IMAGE_FORMATS opera
67 | DEFINE_ENUM_FLAG_OPERATORS(DWRITE_GLYPH_IMAGE_FORMATS) 67 | DEFINE_ENUM_FLAG_OPERATORS(DWRITE_GLYPH_IMAGE_FORMATS)
| ^~~~~~~~~~~~~~~~~~~~~~~~~~ | ^~~~~~~~~~~~~~~~~~~~~~~~~~
--- ---
src/win32/dw-extra.h | 2 ++ src/win32/cairo-dwrite-font.cpp | 4 ++--
1 file changed, 2 insertions(+) src/win32/dw-extra.h | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/win32/cairo-dwrite-font.cpp b/src/win32/cairo-dwrite-font.cpp
index b6931b367..f7d1c4767 100644
--- a/src/win32/cairo-dwrite-font.cpp
+++ b/src/win32/cairo-dwrite-font.cpp
@@ -1047,13 +1047,13 @@ _cairo_dwrite_scaled_font_init_glyph_color_surface(cairo_dwrite_scaled_font_t *s
matrix = _cairo_dwrite_matrix_from_matrix(&scaled_font->mat);
/* The list of glyph image formats this renderer is prepared to support. */
- DWRITE_GLYPH_IMAGE_FORMATS supported_formats =
+ DWRITE_GLYPH_IMAGE_FORMATS supported_formats = static_cast<DWRITE_GLYPH_IMAGE_FORMATS>(
DWRITE_GLYPH_IMAGE_FORMATS_COLR |
DWRITE_GLYPH_IMAGE_FORMATS_SVG |
DWRITE_GLYPH_IMAGE_FORMATS_PNG |
DWRITE_GLYPH_IMAGE_FORMATS_JPEG |
DWRITE_GLYPH_IMAGE_FORMATS_TIFF |
- DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8;
+ DWRITE_GLYPH_IMAGE_FORMATS_PREMULTIPLIED_B8G8R8A8);
RefPtr<IDWriteFontFace2> fontFace2;
UINT32 palette_count = 0;
diff --git a/src/win32/dw-extra.h b/src/win32/dw-extra.h diff --git a/src/win32/dw-extra.h b/src/win32/dw-extra.h
index 424fb606d..a9daced21 100644 index 424fb606d..a9daced21 100644
--- a/src/win32/dw-extra.h --- a/src/win32/dw-extra.h
@ -37,5 +58,5 @@ index 424fb606d..a9daced21 100644
#endif /* DWRITE_EXTRA_H */ #endif /* DWRITE_EXTRA_H */
-- --
2.45.2 GitLab