Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libgd: fix building with freetype support #10943

Merged
merged 1 commit into from
Jan 5, 2020
Merged

Conversation

flyn-org
Copy link
Contributor

@flyn-org flyn-org commented Jan 4, 2020

Maintainer: @jow-
Compile tested: arm/mxs (by @mhei )
Run tested: -

Description:

Freetype support is required for php7-mod-gd as of commit 0f10c8c,
which causes the PHP7 package to build using this external libgd library.
This commit adds FREETYPE_INCLUDE_DIRS to the definition of CMAKE_OPTIONS.
Without this, libgd does not build freetype support as shown by
this message:

....
Build libgd:
-- Could NOT find Freetype (missing: FREETYPE_INCLUDE_DIRS)
-- Configuring done
-- Generating done
....

Signed-off-by: W. Michael Petullo [email protected]

@neheb
Copy link
Contributor

neheb commented Jan 4, 2020

Needs a PKG_RELEASE bump.

Freetype support is required for php7-mod-gd as of commit 0f10c8c,
which causes the PHP7 package to build using this external libgd library.
This commit adds FREETYPE_INCLUDE_DIRS to the definition of CMAKE_OPTIONS.
Without this, libgd does not build freetype support as shown by
this message:

....
Build libgd:
-- Could NOT find Freetype (missing:  FREETYPE_INCLUDE_DIRS)
-- Configuring done
-- Generating done
....

Signed-off-by: W. Michael Petullo <[email protected]>
@flyn-org
Copy link
Contributor Author

flyn-org commented Jan 5, 2020

Bumped PKG_RELEASE, and force pushed.

@mhei
Copy link
Member

mhei commented Jan 5, 2020

I've edited the PR template a little bit, other than this, this LGTM.

@neheb
Copy link
Contributor

neheb commented Jan 5, 2020

Merging since technically I broke this with the conversion to CMake.

@neheb neheb merged commit 1ab383f into openwrt:master Jan 5, 2020
@flyn-org flyn-org deleted the libgd branch January 5, 2020 20:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants