summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChangqing Li <changqing.li@windriver.com>2024-11-12 11:15:15 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-11-19 11:26:24 +0000
commitb6f5bc7bc79cec7b0adc1b1540d9f43e015241f7 (patch)
tree1899e41c66735b34d4f8beac1693246c6dc8bb8d
parentb5b4fad3e9ba828d411e32229e8a20a171954968 (diff)
downloadpoky-b6f5bc7bc79cec7b0adc1b1540d9f43e015241f7.tar.gz
gdk-pixbuf: enable other loaders by default
Refer [1], upstream gdk-pixbuf disable some loaders by default from 2.42.11, this makes some format of icons not works well after upgrade gdk-pixbuf, report error like: matchbox-deskto[501]: Error loading icon: Failed to load /usr/share/pixmaps/xinput_calibrator.xpm: Unrecognized image file format Add PACKAGECONFIG gif, others, and fix the same as some other sdks and arch linux, disable these loaders by default, refer [2][3][4] [1] https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/e052a112075a19fb75f1f2ff3de4c82923de13f2 [2] https://gitlab.gnome.org/GNOME/gnome-build-meta/-/issues/846 [3] https://gitlab.com/freedesktop-sdk/freedesktop-sdk/-/commit/3ab7810255c64ce8aa2ae3ac10250148588ab49b [4] https://gitlab.archlinux.org/archlinux/packaging/packages/gdk-pixbuf2/-/commit/4fa2d98a197781354b66a9710c9d596d502c961b (From OE-Core rev: 10ea616e0aa0921e02c00689df5a7f2ec5e2b7ce) Signed-off-by: Changqing Li <changqing.li@windriver.com> Signed-off-by: Mathieu Dubois-Briand <mathieu.dubois-briand@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.12.bb4
1 files changed, 3 insertions, 1 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 9f825a68ef..e32903a451 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
@@ -32,7 +32,7 @@ GIR_MESON_DISABLE_FLAG = "disabled"
32 32
33LIBV = "2.10.0" 33LIBV = "2.10.0"
34 34
35GDK_PIXBUF_LOADERS ?= "png jpeg" 35GDK_PIXBUF_LOADERS ?= "png jpeg gif others"
36 36
37PACKAGECONFIG = "${GDK_PIXBUF_LOADERS} \ 37PACKAGECONFIG = "${GDK_PIXBUF_LOADERS} \
38 ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" 38 ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}"
@@ -41,6 +41,8 @@ PACKAGECONFIG:class-native = "${GDK_PIXBUF_LOADERS}"
41PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng" 41PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng"
42PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg" 42PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,jpeg"
43PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff" 43PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff"
44PACKAGECONFIG[gif] = "-Dgif=enabled,-Dgif=disabled"
45PACKAGECONFIG[others] = "-Dothers=enabled,-Dothers=disabled"
44PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" 46PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false"
45 47
46EXTRA_OEMESON = "-Dman=false" 48EXTRA_OEMESON = "-Dman=false"