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 <[email protected]>
---
.../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
}
--
2.43.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#227977):
https://lists.openembedded.org/g/openembedded-core/message/227977
Mute This Topic: https://lists.openembedded.org/mt/116811764/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
