[x264] Replace "disable-gpl" feature with "gpl" (#30978)

This commit is contained in:
David Ely 2023-04-28 06:30:01 +10:00 committed by GitHub
parent 3f34cf3a41
commit 5971b70439
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 6 deletions

View File

@ -81,7 +81,7 @@ if("chroma-format-all" IN_LIST FEATURES)
vcpkg_list(APPEND OPTIONS --chroma-format=all)
endif()
if("disable-gpl" IN_LIST FEATURES)
if(NOT "gpl" IN_LIST FEATURES)
vcpkg_list(APPEND OPTIONS --disable-gpl)
endif()

View File

@ -1,7 +1,7 @@
{
"name": "x264",
"version": "0.164.3095",
"port-version": 3,
"port-version": 4,
"description": "x264 is a free software library and application for encoding video streams into the H.264/MPEG-4 AVC compression format",
"homepage": "https://www.videolan.org/developers/x264.html",
"license": "GPL-2.0-or-later",
@ -28,14 +28,15 @@
{
"name": "x264",
"features": [
"asm"
"asm",
"gpl"
],
"platform": "x86 | x64 | (arm & !windows) | arm64"
}
]
},
"disable-gpl": {
"description": "Disable GPL-only features"
"gpl": {
"description": "Allow use of GPL code, the resulting libs and binaries will be under GPL"
},
"tool": {
"description": "Build the command line tool",

View File

@ -8538,7 +8538,7 @@
},
"x264": {
"baseline": "0.164.3095",
"port-version": 3
"port-version": 4
},
"x265": {
"baseline": "3.4",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0361283be94126cf5e42a4cf765f700f8f209ea5",
"version": "0.164.3095",
"port-version": 4
},
{
"git-tree": "18da69fb69b926e7784135262798356e7b1ee5e4",
"version": "0.164.3095",