Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

[brotli] add pkgconfig / [freetype] depend on brotli #12405

Merged
merged 23 commits into from
Aug 6, 2020
Merged

[brotli] add pkgconfig / [freetype] depend on brotli #12405

merged 23 commits into from
Aug 6, 2020

Conversation

Neumann-A
Copy link
Contributor

@Neumann-A Neumann-A commented Jul 13, 2020 •
edited
Loading

closes #12380
closes #12770
depends: #12133 (back to draft until merged)
Also depends on #12409 (back to draft until merged)

  • some drive by fixes if the freetype2 folder would not be removed. (Mainly correcting include dirs and linkage.)

@Neumann-A Neumann-A mentioned this pull request Jul 13, 2020
Merged
8 tasks
@Neumann-A Neumann-A marked this pull request as draft July 13, 2020 20:34
@PhoebeHui PhoebeHui self-assigned this Jul 14, 2020
@PhoebeHui PhoebeHui added category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist depends:different-pr This PR or Issue depends on a PR which has been filed labels Jul 14, 2020
@pkgw pkgw mentioned this pull request Jul 14, 2020
Merged
@PhoebeHui
Copy link
Contributor

@Neumann-A, PR #12133 has been merged.

@Neumann-A Neumann-A marked this pull request as ready for review July 17, 2020 06:17
@Neumann-A
Copy link
Contributor Author

@PhoebeHui seems like it also needs #12409

@Neumann-A Neumann-A marked this pull request as draft July 17, 2020 19:22
@traversaro traversaro mentioned this pull request Aug 1, 2020
Merged
@Neumann-A
Copy link
Contributor Author

@JackBoosY: Seems like your qt build changes did not work. I see Cannot create parent directory here. After revisiting #12529 you only added the fix to qt5-base. all other qt modules are using vcpkg_build_qmake internally so you want to change that also.

@JackBoosY
Copy link
Contributor

Ops, sorry.

@Neumann-A
Copy link
Contributor Author

@JackBoosY: Is your PR to netcdf-c patching libmath out not yet merged? See a failure here in paraview due to libmath. Otherwise this PR would be green

@JackBoosY
Copy link
Contributor

@Neumann-A That PR has not been completed yet, I need to further patch vtk.

@Neumann-A
Copy link
Contributor Author

@JackBoosY why vtk? I thought the problem is netcdf-c. Anyway this PR is ready for review. the OSX failures are failures of the current baseline and unrelated to this PR

@Neumann-A Neumann-A marked this pull request as ready for review August 5, 2020 07:54
@JackBoosY JackBoosY mentioned this pull request Aug 5, 2020
Closed
@JackBoosY
Copy link
Contributor

Waiting for merge #12766.

@Neumann-A Neumann-A mentioned this pull request Aug 6, 2020
Closed
@Neumann-A
Copy link
Contributor Author

I merged #12766 also into this one so that CI can run.

@Neumann-A Neumann-A mentioned this pull request Aug 6, 2020
Merged
@strega-nil
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@strega-nil strega-nil merged commit 61c055a into microsoft:master Aug 6, 2020
@wolfpld wolfpld mentioned this pull request Aug 7, 2020
Closed
@Neumann-A Neumann-A deleted the brotli_update branch August 17, 2020 19:16
@JackBoosY JackBoosY mentioned this pull request Aug 25, 2020
Closed
hellozee pushed a commit to hellozee/vcpkg that referenced this pull request Sep 11, 2020
@Neumann-A @strega-nil @hellozee
[brotli] add pkgconfig / [freetype] depend on brotli (microsoft#12405)
b079505 
* [brotli] add pkgconfig

* [freetype] add pkgconfig and add dependency on brotli

* [qt5-base] add new freetype dependency to brotli and zstd

* [freetype] fix cmake paths

* [freetype] removed renaming of include dir and unnecessary cmake fixes

* [freetype-gl] fix glew include dir

* [podofo] fix freetype search.

* fixing wrong freetype stuff due to vcpkg owned wrong CMakeLists.txt .....

* fixing more freetype hidden issues.

* [sfml] fix missing include

* fix typo

* [freetype] uncomment previous renaming of include folders

* fix brotli linkage in static builds

* remove added alias to avoid problems.

* [freetype] add brotli to the wrapper

* [lzokay] format manifest

Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
@LRFLEW LRFLEW mentioned this pull request Dec 3, 2020
Merged
daschuer added a commit to daschuer/vcpkg that referenced this pull request Oct 11, 2022
@daschuer
[qt-base] freetype depens on brotli
a6739be 
backport microsoft#12405
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@PhoebeHui PhoebeHui

Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist depends:different-pr This PR or Issue depends on a PR which has been filed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[qt5-base] build failure on macOS 10.15 [freetype] compiling with brotli support for woff2 and linking
4 participants
@Neumann-A @PhoebeHui @JackBoosY @strega-nil