From 2112a10f4a77fb8ff41534b46c10a6247a15ac10 Mon Sep 17 00:00:00 2001
From: Francisco Facioni <franciscof@bolt6.ai>
Date: Wed, 28 Dec 2022 21:09:32 +0000
Subject: [PATCH] x265 works on arm linux (#28458)

---
 ports/ffmpeg/vcpkg.json                       | 10 +++++-----
 ports/x265/vcpkg.json                         |  4 ++--
 scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json | 11 +++++++++--
 versions/baseline.json                        |  4 ++--
 versions/f-/ffmpeg.json                       |  5 +++++
 versions/x-/x265.json                         |  5 +++++
 6 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/ports/ffmpeg/vcpkg.json b/ports/ffmpeg/vcpkg.json
index 43d9794e53b..be6ae3092a2 100644
--- a/ports/ffmpeg/vcpkg.json
+++ b/ports/ffmpeg/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "ffmpeg",
   "version": "4.4.3",
-  "port-version": 1,
+  "port-version": 2,
   "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."
@@ -213,17 +213,17 @@
           "name": "ffmpeg",
           "default-features": false,
           "features": [
-            "x265"
+            "x264"
           ],
-          "platform": "!(uwp | arm)"
+          "platform": "!(arm & windows)"
         },
         {
           "name": "ffmpeg",
           "default-features": false,
           "features": [
-            "x264"
+            "x265"
           ],
-          "platform": "!(arm & windows)"
+          "platform": "!uwp & !(arm & windows)"
         },
         {
           "name": "ffmpeg",
diff --git a/ports/x265/vcpkg.json b/ports/x265/vcpkg.json
index c859dc260ef..983e4cca89e 100644
--- a/ports/x265/vcpkg.json
+++ b/ports/x265/vcpkg.json
@@ -1,11 +1,11 @@
 {
   "name": "x265",
   "version": "3.4",
-  "port-version": 7,
+  "port-version": 8,
   "description": "x265 is a H.265 / HEVC video encoder application library, designed to encode video or images into an H.265 / HEVC encoded bitstream.",
   "homepage": "https://github.com/videolan/x265",
   "license": "GPL-2.0-or-later",
-  "supports": "!(uwp | arm)",
+  "supports": "!uwp & !(arm & windows)",
   "dependencies": [
     {
       "name": "vcpkg-cmake",
diff --git a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
index 4d2f2b13818..d3f597073b7 100644
--- a/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
+++ b/scripts/test_ports/vcpkg-ci-ffmpeg/vcpkg.json
@@ -81,8 +81,7 @@
       "name": "ffmpeg",
       "default-features": false,
       "features": [
-        "ssh",
-        "x265"
+        "ssh"
       ],
       "platform": "!(uwp | arm)"
     },
@@ -94,6 +93,14 @@
       ],
       "platform": "!(arm & windows)"
     },
+    {
+      "name": "ffmpeg",
+      "default-features": false,
+      "features": [
+        "x265"
+      ],
+      "platform": "!uwp & !(arm & windows)"
+    },
     {
       "name": "ffmpeg",
       "default-features": false,
diff --git a/versions/baseline.json b/versions/baseline.json
index 84436ed4b98..20dd14d4c14 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -2322,7 +2322,7 @@
     },
     "ffmpeg": {
       "baseline": "4.4.3",
-      "port-version": 1
+      "port-version": 2
     },
     "ffnvcodec": {
       "baseline": "11.1.5.0",
@@ -8118,7 +8118,7 @@
     },
     "x265": {
       "baseline": "3.4",
-      "port-version": 7
+      "port-version": 8
     },
     "xapian": {
       "baseline": "1.4.21",
diff --git a/versions/f-/ffmpeg.json b/versions/f-/ffmpeg.json
index e26bfbe7fae..134592d5b36 100644
--- a/versions/f-/ffmpeg.json
+++ b/versions/f-/ffmpeg.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "0a71b1f5734a3ead9f3941a4fae62aeeede10681",
+      "version": "4.4.3",
+      "port-version": 2
+    },
     {
       "git-tree": "e0ba585cd7dea2dd84e0c2cf8ca462b7c1e58f1e",
       "version": "4.4.3",
diff --git a/versions/x-/x265.json b/versions/x-/x265.json
index 29999f52a41..7edfd8fba23 100644
--- a/versions/x-/x265.json
+++ b/versions/x-/x265.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "e47c9f9c25b46dbf26b7db6843e23d6f0d329ddb",
+      "version": "3.4",
+      "port-version": 8
+    },
     {
       "git-tree": "994e11b88e86c790b503ec381185f33833b351f9",
       "version": "3.4",