From 5a6ba75007459ee366cbcc96ebf788f6a106f3f2 Mon Sep 17 00:00:00 2001
From: Hsiao-nan Cheung <niheaven@gmail.com>
Date: Fri, 3 Jan 2020 22:11:04 +0800
Subject: [PATCH] x264: Fix URL and remove 'x264-10bit' (#657)

---
 bucket/x264-10bit.json | 32 --------------------------------
 bucket/x264.json       | 31 ++++++++++++-------------------
 2 files changed, 12 insertions(+), 51 deletions(-)
 delete mode 100644 bucket/x264-10bit.json

diff --git a/bucket/x264-10bit.json b/bucket/x264-10bit.json
deleted file mode 100644
index 17bc5d8083..0000000000
--- a/bucket/x264-10bit.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "description": "H.264/MPEG-4 AVC video encoder (10 bit)",
-    "homepage": "https://www.videolan.org/developers/x264.html",
-    "license": "GPL-2.0-only",
-    "version": "2851",
-    "architecture": {
-        "64bit": {
-            "hash": "6dab3cfd5d5685206160f5a31b951ce6a9712d7694f7c0cefd8c3e8ad9c24f00",
-            "url": "https://download.videolan.org/pub/x264/binaries/win64/x264-10b-r2851-ba24899.exe#/x264-10b.exe"
-        },
-        "32bit": {
-            "hash": "7c233457a6f23a475877c4ff0061f3f52bf02e8f19b1ba92c73dd37df5b37d68",
-            "url": "https://download.videolan.org/pub/x264/binaries/win32/x264-10b-r2851-ba24899.exe#/x264-10b.exe"
-        }
-    },
-    "bin": "x264-10b.exe",
-    "checkver": {
-        "url": "https://download.videolan.org/pub/videolan/x264/binaries/win64/",
-        "re": "x264-10b-r(?<version>[\\d]+)-(?<commit>[a-fA-F0-9]{7}).exe",
-        "reverse": true
-    },
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://download.videolan.org/pub/x264/binaries/win64/x264-10b-r$version-$matchCommit.exe#/x264-10b.exe"
-            },
-            "32bit": {
-                "url": "https://download.videolan.org/pub/x264/binaries/win32/x264-10b-r$version-$matchCommit.exe#/x264-10b.exe"
-            }
-        }
-    }
-}
diff --git a/bucket/x264.json b/bucket/x264.json
index 32b7d1b72d..b12356861b 100644
--- a/bucket/x264.json
+++ b/bucket/x264.json
@@ -1,37 +1,30 @@
 {
-    "description": "H.264/MPEG-4 AVC video encoder (8 bit)",
+    "description": "H.264/MPEG-4 AVC video encoder",
     "homepage": "https://www.videolan.org/developers/x264.html",
-    "license": "GPL-2.0-only",
-    "version": "2969",
+    "license": "GPL-2.0-or-later",
+    "version": "2991",
     "architecture": {
         "64bit": {
-            "hash": "ad51fdad190341da74315701edfc9a2b1937ae9d5666b04c98c194401610c9bf",
-            "url": "https://download.videolan.org/pub/x264/binaries/win64/x264-r2969-d4099dd.exe#/x264.exe"
+            "url": "https://artifacts.videolan.org/x264/release-win64/x264-r2991-1771b55.exe#/x264.exe",
+            "hash": "0cc1ddc8467bb8f40de4d0994e8c1b7d4d63e90239aef00f2b71ef417815000f"
         },
         "32bit": {
-            "hash": "7b8fb6e8a29511946aaf961a34848322e65ed5a4bd4b4e96434b355ded85b14b",
-            "url": "https://download.videolan.org/pub/x264/binaries/win32/x264-r2969-d4099dd.exe#/x264.exe"
+            "url": "https://artifacts.videolan.org/x264/release-win32/x264-r2991-1771b55.exe#/x264.exe",
+            "hash": "a9f71339dd8792a6a857358d324c2e5d688c4e7d37907a052daef728051338a4"
         }
     },
-    "bin": [
-        "x264.exe",
-        [
-            "x264.exe",
-            "x264-8b"
-        ]
-    ],
+    "bin": "x264.exe",
     "checkver": {
-        "url": "https://download.videolan.org/pub/videolan/x264/binaries/win64/",
-        "re": "x264-r(?<version>[\\d]+)-(?<commit>[a-fA-F0-9]{7}).exe",
-        "reverse": true
+        "url": "https://artifacts.videolan.org/x264/release-win64/",
+        "regex": "x264-r([\\d]+)-(?<commit>[a-fA-F0-9]{7}).exe"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://download.videolan.org/pub/x264/binaries/win64/x264-r$version-$matchCommit.exe#/x264.exe"
+                "url": "https://artifacts.videolan.org/x264/release-win64/x264-r$version-$matchCommit.exe#/x264.exe"
             },
             "32bit": {
-                "url": "https://download.videolan.org/pub/x264/binaries/win32/x264-r$version-$matchCommit.exe#/x264.exe"
+                "url": "https://artifacts.videolan.org/x264/release-win32/x264-r$version-$matchCommit.exe#/x264.exe"
             }
         }
     }