Signed-off-by: Alexander Kanavin <a...@linutronix.de> --- ...GdkPixbufRGBA-start-naming-types-and.patch | 81 ++++++++++++++ .../librsvg/0002-New-ToPixel-trait.patch | 100 ++++++++++++++++++ .../librsvg/0003-New-ToCairoARGB-trait.patch | 81 ++++++++++++++ .../0004-impl-ToPixel-for-CairoARGB.patch | 49 +++++++++ meta/recipes-gnome/librsvg/librsvg_2.52.0.bb | 10 +- 5 files changed, 318 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-gnome/librsvg/librsvg/0001-GdkPixbufRGBA-ToGdkPixbufRGBA-start-naming-types-and.patch create mode 100644 meta/recipes-gnome/librsvg/librsvg/0002-New-ToPixel-trait.patch create mode 100644 meta/recipes-gnome/librsvg/librsvg/0003-New-ToCairoARGB-trait.patch create mode 100644 meta/recipes-gnome/librsvg/librsvg/0004-impl-ToPixel-for-CairoARGB.patch
diff --git a/meta/recipes-gnome/librsvg/librsvg/0001-GdkPixbufRGBA-ToGdkPixbufRGBA-start-naming-types-and.patch b/meta/recipes-gnome/librsvg/librsvg/0001-GdkPixbufRGBA-ToGdkPixbufRGBA-start-naming-types-and.patch new file mode 100644 index 00000000000..6935403138c --- /dev/null +++ b/meta/recipes-gnome/librsvg/librsvg/0001-GdkPixbufRGBA-ToGdkPixbufRGBA-start-naming-types-and.patch @@ -0,0 +1,81 @@ +From c175ac8344aa465ffc2c2f3a9d02a7889f597f7f Mon Sep 17 00:00:00 2001 +From: Federico Mena Quintero <feder...@gnome.org> +Date: Tue, 21 Sep 2021 12:05:27 -0500 +Subject: [PATCH] GdkPixbufRGBA, ToGdkPixbufRGBA - start naming types and + conversion traits for pixel formats + +The code assumes that struct Pixel is always the layout that GdkPixbuf +uses. This is true right now, but is a hidden assumption. Let's +start giving better names to pixel formats. + +Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/592> +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <a...@linutronix.de> +--- + src/surface_utils/mod.rs | 23 +++++++++++++++++++++++ + src/surface_utils/shared_surface.rs | 4 ++-- + 2 files changed, 25 insertions(+), 2 deletions(-) + +diff --git a/src/surface_utils/mod.rs b/src/surface_utils/mod.rs +index 53bbd00bb..93d3b4f79 100644 +--- a/src/surface_utils/mod.rs ++++ b/src/surface_utils/mod.rs +@@ -22,6 +22,9 @@ use rgb::alt::ARGB8; + #[allow(clippy::upper_case_acronyms)] + pub type CairoARGB = ARGB8; + ++/// GdkPixbuf's endian-independent RGBA8 pixel layout. ++pub type GdkPixbufRGBA = rgb::RGBA8; ++ + /// Analogous to `rgb::FromSlice`, to convert from `[T]` to `[CairoARGB]` + #[allow(clippy::upper_case_acronyms)] + pub trait AsCairoARGB<T: Copy> { +@@ -57,6 +60,26 @@ pub enum EdgeMode { + None, + } + ++/// Trait to convert pixels in various formats to RGBA, for GdkPixbuf. ++/// ++/// GdkPixbuf unconditionally uses RGBA ordering regardless of endianness, ++/// but we need to convert to it from Cairo's endian-dependent 0xaarrggbb. ++pub trait ToGdkPixbufRGBA { ++ fn to_pixbuf_rgba(&self) -> GdkPixbufRGBA; ++} ++ ++impl ToGdkPixbufRGBA for Pixel { ++ #[inline] ++ fn to_pixbuf_rgba(&self) -> GdkPixbufRGBA { ++ GdkPixbufRGBA { ++ r: self.r, ++ g: self.g, ++ b: self.b, ++ a: self.a, ++ } ++ } ++} ++ + /// Extension methods for `cairo::ImageSurfaceData`. + pub trait ImageSurfaceDataExt: DerefMut<Target = [u8]> { + /// Sets the pixel at the given coordinates. Assumes the `ARgb32` format. +diff --git a/src/surface_utils/shared_surface.rs b/src/surface_utils/shared_surface.rs +index 9d3289230..476a6f776 100644 +--- a/src/surface_utils/shared_surface.rs ++++ b/src/surface_utils/shared_surface.rs +@@ -15,7 +15,7 @@ use crate::util::clamp; + + use super::{ + iterators::{PixelRectangle, Pixels}, +- AsCairoARGB, CairoARGB, EdgeMode, ImageSurfaceDataExt, Pixel, PixelOps, ++ AsCairoARGB, CairoARGB, EdgeMode, ImageSurfaceDataExt, Pixel, PixelOps, ToGdkPixbufRGBA, + }; + + /// Types of pixel data in a `ImageSurface`. +@@ -342,7 +342,7 @@ impl ImageSurface<Shared> { + .map(|row| row.as_rgba_mut()) + .zip(self.rows()) + .flat_map(|(dest_row, src_row)| src_row.iter().zip(dest_row.iter_mut())) +- .for_each(|(src, dest)| *dest = Pixel::from(*src).unpremultiply()); ++ .for_each(|(src, dest)| *dest = Pixel::from(*src).unpremultiply().to_pixbuf_rgba()); + + Some(pixbuf) + } diff --git a/meta/recipes-gnome/librsvg/librsvg/0002-New-ToPixel-trait.patch b/meta/recipes-gnome/librsvg/librsvg/0002-New-ToPixel-trait.patch new file mode 100644 index 00000000000..c71c93e1a1b --- /dev/null +++ b/meta/recipes-gnome/librsvg/librsvg/0002-New-ToPixel-trait.patch @@ -0,0 +1,100 @@ +From 47478d5a8a4b7a05b44f024404137c4c68b62b7e Mon Sep 17 00:00:00 2001 +From: Federico Mena Quintero <feder...@gnome.org> +Date: Tue, 21 Sep 2021 12:22:15 -0500 +Subject: [PATCH] New ToPixel trait + +Use it where we convert GdkPixbuf pixels to our own Pixel for premultiplication. + +Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/592> +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <a...@linutronix.de> +--- + src/surface_utils/mod.rs | 32 +++++++++++++++++++++++++++++ + src/surface_utils/shared_surface.rs | 5 +++-- + 2 files changed, 35 insertions(+), 2 deletions(-) + +diff --git a/src/surface_utils/mod.rs b/src/surface_utils/mod.rs +index 93d3b4f79..58953e6a0 100644 +--- a/src/surface_utils/mod.rs ++++ b/src/surface_utils/mod.rs +@@ -25,6 +25,9 @@ pub type CairoARGB = ARGB8; + /// GdkPixbuf's endian-independent RGBA8 pixel layout. + pub type GdkPixbufRGBA = rgb::RGBA8; + ++/// GdkPixbuf's packed RGB pixel layout. ++pub type GdkPixbufRGB = rgb::RGB8; ++ + /// Analogous to `rgb::FromSlice`, to convert from `[T]` to `[CairoARGB]` + #[allow(clippy::upper_case_acronyms)] + pub trait AsCairoARGB<T: Copy> { +@@ -68,6 +71,11 @@ pub trait ToGdkPixbufRGBA { + fn to_pixbuf_rgba(&self) -> GdkPixbufRGBA; + } + ++/// Trait to convert pixels in various formats to our own Pixel layout. ++pub trait ToPixel { ++ fn to_pixel(&self) -> Pixel; ++} ++ + impl ToGdkPixbufRGBA for Pixel { + #[inline] + fn to_pixbuf_rgba(&self) -> GdkPixbufRGBA { +@@ -80,6 +88,30 @@ impl ToGdkPixbufRGBA for Pixel { + } + } + ++impl ToPixel for GdkPixbufRGBA { ++ #[inline] ++ fn to_pixel(&self) -> Pixel { ++ Pixel { ++ r: self.r, ++ g: self.g, ++ b: self.b, ++ a: self.a, ++ } ++ } ++} ++ ++impl ToPixel for GdkPixbufRGB { ++ #[inline] ++ fn to_pixel(&self) -> Pixel { ++ Pixel { ++ r: self.r, ++ g: self.g, ++ b: self.b, ++ a: 255, ++ } ++ } ++} ++ + /// Extension methods for `cairo::ImageSurfaceData`. + pub trait ImageSurfaceDataExt: DerefMut<Target = [u8]> { + /// Sets the pixel at the given coordinates. Assumes the `ARgb32` format. +diff --git a/src/surface_utils/shared_surface.rs b/src/surface_utils/shared_surface.rs +index 476a6f776..9fa9a2e15 100644 +--- a/src/surface_utils/shared_surface.rs ++++ b/src/surface_utils/shared_surface.rs +@@ -16,6 +16,7 @@ use crate::util::clamp; + use super::{ + iterators::{PixelRectangle, Pixels}, + AsCairoARGB, CairoARGB, EdgeMode, ImageSurfaceDataExt, Pixel, PixelOps, ToGdkPixbufRGBA, ++ ToPixel, + }; + + /// Types of pixel data in a `ImageSurface`. +@@ -304,13 +305,13 @@ impl ImageSurface<Shared> { + .map(|row| row.as_rgba()) + .zip(surf.rows_mut()) + .flat_map(|(src_row, dest_row)| src_row.iter().zip(dest_row.iter_mut())) +- .for_each(|(src, dest)| *dest = src.premultiply().into()); ++ .for_each(|(src, dest)| *dest = src.to_pixel().premultiply().into()); + } else { + pixbuf_rows + .map(|row| row.as_rgb()) + .zip(surf.rows_mut()) + .flat_map(|(src_row, dest_row)| src_row.iter().zip(dest_row.iter_mut())) +- .for_each(|(src, dest)| *dest = src.alpha(0xff).into()); ++ .for_each(|(src, dest)| *dest = src.to_pixel().into()); + } + + if let (Some(content_type), Some(bytes)) = (content_type, mime_data) { diff --git a/meta/recipes-gnome/librsvg/librsvg/0003-New-ToCairoARGB-trait.patch b/meta/recipes-gnome/librsvg/librsvg/0003-New-ToCairoARGB-trait.patch new file mode 100644 index 00000000000..8dd45ef0a28 --- /dev/null +++ b/meta/recipes-gnome/librsvg/librsvg/0003-New-ToCairoARGB-trait.patch @@ -0,0 +1,81 @@ +From f5768df65cf6277e8ab687a84fdc5d9addaa373d Mon Sep 17 00:00:00 2001 +From: Federico Mena Quintero <feder...@gnome.org> +Date: Tue, 21 Sep 2021 12:49:53 -0500 +Subject: [PATCH] New ToCairoARGB trait + +Use it in the pixbuf-to-cairo-surface function. + +Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/592> +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <a...@linutronix.de> +--- + src/surface_utils/mod.rs | 17 +++++++++++++++++ + src/surface_utils/shared_surface.rs | 8 ++++---- + 2 files changed, 21 insertions(+), 4 deletions(-) + +diff --git a/src/surface_utils/mod.rs b/src/surface_utils/mod.rs +index 58953e6a0..3f915cd01 100644 +--- a/src/surface_utils/mod.rs ++++ b/src/surface_utils/mod.rs +@@ -76,6 +76,11 @@ pub trait ToPixel { + fn to_pixel(&self) -> Pixel; + } + ++/// Trait to convert pixels in various formats to Cairo's endian-dependent 0xaarrggbb. ++pub trait ToCairoARGB { ++ fn to_cairo_argb(&self) -> CairoARGB; ++} ++ + impl ToGdkPixbufRGBA for Pixel { + #[inline] + fn to_pixbuf_rgba(&self) -> GdkPixbufRGBA { +@@ -112,6 +117,18 @@ impl ToPixel for GdkPixbufRGB { + } + } + ++impl ToCairoARGB for Pixel { ++ #[inline] ++ fn to_cairo_argb(&self) -> CairoARGB { ++ CairoARGB { ++ r: self.r, ++ g: self.g, ++ b: self.b, ++ a: self.a, ++ } ++ } ++} ++ + /// Extension methods for `cairo::ImageSurfaceData`. + pub trait ImageSurfaceDataExt: DerefMut<Target = [u8]> { + /// Sets the pixel at the given coordinates. Assumes the `ARgb32` format. +diff --git a/src/surface_utils/shared_surface.rs b/src/surface_utils/shared_surface.rs +index 9fa9a2e15..34dfc992e 100644 +--- a/src/surface_utils/shared_surface.rs ++++ b/src/surface_utils/shared_surface.rs +@@ -15,8 +15,8 @@ use crate::util::clamp; + + use super::{ + iterators::{PixelRectangle, Pixels}, +- AsCairoARGB, CairoARGB, EdgeMode, ImageSurfaceDataExt, Pixel, PixelOps, ToGdkPixbufRGBA, +- ToPixel, ++ AsCairoARGB, CairoARGB, EdgeMode, ImageSurfaceDataExt, Pixel, PixelOps, ToCairoARGB, ++ ToGdkPixbufRGBA, ToPixel, + }; + + /// Types of pixel data in a `ImageSurface`. +@@ -305,13 +305,13 @@ impl ImageSurface<Shared> { + .map(|row| row.as_rgba()) + .zip(surf.rows_mut()) + .flat_map(|(src_row, dest_row)| src_row.iter().zip(dest_row.iter_mut())) +- .for_each(|(src, dest)| *dest = src.to_pixel().premultiply().into()); ++ .for_each(|(src, dest)| *dest = src.to_pixel().premultiply().to_cairo_argb()); + } else { + pixbuf_rows + .map(|row| row.as_rgb()) + .zip(surf.rows_mut()) + .flat_map(|(src_row, dest_row)| src_row.iter().zip(dest_row.iter_mut())) +- .for_each(|(src, dest)| *dest = src.to_pixel().into()); ++ .for_each(|(src, dest)| *dest = src.to_pixel().to_cairo_argb()); + } + + if let (Some(content_type), Some(bytes)) = (content_type, mime_data) { diff --git a/meta/recipes-gnome/librsvg/librsvg/0004-impl-ToPixel-for-CairoARGB.patch b/meta/recipes-gnome/librsvg/librsvg/0004-impl-ToPixel-for-CairoARGB.patch new file mode 100644 index 00000000000..caf81af5d00 --- /dev/null +++ b/meta/recipes-gnome/librsvg/librsvg/0004-impl-ToPixel-for-CairoARGB.patch @@ -0,0 +1,49 @@ +From c66987d6fa9f9e442eb7dac947f469bcf8c35d48 Mon Sep 17 00:00:00 2001 +From: Federico Mena Quintero <feder...@gnome.org> +Date: Tue, 21 Sep 2021 12:54:12 -0500 +Subject: [PATCH] impl ToPixel for CairoARGB + +Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/592> +Upstream-Status: Backport +Signed-off-by: Alexander Kanavin <a...@linutronix.de> +--- + src/surface_utils/mod.rs | 12 ++++++++++++ + src/surface_utils/shared_surface.rs | 2 +- + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/src/surface_utils/mod.rs b/src/surface_utils/mod.rs +index 3f915cd01..4f751ece4 100644 +--- a/src/surface_utils/mod.rs ++++ b/src/surface_utils/mod.rs +@@ -93,6 +93,18 @@ impl ToGdkPixbufRGBA for Pixel { + } + } + ++impl ToPixel for CairoARGB { ++ #[inline] ++ fn to_pixel(&self) -> Pixel { ++ Pixel { ++ r: self.r, ++ g: self.g, ++ b: self.b, ++ a: self.a, ++ } ++ } ++} ++ + impl ToPixel for GdkPixbufRGBA { + #[inline] + fn to_pixel(&self) -> Pixel { +diff --git a/src/surface_utils/shared_surface.rs b/src/surface_utils/shared_surface.rs +index 34dfc992e..20cd0f40b 100644 +--- a/src/surface_utils/shared_surface.rs ++++ b/src/surface_utils/shared_surface.rs +@@ -343,7 +343,7 @@ impl ImageSurface<Shared> { + .map(|row| row.as_rgba_mut()) + .zip(self.rows()) + .flat_map(|(dest_row, src_row)| src_row.iter().zip(dest_row.iter_mut())) +- .for_each(|(src, dest)| *dest = Pixel::from(*src).unpremultiply().to_pixbuf_rgba()); ++ .for_each(|(src, dest)| *dest = src.to_pixel().unpremultiply().to_pixbuf_rgba()); + + Some(pixbuf) + } diff --git a/meta/recipes-gnome/librsvg/librsvg_2.52.0.bb b/meta/recipes-gnome/librsvg/librsvg_2.52.0.bb index acd03101396..28b8bf2dcf2 100644 --- a/meta/recipes-gnome/librsvg/librsvg_2.52.0.bb +++ b/meta/recipes-gnome/librsvg/librsvg_2.52.0.bb @@ -16,9 +16,13 @@ BBCLASSEXTEND = "native" inherit gnomebase gtk-doc pixbufcache upstream-version-is-even gobject-introspection rust -SRC_URI += " file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch \ - file://0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch \ -" +SRC_URI += "file://0001-Makefile.am-pass-rust-target-to-cargo-also-when-not-.patch \ + file://0001-system-deps-src-lib.rs-do-not-probe-into-harcoded-li.patch \ + file://0001-GdkPixbufRGBA-ToGdkPixbufRGBA-start-naming-types-and.patch \ + file://0002-New-ToPixel-trait.patch \ + file://0003-New-ToCairoARGB-trait.patch \ + file://0004-impl-ToPixel-for-CairoARGB.patch \ + " SRC_URI[archive.sha256sum] = "bd821fb3e16494b61f5185addd23b726b064f203122b3ab4b3d5d7a44e6bf393" -- 2.20.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#156798): https://lists.openembedded.org/g/openembedded-core/message/156798 Mute This Topic: https://lists.openembedded.org/mt/86220693/21656 Group Owner: openembedded-core+ow...@lists.openembedded.org Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
