From patchwork Tue Dec 16 16:10:00 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 76762 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C217FD609BB for ; Tue, 16 Dec 2025 16:10:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.26401.1765901407740769859 for ; Tue, 16 Dec 2025 08:10:07 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 1446EFEC for ; Tue, 16 Dec 2025 08:10:00 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D7F393F73F for ; Tue, 16 Dec 2025 08:10:06 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/2] gdk-pixbuf: small cleanups Date: Tue, 16 Dec 2025 16:10:00 +0000 Message-ID: <20251216161001.352088-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 Dec 2025 16:10:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/227977 Update homepage, as the wiki is mostly dead links. Optionally build the manpages. Remove the gdk-pixbuf-xlib package, as this was removed in 2.42[1] Enable/disable building the tests, not just installing the tests, to save build time if they're not needed. Fix some indentation which was using the wrong spacing. [1] gdk-pixbuf 3362e94c2 ("Remove obsolete Xlib helper library") Signed-off-by: Ross Burton --- .../gdk-pixbuf/gdk-pixbuf_2.42.12.bb | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb index 98993cc07d7..750098ba022 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb @@ -2,7 +2,7 @@ SUMMARY = "Image loading library for GTK+" DESCRIPTION = "The GDK Pixbuf library provides: Image loading and saving \ facilities, fast scaling and compositing of pixbufs and Simple animation \ loading (ie. animated GIFs)" -HOMEPAGE = "https://wiki.gnome.org/Projects/GdkPixbuf" +HOMEPAGE = "https://gitlab.gnome.org/GNOME/gdk-pixbuf" BUGTRACKER = "https://gitlab.gnome.org/GNOME/gdk-pixbuf/issues" LICENSE = "LGPL-2.1-or-later" @@ -16,7 +16,7 @@ DEPENDS = "glib-2.0 shared-mime-info" SRC_URI[archive.sha256sum] = "b9505b3445b9a7e48ced34760c3bcb73e966df3ac94c95a148cb669ab748e3c7" -inherit gettext gnomebase pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package +inherit gettext gnomebase pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package manpages SRC_URI += "\ file://run-ptest \ @@ -24,7 +24,7 @@ SRC_URI += "\ file://0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch \ " -GIR_MESON_OPTION = 'introspection' +GIR_MESON_OPTION = "introspection" GIR_MESON_ENABLE_FLAG = "enabled" GIR_MESON_DISABLE_FLAG = "disabled" @@ -38,18 +38,12 @@ PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg" PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff" PACKAGECONFIG[gif] = "-Dgif=enabled,-Dgif=disabled" PACKAGECONFIG[others] = "-Dothers=enabled,-Dothers=disabled" -PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" - -EXTRA_OEMESON = "-Dman=false" - -PACKAGES =+ "${PN}-xlib" +PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,python3-docutils-native" +PACKAGECONFIG[tests] = "-Dtests=true -Dinstalled_tests=true,-Dtests=false -Dinstalled_tests=false" # For GIO image type sniffing RDEPENDS:${PN} = "shared-mime-info" -FILES:${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}" -ALLOW_EMPTY:${PN}-xlib = "1" - FILES:${PN} += "${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders" FILES:${PN}-bin += "${datadir}/thumbnailers/gdk-pixbuf-thumbnailer.thumbnailer" @@ -57,7 +51,7 @@ FILES:${PN}-bin += "${datadir}/thumbnailers/gdk-pixbuf-thumbnailer.thumbnailer" FILES:${PN}-dev += " \ ${bindir}/gdk-pixbuf-csource \ ${bindir}/gdk-pixbuf-pixdata \ - ${bindir}/gdk-pixbuf-print-mime-types \ + ${bindir}/gdk-pixbuf-print-mime-types \ ${includedir}/* \ " @@ -85,9 +79,9 @@ do_install:append() { } do_install_ptest() { - # Remove a bad fuzzing attempt that sporadically fails without a way to reproduce + # Remove a bad fuzzing attempt that sporadically fails without a way to reproduce rm ${D}/${datadir}/installed-tests/gdk-pixbuf/pixbuf-randomly-modified.test - # https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/215 + # https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/issues/215 rm ${D}/${datadir}/installed-tests/gdk-pixbuf/pixbuf-jpeg.test } From patchwork Tue Dec 16 16:10:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 76763 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C11E6D609BA for ; Tue, 16 Dec 2025 16:10:16 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.26648.1765901408516231772 for ; Tue, 16 Dec 2025 08:10:08 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B0E011516 for ; Tue, 16 Dec 2025 08:10:00 -0800 (PST) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 80D143F73F for ; Tue, 16 Dec 2025 08:10:07 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/2] gdk-pixbuf: upgrade 2.42.12 -> 2.44.4 Date: Tue, 16 Dec 2025 16:10:01 +0000 Message-ID: <20251216161001.352088-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20251216161001.352088-1-ross.burton@arm.com> References: <20251216161001.352088-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Tue, 16 Dec 2025 16:10:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/227978 Upstream changes (subset): - Add glycin loader (a sandboxed rust image loading framework) - Deprecate the XPM-related API - The animation-related APIs have been deprecated - jpeg: Fix a crash related to icc data (CVE-2025-7345) - Prefer builtin modules Explicitly disable the glycin plugin for now, as we don't have a recipe for glycin yet. Explicitly disable the thumbnailer for now, this hasn't been built since 2.38[2] and would need more integration to work in cross builds. Use 'documentation' for the gi-docgen option[1]. [1] gdk-pixbuf ee5a35665 ("build: Add "documentation" configuration option") [2] gdk-pixbuf fc3770831 ("meson: don't build tests or the thumbnailer if cross building") since 2.38 Signed-off-by: Ross Burton --- ...on.build-allow-a-subset-of-tests-in-cross-compile.patch | 6 +++--- .../{gdk-pixbuf_2.42.12.bb => gdk-pixbuf_2.44.4.bb} | 7 ++++++- 2 files changed, 9 insertions(+), 4 deletions(-) rename meta/recipes-gnome/gdk-pixbuf/{gdk-pixbuf_2.42.12.bb => gdk-pixbuf_2.44.4.bb} (93%) diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch index 24edda81021..534f4e00765 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch @@ -33,9 +33,9 @@ index 3eb3fcc..dc7e790 100644 - if get_option('tests') - subdir('tests') - endif - subdir('thumbnailer') - endif - + thumbnailer_opt = get_option('thumbnailer').disable_auto_if(glycin_dep.found()) + if not thumbnailer_opt.disabled() + subdir('thumbnailer') diff --git a/tests/meson.build b/tests/meson.build index 3781066..911b5fb 100644 --- a/tests/meson.build diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.44.4.bb similarity index 93% rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.44.4.bb index 750098ba022..0c06bdda096 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.44.4.bb @@ -14,7 +14,7 @@ SECTION = "libs" DEPENDS = "glib-2.0 shared-mime-info" -SRC_URI[archive.sha256sum] = "b9505b3445b9a7e48ced34760c3bcb73e966df3ac94c95a148cb669ab748e3c7" +SRC_URI[archive.sha256sum] = "93a1aac3f1427ae73457397582a2c38d049638a801788ccbd5f48ca607bdbd17" inherit gettext gnomebase pixbufcache ptest-gnome upstream-version-is-even gobject-introspection gi-docgen lib_package manpages @@ -27,6 +27,7 @@ SRC_URI += "\ GIR_MESON_OPTION = "introspection" GIR_MESON_ENABLE_FLAG = "enabled" GIR_MESON_DISABLE_FLAG = "disabled" +GIDOCGEN_MESON_OPTION = "documentation" LIBV = "2.10.0" @@ -41,6 +42,10 @@ PACKAGECONFIG[others] = "-Dothers=enabled,-Dothers=disabled" PACKAGECONFIG[manpages] = "-Dman=true,-Dman=false,python3-docutils-native" PACKAGECONFIG[tests] = "-Dtests=true -Dinstalled_tests=true,-Dtests=false -Dinstalled_tests=false" +# Disable glycin whilst we have no recipe yet +# Disable the thumbnailers as they don't build in cross +EXTRA_OEMESON = "-Dglycin=disabled -Dthumbnailer=disabled" + # For GIO image type sniffing RDEPENDS:${PN} = "shared-mime-info"