freetype/2.13.*: Switch to Meson build system #22974

jwillikers · 2024-03-04T17:39:17Z

This requires way less patching. Way less.
Fix the version in the pkg-config file to correctly map to the API version.
Update the font used in the test package and embed the OFL license in the font as suggested in the OFL FAQ.
Add this license to the license attribute of the test packages to make this licensing clear.

#23010 should be merged immediately after this PR to accommodate the correct API version being used now.

No longer blocked by conan-io/hooks#516.

In order to work for CMake versions before 3.29, the Meson generated static library on Windows is renamed from libfreetype.a to freetype.lib. CMake 3.29 and later properly detect static libraries generated by Meson on Windows for MSVC, i.e. static libraries suffixed with .a instead of .lib. This change is documented in the CMake 3.29 release notes:

On Windows, when targeting the MSVC ABI, the find_library() command now accepts .a file names after first considering .lib. This is symmetric with existing behavior when targeting the GNU ABI, in which the command accepts .lib file names after first considering .a.

jwillikers · 2024-03-05T16:31:30Z

This looks suspiciously like a long paths issue. I can build successfully on Windows locally.

Installing libfreetype.a to C:/J2/w/prod-v2/bsr@3/101217/eacfc/p/b/freet613ea5253c3ff/p\lib

ghost · 2024-03-06T14:11:26Z

I detected other pull requests that are modifying freetype/all recipe:

freetype: use libpng version range #23004

This message is automatically generated by https://github.com/ericLemanissier/conan-center-conflicting-prs so don't hesitate to report issues/improvements there.

This requires way less patching. Way less.

This patch is a bad workaround for improper versioning in the freetype package. This is fixed in the freetype package itself in conan-io#22974.

recipes/freetype/meson/conanfile.py

Co-authored-by: Martin Valgur <martin.valgur@gmail.com>

conan-center-bot · 2024-04-02T15:45:19Z

Conan v1 pipeline ✔️

All green in build 31 (e5d09502a76f9f6e992942b31a305148b15ed3cd):

freetype/2.11.1:
All packages built successfully! (All logs)
freetype/2.12.1:
All packages built successfully! (All logs)
freetype/2.10.4:
All packages built successfully! (All logs)
freetype/2.13.2:
All packages built successfully! (All logs)
freetype/2.13.0:
All packages built successfully! (All logs)

This patch is a bad workaround for improper versioning in the freetype package. This is fixed in the freetype package itself in conan-io#22974.

franramirez688

Thanks a lot for this, @jwillikers! Blocking only to let me review it calmly 😁 Just a few minutes 🙏

franramirez688

LGTM! 👏

jellespijker · 2024-04-23T11:55:35Z

This PR broke our builds, due to the version obtained from the raw file, see: https://github.com/Ultimaker/cura-workflows/actions/runs/8798472364/job/24145560363#step:16:27993
When building fontconfig it searches for freetype2 version 2.13.2 but the generated freetype2.pc uses the version extracted from the textfile which is 26.1.20

Is there a quick fix for this? It's blocking our release of Cura 5.7.1, current approach is setting the component_version to self.version in the package_info and then using that in our builds, but I don't know if this is the "proper" way of doing that

ericLemanissier · 2024-04-23T11:59:40Z

yes: #23010

jwillikers · 2024-04-23T12:18:25Z

This PR broke our builds, due to the version obtained from the raw file, see: https://github.com/Ultimaker/cura-workflows/actions/runs/8798472364/job/24145560363#step:16:27993 When building fontconfig it searches for freetype2 version 2.13.2 but the generated freetype2.pc uses the version extracted from the textfile which is 26.1.20

Is there a quick fix for this? It's blocking our release of Cura 5.7.1, current approach is setting the component_version to self.version in the package_info and then using that in our builds, but I don't know if this is the "proper" way of doing that

@jellespijker Yes, sorry about breaking that. I tried to make it as clear as possible to the team that fixing the pkg-config version would break the fontconfig package and require merging my PR #23010 ASAP.

* freetype: Switch to Meson build system This requires way less patching. Way less. * Add patch to find bzip2 * Bump PNG * Set pkg-config version appropriately * Don't use collect_libs * Fix version for Conan V1 * Enable short paths * Fix config * Update the OpenSans-Bold font to version 3 from version 1 This changes the license of the font from the Apache license to the OFL. This TTF file has been updated to include the full text of the license. This follows the recommendation of the OFL's FAQ: https://openfontlicense.org/how-to-use-ofl-fonts/#22a585885b5cb7cc58d60445ecf0d8ad6f76ef24 * Add license attribute to test package for the OpenSans font The license is available here: https://github.com/googlefonts/opensans/blob/main/OFL.txt * Account for the name of the static library on Windows * Revert "Account for the name of the static library on Windows" This reverts commit 89275d0. * Bump the minimum CMake version for the test packages * See if a newer version of CMake fixes the test packages * Try using short paths for the test package * Check variables for modules before defining the target * Enable short paths for the test_package_module * Use a newer version of CMake in test_package_module * Explicitly set the freetype library path for CMake * Try setting FREETYPE_LIBRARIES * Revert "Try setting FREETYPE_LIBRARIES" This reverts commit bb3907b. * Revert "Explicitly set the freetype library path for CMake" This reverts commit babf66a. * Set if CMAKE_FIND_LIBRARY_SUFFIXES to include ".a" suffixes on Windows * Revert "Set if CMAKE_FIND_LIBRARY_SUFFIXES to include ".a" suffixes on Windows" This reverts commit 0d30c04. * Rename .a to .lib to workaround CMake versions prior to 3.29 * Remove lib prefix on Windows as well to allow CMake to find the library * Build version 2.13.0 with Meson as well and remove tool_requires cmake * Rename the patch file * Remove pdb files * Update recipes/freetype/meson/conanfile.py Co-authored-by: Martin Valgur <martin.valgur@gmail.com> * Correctly order versions --------- Co-authored-by: Martin Valgur <martin.valgur@gmail.com>

* fontconfig: Remove patch for freetype libtool version number This patch is a bad workaround for improper versioning in the freetype package. This is fixed in the freetype package itself in #22974. * Fix missing conf fontconfig file This fixes the following error, which can be seen when running the test package: ``` Fontconfig error: Cannot load default config file: No such file: (null) ``` This is fixed by installing the fontconfig configuration file. It was being installed to the wrong location in the Meson package previously. Additionally, don't set `FONTCONFIG_FILE`, but instead append to `FONTCONFIG_PATH` only. This works and makes it easier for consumers to opt for the system font directory. See #5782. * Use relative paths for the updated Meson generator

jwillikers changed the title ~~freetype: Switch to Meson build system~~ freetype/2.13.2: Switch to Meson build system Mar 4, 2024

conan-center-bot added the Failed label Mar 4, 2024

This comment has been minimized.

Sign in to view

jwillikers force-pushed the freetype-meson branch from 8e8d780 to 436c601 Compare March 4, 2024 18:57

This comment has been minimized.

Sign in to view

This was referenced Mar 6, 2024

[service] Potentially conflicting recipes #3571

Closed

freetype: use libpng version range #23004

Merged

jwillikers added 8 commits March 6, 2024 09:20

freetype: Switch to Meson build system

b4696de

This requires way less patching. Way less.

Add patch to find bzip2

c64c22d

Bump PNG

1041d19

Set pkg-config version appropriately

4dda8df

Don't use collect_libs

e60a645

Fix version for Conan V1

3346134

Enable short paths

36305d9

Fix config

3c3ecf7

jwillikers force-pushed the freetype-meson branch from f1aed39 to 3c3ecf7 Compare March 6, 2024 15:21

This comment has been minimized.

Sign in to view

jwillikers mentioned this pull request Mar 6, 2024

fontconfig: Remove patch for freetype libtool version number #23010

Merged

1 task

AbrilRBS self-assigned this Mar 14, 2024

conan-center-bot added the Unexpected Error label Mar 14, 2024

This comment has been minimized.

Sign in to view

conan-center-bot removed the Unexpected Error label Mar 16, 2024

This comment has been minimized.

Sign in to view

jwillikers changed the title ~~freetype/2.13.2: Switch to Meson build system~~ freetype/2.13.*: Switch to Meson build system Mar 21, 2024

Remove pdb files

0055f6a

conan-center-bot removed the Failed label Mar 21, 2024

This comment has been minimized.

Sign in to view

valgur reviewed Mar 24, 2024

View reviewed changes

recipes/freetype/meson/conanfile.py Outdated Show resolved Hide resolved

valgur approved these changes Mar 24, 2024

View reviewed changes

Update recipes/freetype/meson/conanfile.py

a758327

Co-authored-by: Martin Valgur <martin.valgur@gmail.com>

This comment has been minimized.

Sign in to view

AbrilRBS assigned franramirez688 Mar 25, 2024

jwillikers requested a review from valgur March 25, 2024 12:50

valgur approved these changes Mar 25, 2024

View reviewed changes

jwillikers mentioned this pull request Apr 1, 2024

harbfuzz: add new version 9.0.0 #23319

Open

3 tasks

Correctly order versions

e5d0950

conan-center-bot requested a review from danimtb April 19, 2024 11:42

danimtb approved these changes Apr 22, 2024

View reviewed changes

franramirez688 requested changes Apr 22, 2024

View reviewed changes

franramirez688 approved these changes Apr 22, 2024

View reviewed changes

conan-center-bot merged commit 2243087 into conan-io:master Apr 22, 2024
33 checks passed

jwillikers deleted the freetype-meson branch April 22, 2024 11:55

ericLemanissier mentioned this pull request Apr 23, 2024

freetype: drop dead code #23702

Merged

3 tasks

jcar87 mentioned this pull request Apr 26, 2024

[package] freetype/2.13.* provide freetype-6.dll, but consumers expect freeytpe.dll #23768

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

freetype/2.13.*: Switch to Meson build system #22974

freetype/2.13.*: Switch to Meson build system #22974

jwillikers commented Mar 4, 2024 •

edited

Loading

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

jwillikers commented Mar 5, 2024

This comment has been minimized.

ghost commented Mar 6, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

conan-center-bot commented Apr 2, 2024

franramirez688 left a comment

franramirez688 left a comment

jellespijker commented Apr 23, 2024 •

edited

Loading

ericLemanissier commented Apr 23, 2024

jwillikers commented Apr 23, 2024

freetype/2.13.*: Switch to Meson build system #22974

freetype/2.13.*: Switch to Meson build system #22974

Conversation

jwillikers commented Mar 4, 2024 • edited Loading

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

jwillikers commented Mar 5, 2024

This comment has been minimized.

ghost commented Mar 6, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

conan-center-bot commented Apr 2, 2024

Conan v1 pipeline ✔️

franramirez688 left a comment

Choose a reason for hiding this comment

franramirez688 left a comment

Choose a reason for hiding this comment

jellespijker commented Apr 23, 2024 • edited Loading

ericLemanissier commented Apr 23, 2024

jwillikers commented Apr 23, 2024

jwillikers commented Mar 4, 2024 •

edited

Loading

jellespijker commented Apr 23, 2024 •

edited

Loading