Commit 69e0faa8937c4ea5973018c3bc44d06dd2122530
2020-10-26T13:39:19
* 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`.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50
diff --git a/ChangeLog b/ChangeLog
index 1312b04..ffa8157 100644
--- 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
diff --git a/meson.build b/meson.build
index 30b03bb..15cc9df 100644
--- a/meson.build
+++ b/meson.build
@@ -35,7 +35,7 @@ ft2_so_version = run_command(python_exe,
'--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 @@ ft2_lib = library('freetype',
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 @@ pkgconfig.generate(ft2_lib,
description: 'A free, high-quality, and portable font engine.',
url: 'https://freetype.org',
subdirs: 'freetype2',
- version: ft2_libtool_version,
+ version: ft2_pkgconfig_version,
)