* meson.build: s/ft2_libtool_version/ft2_pkgconfig_version/.
(freetype2_dep): Use it. `ft2_libtool_version` would be the shared library version, not the one we should use in file `freetype2.pc`.
This commit is contained in:
parent
0565c5ba2b
commit
69e0faa893
|
@ -1,3 +1,12 @@
|
||||||
|
2021-02-09 Xavier Claessens <xavier.claessens@collabora.com>
|
||||||
|
|
||||||
|
* meson.build: s/ft2_libtool_version/ft2_pkgconfig_version/.
|
||||||
|
|
||||||
|
(freetype2_dep): Use it.
|
||||||
|
|
||||||
|
`ft2_libtool_version` would be the shared library version, not the
|
||||||
|
one we should use in file `freetype2.pc`.
|
||||||
|
|
||||||
2021-02-09 Xavier Claessens <xavier.claessens@collabora.com>
|
2021-02-09 Xavier Claessens <xavier.claessens@collabora.com>
|
||||||
|
|
||||||
* meson.build: Use `meson.override_dependency`.
|
* meson.build: Use `meson.override_dependency`.
|
||||||
|
|
|
@ -35,7 +35,7 @@ ft2_so_version = run_command(python_exe,
|
||||||
'--soversion',
|
'--soversion',
|
||||||
files('builds/unix/configure.raw')).stdout().strip()
|
files('builds/unix/configure.raw')).stdout().strip()
|
||||||
|
|
||||||
ft2_libtool_version = run_command(python_exe,
|
ft2_pkgconfig_version = run_command(python_exe,
|
||||||
files('builds/meson/extract_libtool_version.py'),
|
files('builds/meson/extract_libtool_version.py'),
|
||||||
files('builds/unix/configure.raw')).stdout().strip()
|
files('builds/unix/configure.raw')).stdout().strip()
|
||||||
|
|
||||||
|
@ -333,7 +333,7 @@ ft2_lib = library('freetype',
|
||||||
freetype2_dep = declare_dependency(
|
freetype2_dep = declare_dependency(
|
||||||
include_directories: ft2_includes,
|
include_directories: ft2_includes,
|
||||||
link_with: ft2_lib,
|
link_with: ft2_lib,
|
||||||
version: ft2_so_version)
|
version: ft2_pkgconfig_version)
|
||||||
meson.override_dependency('freetype2', freetype2_dep)
|
meson.override_dependency('freetype2', freetype2_dep)
|
||||||
|
|
||||||
|
|
||||||
|
@ -355,7 +355,7 @@ pkgconfig.generate(ft2_lib,
|
||||||
description: 'A free, high-quality, and portable font engine.',
|
description: 'A free, high-quality, and portable font engine.',
|
||||||
url: 'https://freetype.org',
|
url: 'https://freetype.org',
|
||||||
subdirs: 'freetype2',
|
subdirs: 'freetype2',
|
||||||
version: ft2_libtool_version,
|
version: ft2_pkgconfig_version,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue