diff --git a/recipes/freetype/meson/conandata.yml b/recipes/freetype/meson/conandata.yml index fb8eea1ec1cb5e..e39b09cc08c4af 100644 --- a/recipes/freetype/meson/conandata.yml +++ b/recipes/freetype/meson/conandata.yml @@ -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" diff --git a/recipes/freetype/meson/patches/2.13.0-0001-fix-fallthrough.patch b/recipes/freetype/meson/patches/2.13.0-0001-fix-fallthrough.patch deleted file mode 100644 index 0386998dea7bb1..00000000000000 --- a/recipes/freetype/meson/patches/2.13.0-0001-fix-fallthrough.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/include/freetype/internal/compiler-macros.h -+++ b/include/freetype/internal/compiler-macros.h -@@ -42,8 +42,8 @@ FT_BEGIN_HEADER - ( defined( __cplusplus ) && __cplusplus > 201402L ) - # define FALL_THROUGH [[__fallthrough__]] - # elif ( defined( __GNUC__ ) && __GNUC__ >= 7 ) || \ -- ( defined( __clang__ ) && __clang_major__ >= 10 ) --# define FALL_THROUGH __attribute__(( __fallthrough__ )) -+ ( defined( __clang__ ) && __clang_major__ >= 12 ) -+# define FALL_THROUGH __attribute__((fallthrough)) - # else - # define FALL_THROUGH ( (void)0 ) - # endif diff --git a/recipes/freetype/meson/patches/2.13.2-0001-meson-Use-the-standard-dependency-mechanism-to-find-.patch b/recipes/freetype/meson/patches/2.13.2-0001-meson-Use-the-standard-dependency-mechanism-to-find-.patch new file mode 100644 index 00000000000000..5c6531db6f68e9 --- /dev/null +++ b/recipes/freetype/meson/patches/2.13.2-0001-meson-Use-the-standard-dependency-mechanism-to-find-.patch @@ -0,0 +1,28 @@ +From 1d5c5cb50feed67c4e89f30ff2a3408adc57081e Mon Sep 17 00:00:00 2001 +From: Jordan Williams +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 +