1
0
Fork 0

cogl/gir: Depend explicitly on Mtk

As it is used now for MtkRegion types making the GIR file not containing
the relevant dependency and not being able to resolve MtkRegion type

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3292>
This commit is contained in:
Bilal Elmoussaoui 2023-09-21 13:20:20 +02:00 committed by Marge Bot
parent c645b6c6fa
commit c01ffdb8ba
4 changed files with 10 additions and 1 deletions

View file

@ -45,6 +45,7 @@ if have_introspection
symbol_prefix: 'cogl_pango',
header: 'cogl-pango.h',
includes: [
libmutter_mtk_gir[0],
libmutter_cogl_gir[0],
'Pango-1.0',
'PangoCairo-1.0'

View file

@ -436,7 +436,13 @@ if have_introspection
sources: cogl_introspected_headers,
nsversion: libmutter_api_version,
namespace: 'Cogl',
includes: ['cairo-1.0', 'GL-1.0', 'GObject-2.0', 'Graphene-1.0'],
includes: [
libmutter_mtk_gir[0],
'cairo-1.0',
'GL-1.0',
'GObject-2.0',
'Graphene-1.0',
],
dependencies: [cogl_deps],
export_packages: 'mutter-cogl-@0@'.format(libmutter_api_version),
extra_args: introspection_args + [

View file

@ -14,6 +14,7 @@ custom_target('cogl-pango-doc',
gidocgen,
'generate',
gidocgen_common_args,
'--add-include-path=@0@'.format(meson.current_build_dir() / '../../../mtk/mtk'),
'--add-include-path=@0@'.format(meson.current_build_dir() / '../../../cogl/cogl'),
'--config=@INPUT0@',
'--output-dir=@OUTPUT@',

View file

@ -14,6 +14,7 @@ custom_target('cogl-doc',
gidocgen,
'generate',
gidocgen_common_args,
'--add-include-path=@0@'.format(meson.current_build_dir() / '../../../mtk/mtk'),
'--config=@INPUT0@',
'--output-dir=@OUTPUT@',
'--content-dir=@0@'.format(meson.current_source_dir()),