-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
cccf8ae
commit 436c601
Showing
3 changed files
with
37 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
13 changes: 0 additions & 13 deletions
13
recipes/freetype/meson/patches/2.13.0-0001-fix-fallthrough.patch
This file was deleted.
Oops, something went wrong.
31 changes: 31 additions & 0 deletions
31
...type/meson/patches/2.13.2-0001-meson-Use-the-standard-dependency-mechanism-to-find-.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
From 2598fa002859d2af1c846363ff64e72d2ebde16a Mon Sep 17 00:00:00 2001 | ||
From: Jordan Williams <jordan@jwillikers.com> | ||
Date: Mon, 4 Mar 2024 12:14:51 -0600 | ||
Subject: [PATCH] meson: Use the standard dependency mechanism to find bzip2 | ||
|
||
This follows standard conventions in Meson by using the pkg-config file. | ||
This change allows Conan to switch to the Meson build system. | ||
--- | ||
meson.build | 6 ++++-- | ||
1 file changed, 4 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/meson.build b/meson.build | ||
index f81de3e2f..c5cb8ea52 100644 | ||
--- a/meson.build | ||
+++ b/meson.build | ||
@@ -316,8 +316,10 @@ else | ||
endif | ||
|
||
# BZip2 support | ||
-bzip2_dep = cc.find_library('bz2', | ||
- required: get_option('bzip2')) | ||
+bzip2_dep = dependency('bzip2', required: false) | ||
+if not bzip2_dep.found() | ||
+ bzip2_dep = cc.find_library('bz2', has_headers: ['bzlib.h'], required: get_option('bzip2')) | ||
+endif | ||
|
||
if bzip2_dep.found() | ||
ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_BZIP2'] | ||
-- | ||
2.44.0 | ||
|