diff options
| author | Emmanuele Bassi <ebassi@gmail.com> | 2021-04-09 11:50:31 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gmail.com> | 2021-04-09 11:50:31 +0000 |
| commit | 58990cb005dceb432023a2d7fb0caa23a99dfa26 (patch) | |
| tree | 2c679db94d17e88d9f3e34b7c540136cbfbd32de | |
| parent | 09ebed75d5680dcb72cdcec6ced469773399bdd7 (diff) | |
| parent | 294bc6634ee5637272f61fa3a2d3277d50c1dd45 (diff) | |
| download | gdk-pixbuf-58990cb005dceb432023a2d7fb0caa23a99dfa26.tar.gz | |
Merge branch 'ebassi/older-meson' into 'master'
Revert "build: Use a dict for pkg-config file variables"
See merge request GNOME/gdk-pixbuf!113
| -rw-r--r-- | gdk-pixbuf/meson.build | 22 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 11 insertions, 13 deletions
diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build index 49c7d4a95..8b0590b05 100644 --- a/gdk-pixbuf/meson.build +++ b/gdk-pixbuf/meson.build @@ -366,23 +366,21 @@ else loaders_dep = declare_dependency() endif -pkg_variables = { - 'bindir': '${prefix}/@0@'.format(get_option('bindir')), - 'gdk_pixbuf_binary_version': gdk_pixbuf_binary_version, - 'gdk_pixbuf_binarydir': '${libdir}/@0@/@1@'.format(gdk_pixbuf_api_name, gdk_pixbuf_binary_version), - 'gdk_pixbuf_moduledir': '${gdk_pixbuf_binarydir}/loaders', - 'gdk_pixbuf_cache_file': '${gdk_pixbuf_binarydir}/loaders.cache', - 'gdk_pixbuf_csource': '${bindir}/gdk-pixbuf-csource', - 'gdk_pixbuf_pixdata': '${bindir}/gdk-pixbuf-pixdata', - 'gdk_pixbuf_query_loaders': '${bindir}/gdk-pixbuf-query-loaders', -} - pkgconfig = import('pkgconfig') pkgconfig.generate( gdkpixbuf, name: 'GdkPixbuf', description: 'Image loading and scaling', - variables: pkg_variables, + variables: [ + 'bindir=${prefix}/@0@'.format(get_option('bindir')), + 'gdk_pixbuf_binary_version=@0@'.format(gdk_pixbuf_binary_version), + 'gdk_pixbuf_binarydir=${libdir}/@0@/@1@'.format(gdk_pixbuf_api_name, gdk_pixbuf_binary_version), + 'gdk_pixbuf_moduledir=${gdk_pixbuf_binarydir}/loaders', + 'gdk_pixbuf_cache_file=${gdk_pixbuf_binarydir}/loaders.cache', + 'gdk_pixbuf_csource=${bindir}/gdk-pixbuf-csource', + 'gdk_pixbuf_pixdata=${bindir}/gdk-pixbuf-pixdata', + 'gdk_pixbuf_query_loaders=${bindir}/gdk-pixbuf-query-loaders', + ], requires: 'gobject-2.0', subdirs: gdk_pixbuf_api_name, filebase: gdk_pixbuf_api_name, diff --git a/meson.build b/meson.build index 0241fcde0..70074e912 100644 --- a/meson.build +++ b/meson.build @@ -6,7 +6,7 @@ project('gdk-pixbuf', 'c', 'warning_level=1', 'c_std=gnu99', ], - meson_version: '>= 0.56.0', + meson_version: '>= 0.55.3', ) add_project_arguments([ '-D_POSIX_C_SOURCE=200809L', '-D_DEFAULT_SOURCE', '-D_XOPEN_SOURCE=700' ], language: 'c') |