Skip to content

X264 features #30631

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

Merged
vicroms merged 1 commit into from
Apr 5, 2023
Merged

X264 features #30631

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions ports/x264/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,14 @@ else()
vcpkg_list(APPEND OPTIONS_RELEASE --disable-cli)
endif()

if("chroma-format-all" IN_LIST FEATURES)
vcpkg_list(APPEND OPTIONS --chroma-format=all)
endif()

if("disable-gpl" IN_LIST FEATURES)
vcpkg_list(APPEND OPTIONS --disable-gpl)
endif()
Comment on lines +84 to +86
Copy link
Contributor

@dg0yt dg0yt Apr 6, 2023

Choose a reason for hiding this comment

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

Is this feature additive as requested in the guidelines?
It seems to operate in the opposite way than gpl features in ffmpeg and gstreamer.

Copy link
Contributor Author

@David-Ely David-Ely Apr 6, 2023

Choose a reason for hiding this comment

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

I think technically it does. But it is the opposite of how ffmpeg and gstreamer do it. If you would like I'm happy create a new PR that changes it to match their method?

Copy link
Contributor

@dg0yt dg0yt Apr 9, 2023

Choose a reason for hiding this comment

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

 --disable-gpl            disable GPL-only features

It is not additive. It must be changed to match vcpkg guidelines.


if(VCPKG_TARGET_IS_UWP)
list(APPEND OPTIONS --extra-cflags=-D_WIN32_WINNT=0x0A00)
endif()
Expand Down
8 changes: 7 additions & 1 deletion ports/x264/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "x264",
"version": "0.164.3095",
"port-version": 2,
"port-version": 3,
"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",
Expand All @@ -19,6 +19,9 @@
"description": "Enable platform-specific assembly optimizations",
"supports": "x86 | x64 | (arm & !windows) | arm64"
},
"chroma-format-all": {
"description": "Output all chroma formats"
},
"default-features": {
"description": "Default set of features",
"dependencies": [
Expand All @@ -31,6 +34,9 @@
}
]
},
"disable-gpl": {
"description": "Disable GPL-only features"
},
"tool": {
"description": "Build the command line tool",
"supports": "!uwp"
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 @@ -8478,7 +8478,7 @@
},
"x264": {
"baseline": "0.164.3095",
"port-version": 2
"port-version": 3
},
"x265": {
"baseline": "3.4",
Expand Down
5 changes: 5 additions & 0 deletions versions/x-/x264.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "18da69fb69b926e7784135262798356e7b1ee5e4",
"version": "0.164.3095",
"port-version": 3
},
{
"git-tree": "4ff53c90cd7222ae9d3e8dc579c1d198715585c2",
"version": "0.164.3095",
Expand Down