3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-15 06:08:07 +08:00
Code Issues Projects Releases Wiki Activity

[ffmpeg] enable opengl feature on osx (#18624)

Browse Source 
* [ffmpeg] enable opengl feature on osx

* [ffmpeg] x-add-version

* [ffmpeg] remove opengl osx check in portfile

* [ffmpeg] x-add-version

* Update ports/ffmpeg/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* [ffmpeg] x-add-version

* [ffmpeg] bump port version

* [ffmpeg] x-add-version

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
This commit is contained in:
Matthias C. M. Troffaes 2021-07-16 08:16:41 +01:00 committed by GitHub
parent 394e6f0997
commit 30d8b36c58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/ffmpeg/portfile.cmake
View File

@ -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()

18
ports/ffmpeg/vcpkg.json
View File

@ -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."
@ -118,6 +118,14 @@
],
"platform": "!(uwp | arm) & !static"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"opengl"
],
"platform": "!uwp & !(windows & arm)"
},
{
"name": "ffmpeg",
"default-features": false,
@ -142,14 +150,6 @@
],
"platform": "!(x86 | arm | uwp) & !static"
},
{
"name": "ffmpeg",
"default-features": false,
"features": [
"opengl"
],
"platform": "!uwp & !(windows & arm) & !osx"
},
{
"name": "ffmpeg",
"default-features": false,

2
versions/baseline.json
View File

@ -1990,7 +1990,7 @@
},
"ffmpeg": {
"baseline": "4.4",
"port-version": 8
"port-version": 9
},
"ffnvcodec": {
"baseline": "10.0.26.0",

5
versions/f-/ffmpeg.json
View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "b118bc2a5cf855546dc3016de53c4d7c75d267b4",
"version": "4.4",
"port-version": 9
},
{
"git-tree": "4eab7455a8436723d57e1749fb2a7d8316be893b",
"version": "4.4",