isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-24 17:10:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

build: Make exported package in gir consistent

Browse Source 
Additionally Cogl was missing xlib as an include

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1918>
This commit is contained in:
Zander Brown 2021-07-06 19:03:10 +01:00 committed by Marge Bot
parent b62f2667db
commit 6a445d2eef
4 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clutter/clutter/meson.build
View File

@ -333,6 +333,7 @@ if have_introspection
nsversion: libmutter_api_version, nsversion: libmutter_api_version,
header: 'cally/cally.h', header: 'cally/cally.h',
namespace: 'Cally', namespace: 'Cally',
export_packages: [libmutter_clutter_name],
includes: [ includes: [
libmutter_mtk_gir[0], libmutter_mtk_gir[0],
libmutter_cogl_gir[0], libmutter_cogl_gir[0],

7
cogl/cogl-pango/meson.build
View File

@ -21,7 +21,8 @@ cogl_pango_deps = [
libmutter_cogl_dep, libmutter_cogl_dep,
] ]
libmutter_cogl_pango = shared_library('mutter-cogl-pango-' + libmutter_api_version, libmutter_cogl_pango_name = 'mutter-cogl-pango-' + libmutter_api_version
libmutter_cogl_pango = shared_library(libmutter_cogl_pango_name,
sources: [cogl_pango_sources, cogl_pango_public_headers], sources: [cogl_pango_sources, cogl_pango_public_headers],
version: '0.0.0', version: '0.0.0',
soversion: 0, soversion: 0,
@ -56,7 +57,7 @@ if have_introspection
pango_dep, pango_dep,
libmutter_cogl_pango_dep, libmutter_cogl_pango_dep,
], ],
export_packages: 'mutter-cogl-pango-@0@'.format(libmutter_api_version), export_packages: [libmutter_cogl_pango_name],
extra_args: introspection_args + [ extra_args: introspection_args + [
'-UCOGL_COMPILATION', '-UCOGL_COMPILATION',
'-DG_LOG_DOMAIN="CoglPango"', '-DG_LOG_DOMAIN="CoglPango"',
@ -70,7 +71,7 @@ install_headers(cogl_pango_public_headers, subdir: cogl_pango_includesubdir)
pkg.generate(libmutter_cogl_pango, pkg.generate(libmutter_cogl_pango,
name: 'CoglPango', name: 'CoglPango',
filebase: 'mutter-cogl-pango-' + libmutter_api_version, filebase: libmutter_cogl_pango_name,
description: 'A text rendering for Cogl in mutter', description: 'A text rendering for Cogl in mutter',
subdirs: pkgname / 'cogl', subdirs: pkgname / 'cogl',
requires: [cogl_pkg_deps, libmutter_cogl_name, pango_dep, pangocairo_dep], requires: [cogl_pkg_deps, libmutter_cogl_name, pango_dep, pangocairo_dep],

22
cogl/cogl/meson.build
View File

@ -1,6 +1,18 @@
cogl_cogl_includesubdir = cogl_includesubdir / 'cogl' cogl_cogl_includesubdir = cogl_includesubdir / 'cogl'
cogl_cogl_includedir = cogl_includedir / 'cogl' cogl_cogl_includedir = cogl_includedir / 'cogl'
cogl_gir_includes = [
'GL-1.0',
'GObject-2.0',
'Graphene-1.0',
]
if have_introspection
cogl_gir_includes += [
libmutter_mtk_gir[0],
]
endif
cogl_deprecated_headers = [ cogl_deprecated_headers = [
'deprecated/cogl-program.h', 'deprecated/cogl-program.h',
'deprecated/cogl-shader.h', 'deprecated/cogl-shader.h',
@ -293,6 +305,7 @@ cogl_sources = [
] ]
if have_x11 if have_x11
cogl_gir_includes += ['xlib-2.0']
cogl_nonintrospected_headers += [ cogl_nonintrospected_headers += [
'cogl-xlib.h', 'cogl-xlib.h',
'winsys/cogl-texture-pixmap-x11.h', 'winsys/cogl-texture-pixmap-x11.h',
@ -403,14 +416,9 @@ if have_introspection
sources: cogl_introspected_headers, sources: cogl_introspected_headers,
nsversion: libmutter_api_version, nsversion: libmutter_api_version,
namespace: 'Cogl', namespace: 'Cogl',
includes: [ export_packages: [libmutter_cogl_name],
libmutter_mtk_gir[0], includes: cogl_gir_includes,
'GL-1.0',
'GObject-2.0',
'Graphene-1.0',
],
dependencies: [cogl_deps], dependencies: [cogl_deps],
export_packages: 'mutter-cogl-@0@'.format(libmutter_api_version),
extra_args: introspection_args + [ extra_args: introspection_args + [
'-UCOGL_COMPILATION', '-UCOGL_COMPILATION',
'-D__COGL_H_INSIDE__', '-D__COGL_H_INSIDE__',

2
src/meson.build
View File

@ -1279,7 +1279,7 @@ if have_introspection
libmutter_dep, libmutter_dep,
mutter_deps, mutter_deps,
], ],
export_packages: 'libmutter-@0@'.format(libmutter_api_version), export_packages: ['libmutter-@0@'.format(libmutter_api_version)],
extra_args: mutter_c_args + introspection_args, extra_args: mutter_c_args + introspection_args,
kwargs: introspection_common, kwargs: introspection_common,
) )