[gdk-pixbuf: 2/2] Merge branch 'meson-features' into 'master'

[Xavier Claessens <xclaesse src gnome org>]

commit 1095a0619d6ea6716240bcaa499a9f44a5f331e6
Merge: 1bfbff2a7 7305f1ee0
Author: Xavier Claessens <xclaesse gmail com>
Date:   Wed May 5 19:54:14 2021 +0000

    Merge branch 'meson-features' into 'master'
    
    Meson: Change png/jpeg/tiff options from boolean to feature
    
    See merge request GNOME/gdk-pixbuf!118

 .gitlab-ci.yml           |  2 +-
 .gitlab/ci/test-msys2.sh |  6 ++--
 meson.build              | 81 ++++++++++++++++++++++++++++++------------------
 meson_options.txt        | 12 +++----
 4 files changed, 60 insertions(+), 41 deletions(-)
---