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

[ffmpeg] enable opengl feature on osx #18624

Merged
merged 10 commits into from
Jul 16, 2021
Merged

[ffmpeg] enable opengl feature on osx #18624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b64c457
[ffmpeg] enable opengl feature on osx
mcmtroffaes Jun 24, 2021
cf1cc0f
[ffmpeg] x-add-version
mcmtroffaes Jun 24, 2021
09a1c66
[ffmpeg] remove opengl osx check in portfile
mcmtroffaes Jun 25, 2021
4766318
[ffmpeg] x-add-version
mcmtroffaes Jun 25, 2021
b96f454
Update ports/ffmpeg/portfile.cmake
mcmtroffaes Jun 25, 2021
9f65068
[ffmpeg] x-add-version
mcmtroffaes Jun 25, 2021
d1a737d
Merge remote-tracking branch 'upstream/master' into feature/ffmpeg-op…
mcmtroffaes Jul 4, 2021
9842e0a
[ffmpeg] bump port version
mcmtroffaes Jul 4, 2021
40ef362
[ffmpeg] x-add-version
mcmtroffaes Jul 4, 2021
23c050f
Merge remote-tracking branch 'origin/master' into HEAD
BillyONeal Jul 15, 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
4 changes: 2 additions & 2 deletions ports/ffmpeg/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ if("opencl" IN_LIST FEATURES)
endif()

if("opengl" IN_LIST FEATURES)
if (((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) OR VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_OSX)
message(FATAL_ERROR "Feature 'opengl' does not support 'uwp | (windows & arm) | osx'")
if (((VCPKG_TARGET_ARCHITECTURE STREQUAL "arm" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm64") AND VCPKG_TARGET_IS_WINDOWS) OR VCPKG_TARGET_IS_UWP)
message(FATAL_ERROR "Feature 'opengl' does not support 'uwp | (windows & arm)")
endif()
endif()

Expand Down
18 changes: 9 additions & 9 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": 8,
"port-version": 9,
"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 @@ -122,33 +122,33 @@
"name": "ffmpeg",
"default-features": false,
"features": [
"dav1d"
"opengl"
],
"platform": "!(uwp | arm | x86 | osx)"
"platform": "!uwp & !(windows & arm)"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"modplug"
"dav1d"
],
"platform": "!(windows & static) & !uwp"
"platform": "!(uwp | arm | x86 | osx)"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"tensorflow"
"modplug"
],
"platform": "!(x86 | arm | uwp) & !static"
"platform": "!(windows & static) & !uwp"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"opengl"
"tensorflow"
],
"platform": "!uwp & !(windows & arm) & !osx"
"platform": "!(x86 | arm | uwp) & !static"
},
{
"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 @@ -1986,7 +1986,7 @@
},
"ffmpeg": {
"baseline": "4.4",
"port-version": 8
"port-version": 9
},
"ffnvcodec": {
"baseline": "10.0.26.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": "b118bc2a5cf855546dc3016de53c4d7c75d267b4",
"version": "4.4",
"port-version": 9
},
{
"git-tree": "4eab7455a8436723d57e1749fb2a7d8316be893b",
"version": "4.4",
Expand Down