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] Enable fdk on arm or uwp. #18659

Merged
merged 6 commits into from
Jul 15, 2021
Merged

[ffmpeg] Enable fdk on arm or uwp. #18659

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6d2c9db
[ffmpeg] Enable fdk on arm or uwp.
Sibras Jun 26, 2021
e7820ef
fixup
Sibras Jun 26, 2021
c9258e6
Merge branch 'master' into master
Sibras Jul 2, 2021
92411fd
Update vcpkg.json
Sibras Jul 2, 2021
37703ba
Merge branch 'master' into master
Sibras Jul 7, 2021
6817811
Update vcpkg.json
Sibras Jul 7, 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: 0 additions & 6 deletions ports/ffmpeg/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,6 @@ if("dav1d" IN_LIST FEATURES)
endif()
endif()

if("fdk-aac" IN_LIST FEATURES)
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP)
message(FATAL_ERROR "Feature 'fdk-aac' does not support 'uwp | arm'")
endif()
endif()

if("fontconfig" IN_LIST FEATURES)
if (VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64" OR VCPKG_TARGET_IS_UWP OR (VCPKG_TARGET_IS_WINDOWS AND VCPKG_LIBRARY_LINKAGE STREQUAL "static"))
message(FATAL_ERROR "Feature 'fontconfig' does not support 'uwp | arm | (windows & static)'")
Expand Down
10 changes: 2 additions & 8 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",
"port-version": 5,
"port-version": 6,
"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 @@ -194,16 +194,10 @@
"name": "ffmpeg",
"features": [
"all-gpl",
"fdk-aac",
"nonfree",
"openssl"
]
},
{
"name": "ffmpeg",
"features": [
"fdk-aac"
],
"platform": "!arm & !uwp"
}
]
},
Expand Down
3 changes: 0 additions & 3 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,6 @@ fastrtps:arm-uwp=fail
fastrtps:x64-uwp=fail
fastrtps:x64-windows-static=fail
fastrtps:x64-windows-static-md=fail
fdk-aac:arm64-windows=fail
fdk-aac:arm-uwp=fail
fdk-aac:x64-uwp=fail
fdlibm:arm-uwp=fail
fdlibm:x64-uwp=fail
fftw3:arm-uwp=fail
Expand Down
6 changes: 3 additions & 3 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1982,7 +1982,7 @@
},
"ffmpeg": {
"baseline": "4.4",
"port-version": 5
"port-version": 6
},
"ffnvcodec": {
"baseline": "10.0.26.0",
Expand Down Expand Up @@ -3539,8 +3539,8 @@
"libsigcpp-3": {
"baseline": "3.0.3",
"port-version": 1
},
"libsmb2": {
},
"libsmb2": {
"baseline": "2021-04-29",
"port-version": 0
},
Expand Down
5 changes: 5 additions & 0 deletions versions/f-/ffmpeg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "60f058976a8f537416f313d89986a14acb3f583c",
"version": "4.4",
"port-version": 6
},
{
"git-tree": "234eb0e352d2a7be0a3b34fb9eb8a9f0417ffe94",
"version": "4.4",
Expand Down