From a6175b65029c3ae01e9da8a1071863aff22aaf7b Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 7 Apr 2021 17:56:41 +0100 Subject: Build PNG and JPEG loaders into gdk-pixbuf by default GdkPixbuf without PNG and JPEG loaders is less than useful for loading assets in GTK (and anywhere else, really). We go to great lengths to ensure that both the PNG and JPEG loaders are built by default, to the point of including subprojects for libpng and libjpeg. Let's avoid any doubt, and ensure that those loaders are also included in the default shared library. --- meson.build | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meson.build b/meson.build index 43a88a6cf..286f17c2d 100644 --- a/meson.build +++ b/meson.build @@ -237,6 +237,10 @@ else endif gdk_pixbuf_conf.set('USE_GMODULE', build_modules) +# We want these loaders to be built into gdk-pixbuf unless +# the builtin_loaders option specifies otherwise +default_builtin_loaders = [ 'png', 'jpeg' ] + # Check which loaders should be built into gdk-pixbuf builtin_loaders = get_option('builtin_loaders').split(',') @@ -245,6 +249,8 @@ builtin_loaders = get_option('builtin_loaders').split(',') builtin_all_loaders = false if builtin_loaders == [ 'all' ] builtin_all_loaders = true +elif builtin_loaders == [ 'default' ] + builtin_loaders = default_builtin_loaders elif builtin_loaders == [ 'none' ] builtin_loaders = [] endif -- cgit v1.2.1