ref: 69e0faa8937c4ea5973018c3bc44d06dd2122530
parent: 0565c5ba2bfee0211d250bd90482cc9b20321260
author: Xavier Claessens <xavier.claessens@collabora.com>
date: Mon Oct 26 09:39:19 EDT 2020
* 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`.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
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>
+
* meson.build: Use `meson.override_dependency`.
This is a new meson mechanism to avoid other projects to hard-code
--- a/meson.build
+++ b/meson.build
@@ -35,7 +35,7 @@
'--soversion',
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/unix/configure.raw')).stdout().strip()@@ -333,7 +333,7 @@
freetype2_dep = declare_dependency(
include_directories: ft2_includes,
link_with: ft2_lib,
- version: ft2_so_version)
+ version: ft2_pkgconfig_version)
meson.override_dependency('freetype2', freetype2_dep)@@ -355,7 +355,7 @@
description: 'A free, high-quality, and portable font engine.',
url: 'https://freetype.org',
subdirs: 'freetype2',
- version: ft2_libtool_version,
+ version: ft2_pkgconfig_version,
)