Skip to content

Commit

Permalink
Add patch to find bzip2
Browse files Browse the repository at this point in the history
  • Loading branch information
jwillikers committed Mar 4, 2024
1 parent cccf8ae commit 8e8d780
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 13 deletions.
6 changes: 6 additions & 0 deletions recipes/freetype/meson/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,9 @@ sources:
- "https://download.savannah.gnu.org/releases/freetype/freetype-2.13.2.tar.xz"
- "https://sourceforge.net/projects/freetype/files/freetype2/2.13.2/freetype-2.13.2.tar.xz"
sha256: "12991c4e55c506dd7f9b765933e62fd2be2e06d421505d7950a132e4f1bb484d"
patches:
"2.13.2":
- patch_file: "patches/2.13.2-0001-meson-Use-the-standard-dependency-mechanism-to-find-.patch"
patch_description: "meson: Use the standard dependency mechanism to find bzip2"
patch_source: "https://gitlab.freedesktop.org/freetype/freetype/-/merge_requests/318"
patch_type: "portability"
13 changes: 0 additions & 13 deletions recipes/freetype/meson/patches/2.13.0-0001-fix-fallthrough.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From 1d5c5cb50feed67c4e89f30ff2a3408adc57081e 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 | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index f81de3e2f..81117ddb4 100644
--- a/meson.build
+++ b/meson.build
@@ -316,8 +316,7 @@ else
endif

# BZip2 support
-bzip2_dep = cc.find_library('bz2',
- required: get_option('bzip2'))
+bzip2_dep = dependency('bzip2', required: get_option('bzip2'))

if bzip2_dep.found()
ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_BZIP2']
--
2.44.0

0 comments on commit 8e8d780

Please sign in to comment.