From 860641602b067712a9da6f7c93010e8e861b70de Mon Sep 17 00:00:00 2001
From: David Ely <116330168+David-Ely@users.noreply.github.com>
Date: Thu, 6 Apr 2023 09:54:23 +1000
Subject: [PATCH] Added chroma-format and disable-gpl features (#30631)

---
 ports/x264/portfile.cmake | 8 ++++++++
 ports/x264/vcpkg.json     | 8 +++++++-
 versions/baseline.json    | 2 +-
 versions/x-/x264.json     | 5 +++++
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ports/x264/portfile.cmake b/ports/x264/portfile.cmake
index cbd951a70b..40b9c607f4 100644
--- a/ports/x264/portfile.cmake
+++ b/ports/x264/portfile.cmake
@@ -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()
+
 if(VCPKG_TARGET_IS_UWP)
     list(APPEND OPTIONS --extra-cflags=-D_WIN32_WINNT=0x0A00)
 endif()
diff --git a/ports/x264/vcpkg.json b/ports/x264/vcpkg.json
index 064f07140e..4bef123d8d 100644
--- a/ports/x264/vcpkg.json
+++ b/ports/x264/vcpkg.json
@@ -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",
@@ -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": [
@@ -31,6 +34,9 @@
         }
       ]
     },
+    "disable-gpl": {
+      "description": "Disable GPL-only features"
+    },
     "tool": {
       "description": "Build the command line tool",
       "supports": "!uwp"
diff --git a/versions/baseline.json b/versions/baseline.json
index 68370f4b9c..7aec7bc060 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -8490,7 +8490,7 @@
     },
     "x264": {
       "baseline": "0.164.3095",
-      "port-version": 2
+      "port-version": 3
     },
     "x265": {
       "baseline": "3.4",
diff --git a/versions/x-/x264.json b/versions/x-/x264.json
index 8b98973cc5..e747ee64b3 100644
--- a/versions/x-/x264.json
+++ b/versions/x-/x264.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "18da69fb69b926e7784135262798356e7b1ee5e4",
+      "version": "0.164.3095",
+      "port-version": 3
+    },
     {
       "git-tree": "4ff53c90cd7222ae9d3e8dc579c1d198715585c2",
       "version": "0.164.3095",