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.

Sign up for GitHub

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

Jump to bottom

[ffmpeg] Update dependency support for recent changes. #21980

Merged
merged 13 commits into from
Dec 30, 2021
Merged

[ffmpeg] Update dependency support for recent changes. #21980

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b09025f
[ffmpeg] Update dependency support for recent changes.
Sibras Dec 11, 2021
2c885cf
Merge branch 'master' into master
Sibras Dec 23, 2021
0ee6a49
update
Sibras Dec 23, 2021
0893063
[ffmpeg] update x264 supports.
Sibras Dec 29, 2021
1d256b8
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Dec 29, 2021
2afed80
Fix version database.
BillyONeal Dec 29, 2021
664bec2
update
Sibras Dec 29, 2021
e7e10a2
Merge branch 'master' of https://github.com/Sibras/vcpkg
Sibras Dec 29, 2021
649184a
Update all platform checks and error messages
Sibras Dec 29, 2021
7d996ab
Update vcpkg.json
Sibras Dec 29, 2021
e46507f
Update ffmpeg.json
Sibras Dec 29, 2021
05c7b0f
fixup osx.
Sibras Dec 29, 2021
9422f0a
another osx fixup
Sibras Dec 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ports/ffmpeg/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ if ("alsa" IN_LIST FEATURES AND NOT VCPKG_TARGET_IS_LINUX)
endif()

if("aom" IN_LIST FEATURES)
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP)
message(FATAL_ERROR "Feature 'aom' does not support 'uwp | arm'")
if ((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND NOT VCPKG_TARGET_IS_UWP)
message(FATAL_ERROR "Feature 'aom' does not support 'windows & arm & !uwp'")
endif()
endif()
Copy link
Contributor

Choose a reason for hiding this comment

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

I think Billy means these messages should just be deleted, it looks doesn't support arm or arm64, which the dependency port aom already have the message.

PS F:\vcpkg\21980\vcpkg> ./vcpkg install ffmpeg[aom]:arm-windows
Computing installation plan...
Error: aom[core] is only supported on '!(windows & arm & !uwp)'


Expand Down Expand Up @@ -47,7 +47,7 @@ if("fontconfig" IN_LIST FEATURES)
endif()

if("fribidi" IN_LIST FEATURES)
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP)
if (VCPKG_TARGET_IS_UWP)
message(FATAL_ERROR "Feature 'fribidi' does not support 'uwp | arm'")
endif()
endif()
Expand Down
22 changes: 11 additions & 11 deletions ports/ffmpeg/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ffmpeg",
"version": "4.4.1",
"port-version": 3,
"port-version": 4,
"description": [
"a library to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created.",
"FFmpeg is the leading multimedia framework, able to decode, encode, transcode, mux, demux, stream, filter and play pretty much anything that humans and machines have created. It supports the most obscure ancient formats up to the cutting edge. No matter if they were designed by some standards committee, the community or a corporation. It is also highly portable: FFmpeg compiles, runs, and passes our testing infrastructure FATE across Linux, Mac OS X, Microsoft Windows, the BSDs, Solaris, etc. under a wide variety of build environments, machine architectures, and configurations."
Expand Down Expand Up @@ -73,6 +73,14 @@
],
"platform": "!osx"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"fribidi"
],
"platform": "!uwp"
},
{
"name": "ffmpeg",
"default-features": false,
Expand Down Expand Up @@ -113,14 +121,6 @@
],
"platform": "!(arm & uwp)"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"aom"
],
"platform": "!(uwp | arm)"
},
{
"name": "ffmpeg",
"default-features": false,
Expand All @@ -133,9 +133,9 @@
"name": "ffmpeg",
"default-features": false,
"features": [
"fribidi"
"aom"
],
"platform": "!(uwp | arm)"
"platform": "!(windows & arm & !uwp)"
},
{
"name": "ffmpeg",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2142,7 +2142,7 @@
},
"ffmpeg": {
"baseline": "4.4.1",
"port-version": 3
"port-version": 4
},
"ffnvcodec": {
"baseline": "11.1.5.0",
Expand Down
7 changes: 6 additions & 1 deletion versions/f-/ffmpeg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{
"versions": [
{
"git-tree": "00480edd2a451f2a3a55452779f524709ee52585",
"git-tree": "f61b69b7b8d727e4caf45d7f39d9dcf77e620090",
"version": "4.4.1",
"port-version": 4
},
{
"git-tree": "ae9a4b22462b3aea1423c43cc24b4de746df8ab9",
"version": "4.4.1",
"port-version": 3
},
Expand Down