Skip to content

[ffmpeg] Add feature harfbuzz#40105

Merged
data-queue merged 27 commits intomicrosoft:masterfrom
jimwang118:ffmpeg-add-feature
Aug 17, 2024
Merged

[ffmpeg] Add feature harfbuzz#40105
data-queue merged 27 commits intomicrosoft:masterfrom
jimwang118:ffmpeg-add-feature

Conversation

@jimwang118
Copy link
Contributor

@jimwang118 jimwang118 commented Jul 26, 2024

Fixes #40094
Add feature drawtext to enable drawtext function.
Delete the patches that have been merged into the new version upstream.(FFmpeg/FFmpeg@fcfd17d)

  • Changes comply with the maintainer guide.
  • SHA512s are updated for each updated download.
  • The "supports" clause reflects platforms that may be fixed by this new version.
  • Any fixed CI baseline entries are removed from that file.
  • Any patches that are no longer applied are deleted from the port's directory.
  • The version database is fixed by rerunning ./vcpkg x-add-version --all and committing the result.
  • Only one version is added to each modified port's versions file.

The feature passed with following triplets:

x64-windows
x64-windows-static

@jimwang118 jimwang118 added category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:internal labels Jul 26, 2024
@dg0yt
Copy link
Contributor

dg0yt commented Jul 26, 2024

Add the feature to vcpkg-ci-ffmpeg for CI coverage.

"bzip2",
"freetype",
"gpl",
"harfbuzz",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably it cannot be tested on android. But wait for CI to finish for all triplets before adding platform.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, thanks for your suggestion.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hm, harfbuzz is present on android, but the config test in ffmpeg fails:

clang @/mnt/vcpkg-ci/b/ffmpeg/arm64-android-rel/ldflags.rsp -L/mnt/vcpkg-ci/installed/arm64-android/lib -Wl,--as-needed -Wl,-z,noexecstack -fPIE -pie -pthread -I/mnt/vcpkg-ci/installed/arm64-android/lib/pkgconfig/../../include/harfbuzz -I/mnt/vcpkg-ci/installed/arm64-android/lib/pkgconfig/../../include -I/mnt/vcpkg-ci/installed/arm64-android/lib/pkgconfig/../../include/libpng16 -I/mnt/vcpkg-ci/installed/arm64-android/lib/pkgconfig/../../include -I/mnt/vcpkg-ci/installed/arm64-android/lib/pkgconfig/../../include/glib-2.0 -I/mnt/vcpkg-ci/installed/arm64-android/lib/pkgconfig/../../lib/glib-2.0/include -I/mnt/vcpkg-ci/installed/arm64-android/lib/pkgconfig/../../include -L/mnt/vcpkg-ci/installed/arm64-android/lib/pkgconfig/../../lib -pthread -pthread -o /tmp/ffconf.3bddnvpr/test /tmp/ffconf.3bddnvpr/test.o -lharfbuzz -lm -lfreetype -lbz2 -lpng16 -lm -lz -lbrotlidec -lbrotlicommon -lglib-2.0 -lintl -lm -liconv -lpcre2-8 -lm
ld.lld: error: undefined symbol: __gxx_personality_v0
>>> referenced by hb-static.cc
>>>               hb-static.cc.o:(DW.ref.__gxx_personality_v0) in archive /mnt/vcpkg-ci/installed/arm64-android/lib/libharfbuzz.a

Probably missing C++ linkage represented in harfbuzz pc files.

@dg0yt
Copy link
Contributor

dg0yt commented Jul 28, 2024

Let's focus on #38011 first.
And maybe harfbuzz export can be fixed in the meantime.

@jimwang118
Copy link
Contributor Author

Let's focus on #38011 first. And maybe harfbuzz export can be fixed in the meantime.

Ok, i will wait for PR 38011 to be merged, and then continue to modify this PR.

@LilyWangLL LilyWangLL added the depends:different-pr This PR or Issue depends on a PR which has been filed label Jul 29, 2024
@jimwang118 jimwang118 marked this pull request as ready for review August 9, 2024 06:13
@jimwang118 jimwang118 removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Aug 9, 2024
LilyWangLL
LilyWangLL previously approved these changes Aug 9, 2024
@LilyWangLL LilyWangLL added the info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. label Aug 9, 2024
@dg0yt
Copy link
Contributor

dg0yt commented Aug 13, 2024

Please remove info:reviewed. It is still not ready for merge.

@LilyWangLL LilyWangLL added info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. and removed info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this. labels Aug 13, 2024
@data-queue data-queue marked this pull request as draft August 15, 2024 05:00
@jimwang118 jimwang118 marked this pull request as ready for review August 16, 2024 01:45
@data-queue data-queue merged commit eaef71b into microsoft:master Aug 17, 2024
@jimwang118 jimwang118 deleted the ffmpeg-add-feature branch August 19, 2024 02:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:needs-maintainer-attention Lets the current 'on rotation' vcpkg maintainer know they need to look at this.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[ffmpeg] Enable libharfbuzz

4 participants