From 4a15f94b69e58a4aa1983d3aaef74d87be49562e Mon Sep 17 00:00:00 2001
From: Werner Stein <wstein@users.noreply.github.com>
Date: Fri, 9 Oct 2020 16:53:51 +0200
Subject: [PATCH] ffmpeg: use BtbN builds (static/shared/nightly/vulkan)
 (#1454)

* Use ffmpeg builds form github.com/BtbN/FFmpeg-Builds (gpl/lgpl, static/shared)

* fix property extract_dir

* remove lgpl variant - revert commit if really needed

* re-adding ffmpeg-nightly variant

* add ffmpeg-nightly-shared-vulkan variant

* remove build number from version check

* complete nightly variants checkversion & autoupdate

* ffmpeg-nightly: Update to version 99456

* ffmpeg: Update to version 4.3.1

* ffmpeg-nightly-shared-vulkan: Update to version 99502

* ffmpeg-nightly-shared: Update to version 99502

* ffmpeg-nightly-vulkan: Update to version 99502

* ffmpeg-nightly: Update to version 99502

* ffmpeg: Update to version 4.3.1

* ffmpeg-shared: Update to version 4.3.1

Co-authored-by: Chawye Hsu <chawyehsu@hotmail.com>
---
 bucket/ffmpeg-nightly-shared-vulkan.json | 31 ++++++++++++++++++++++++
 bucket/ffmpeg-nightly-shared.json        | 31 ++++++++++++++++++++++++
 bucket/ffmpeg-nightly-vulkan.json        | 31 ++++++++++++++++++++++++
 bucket/ffmpeg-nightly.json               | 27 +++++++--------------
 bucket/ffmpeg-shared.json                | 25 ++++++-------------
 bucket/ffmpeg.json                       | 25 ++++++-------------
 6 files changed, 118 insertions(+), 52 deletions(-)
 create mode 100644 bucket/ffmpeg-nightly-shared-vulkan.json
 create mode 100644 bucket/ffmpeg-nightly-shared.json
 create mode 100644 bucket/ffmpeg-nightly-vulkan.json

diff --git a/bucket/ffmpeg-nightly-shared-vulkan.json b/bucket/ffmpeg-nightly-shared-vulkan.json
new file mode 100644
index 0000000000..3534362985
--- /dev/null
+++ b/bucket/ffmpeg-nightly-shared-vulkan.json
@@ -0,0 +1,31 @@
+{
+    "version": "99502",
+    "description": "A complete, cross-platform solution to record, convert and stream audio and video.",
+    "homepage": "https://ffmpeg.org",
+    "license": "GPL-3.0-or-later",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2020-10-09-12-36/ffmpeg-N-99502-g0d156eb58a-win64-gpl-shared-vulkan.zip",
+            "hash": "ba42de59186cd4793091024ce89dd374756069255cfa7563a945c6350148be52",
+            "extract_dir": "ffmpeg-N-99502-g0d156eb58a-win64-gpl-shared-vulkan"
+        }
+    },
+    "bin": [
+        "bin\\ffmpeg.exe",
+        "bin\\ffplay.exe",
+        "bin\\ffprobe.exe"
+    ],
+    "checkver": {
+        "github": "https://github.com/BtbN/FFmpeg-Builds",
+        "re": "/autobuild-(?<time>[0-9-]+)/ffmpeg-N-(?<version>[0-9]+)-g(?<hash>[a-z0-9]+)-(?<variant>win64-gpl-shared-vulkan).zip",
+        "replace": "${version}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-$matchTime/ffmpeg-N-$matchVersion-g$matchHash-$matchVariant.zip",
+                "extract_dir": "ffmpeg-N-$matchVersion-g$matchHash-$matchVariant"
+            }
+        }
+    }
+}
diff --git a/bucket/ffmpeg-nightly-shared.json b/bucket/ffmpeg-nightly-shared.json
new file mode 100644
index 0000000000..cd5109da3e
--- /dev/null
+++ b/bucket/ffmpeg-nightly-shared.json
@@ -0,0 +1,31 @@
+{
+    "version": "99502",
+    "description": "A complete, cross-platform solution to record, convert and stream audio and video.",
+    "homepage": "https://ffmpeg.org",
+    "license": "GPL-3.0-or-later",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2020-10-09-12-36/ffmpeg-N-99502-g0d156eb58a-win64-gpl-shared.zip",
+            "hash": "d13999d893bbeca40ae0d1828d231291202d251728313b4b10be9da05253994c",
+            "extract_dir": "ffmpeg-N-99502-g0d156eb58a-win64-gpl-shared"
+        }
+    },
+    "bin": [
+        "bin\\ffmpeg.exe",
+        "bin\\ffplay.exe",
+        "bin\\ffprobe.exe"
+    ],
+    "checkver": {
+        "github": "https://github.com/BtbN/FFmpeg-Builds",
+        "re": "/autobuild-(?<time>[0-9-]+)/ffmpeg-N-(?<version>[0-9]+)-g(?<hash>[a-z0-9]+)-(?<variant>win64-gpl-shared).zip",
+        "replace": "${version}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-$matchTime/ffmpeg-N-$matchVersion-g$matchHash-$matchVariant.zip",
+                "extract_dir": "ffmpeg-N-$matchVersion-g$matchHash-$matchVariant"
+            }
+        }
+    }
+}
diff --git a/bucket/ffmpeg-nightly-vulkan.json b/bucket/ffmpeg-nightly-vulkan.json
new file mode 100644
index 0000000000..f03f3bda1e
--- /dev/null
+++ b/bucket/ffmpeg-nightly-vulkan.json
@@ -0,0 +1,31 @@
+{
+    "version": "99502",
+    "description": "A complete, cross-platform solution to record, convert and stream audio and video.",
+    "homepage": "https://ffmpeg.org",
+    "license": "GPL-3.0-or-later",
+    "architecture": {
+        "64bit": {
+            "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2020-10-09-12-36/ffmpeg-N-99502-g0d156eb58a-win64-gpl-vulkan.zip",
+            "hash": "7203146039ef0046767bac3a370749feb3c6ef4ed7d0456d10d871cc6b262925",
+            "extract_dir": "ffmpeg-N-99502-g0d156eb58a-win64-gpl-vulkan"
+        }
+    },
+    "bin": [
+        "bin\\ffmpeg.exe",
+        "bin\\ffplay.exe",
+        "bin\\ffprobe.exe"
+    ],
+    "checkver": {
+        "github": "https://github.com/BtbN/FFmpeg-Builds",
+        "re": "/autobuild-(?<time>[0-9-]+)/ffmpeg-N-(?<version>[0-9]+)-g(?<hash>[a-z0-9]+)-(?<variant>win64-gpl-vulkan).zip",
+        "replace": "${version}"
+    },
+    "autoupdate": {
+        "architecture": {
+            "64bit": {
+                "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-$matchTime/ffmpeg-N-$matchVersion-g$matchHash-$matchVariant.zip",
+                "extract_dir": "ffmpeg-N-$matchVersion-g$matchHash-$matchVariant"
+            }
+        }
+    }
+}
diff --git a/bucket/ffmpeg-nightly.json b/bucket/ffmpeg-nightly.json
index 71de845841..995a67fd05 100644
--- a/bucket/ffmpeg-nightly.json
+++ b/bucket/ffmpeg-nightly.json
@@ -1,18 +1,13 @@
 {
-    "version": "20200831-4a11a6f",
+    "version": "99502",
     "description": "A complete, cross-platform solution to record, convert and stream audio and video.",
     "homepage": "https://ffmpeg.org",
     "license": "GPL-3.0-or-later",
     "architecture": {
         "64bit": {
-            "url": "https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-20200831-4a11a6f-win64-static.zip",
-            "hash": "392e6558eaca3878ea049f104642d34316a5d544ea07f26de844ae407b89f723",
-            "extract_dir": "ffmpeg-20200831-4a11a6f-win64-static"
-        },
-        "32bit": {
-            "url": "https://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20200831-4a11a6f-win32-static.zip",
-            "hash": "d4a82c57a199c925cb63947fada1301206adff358fbd30afd374db4cc6a6c4f8",
-            "extract_dir": "ffmpeg-20200831-4a11a6f-win32-static"
+            "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2020-10-09-12-36/ffmpeg-N-99502-g0d156eb58a-win64-gpl.zip",
+            "hash": "1963e8919b7449f0998f31ef7a0b2012510951221c535625c65262473dfd906e",
+            "extract_dir": "ffmpeg-N-99502-g0d156eb58a-win64-gpl"
         }
     },
     "bin": [
@@ -21,19 +16,15 @@
         "bin\\ffprobe.exe"
     ],
     "checkver": {
-        "url": "https://ffmpeg.zeranoe.com/builds/win64/static/",
-        "regex": "ffmpeg-(([\\d.]+)-(\\w+))-win64-static\\.zip",
-        "reverse": true
+        "github": "https://github.com/BtbN/FFmpeg-Builds",
+        "re": "/autobuild-(?<time>[0-9-]+)/ffmpeg-N-(?<version>[0-9]+)-g(?<hash>[a-z0-9]+)-(?<variant>win64-gpl).zip",
+        "replace": "${version}"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-$version-win64-static.zip",
-                "extract_dir": "ffmpeg-$version-win64-static"
-            },
-            "32bit": {
-                "url": "https://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-$version-win32-static.zip",
-                "extract_dir": "ffmpeg-$version-win32-static"
+                "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-$matchTime/ffmpeg-N-$matchVersion-g$matchHash-$matchVariant.zip",
+                "extract_dir": "ffmpeg-N-$matchVersion-g$matchHash-$matchVariant"
             }
         }
     }
diff --git a/bucket/ffmpeg-shared.json b/bucket/ffmpeg-shared.json
index 66e03b5b1c..381aee3dee 100644
--- a/bucket/ffmpeg-shared.json
+++ b/bucket/ffmpeg-shared.json
@@ -5,14 +5,9 @@
     "license": "GPL-3.0-or-later",
     "architecture": {
         "64bit": {
-            "url": "https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-4.3.1-win64-shared.zip",
-            "hash": "dd29b7f92f48dead4dd940492c7509138c0f99db445076d0a597007298a79940",
-            "extract_dir": "ffmpeg-4.3.1-win64-shared"
-        },
-        "32bit": {
-            "url": "https://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-4.3.1-win32-shared.zip",
-            "hash": "357af9901a456f4dcbacd107e83a934d344c9cb07ddad8aaf80612eeab7d26d2",
-            "extract_dir": "ffmpeg-4.3.1-win32-shared"
+            "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2020-10-09-12-36/ffmpeg-n4.3.1-20-g8a2acdc6da-win64-gpl-shared-4.3.zip",
+            "hash": "b02214d2035c532a1b53b9d0d988d04b968ac42545b257e368e9a63b375520e7",
+            "extract_dir": "ffmpeg-n4.3.1-20-g8a2acdc6da-win64-gpl-shared-4.3"
         }
     },
     "bin": [
@@ -21,19 +16,15 @@
         "bin\\ffprobe.exe"
     ],
     "checkver": {
-        "url": "https://ffmpeg.zeranoe.com/builds/win64/shared/",
-        "regex": "ffmpeg-([\\d.]+)-win64-shared\\.zip",
-        "reverse": true
+        "github": "https://github.com/BtbN/FFmpeg-Builds",
+        "re": "/autobuild-(?<time>[0-9-]+)/ffmpeg-n(?<version>[0-9.]+)-(?<build>[0-9]+)-g(?<hash>[a-z0-9]+)-(?<variant>win64-gpl-shared)-(?<short>[0-9.]+).zip",
+        "replace": "${version}"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://ffmpeg.zeranoe.com/builds/win64/shared/ffmpeg-$version-win64-shared.zip",
-                "extract_dir": "ffmpeg-$version-win64-shared"
-            },
-            "32bit": {
-                "url": "https://ffmpeg.zeranoe.com/builds/win32/shared/ffmpeg-$version-win32-shared.zip",
-                "extract_dir": "ffmpeg-$version-win32-shared"
+                "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-$matchTime/ffmpeg-n$matchVersion-$matchBuild-g$matchHash-$matchVariant-$matchShort.zip",
+                "extract_dir": "ffmpeg-n$matchVersion-$matchBuild-g$matchHash-$matchVariant-$matchShort"
             }
         }
     }
diff --git a/bucket/ffmpeg.json b/bucket/ffmpeg.json
index c726a7dd08..b3f45cda11 100644
--- a/bucket/ffmpeg.json
+++ b/bucket/ffmpeg.json
@@ -5,14 +5,9 @@
     "license": "GPL-3.0-or-later",
     "architecture": {
         "64bit": {
-            "url": "https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-4.3.1-win64-static.zip",
-            "hash": "f33a409dc61df9448dcd0505c6d1614a1c161397b3e5ceaebf8f5c0287374108",
-            "extract_dir": "ffmpeg-4.3.1-win64-static"
-        },
-        "32bit": {
-            "url": "https://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-4.3.1-win32-static.zip",
-            "hash": "589e2dedd5bba34dede84c9513505768f4042a33b5bf21d90b97901da635a245",
-            "extract_dir": "ffmpeg-4.3.1-win32-static"
+            "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-2020-10-09-12-36/ffmpeg-n4.3.1-20-g8a2acdc6da-win64-gpl-4.3.zip",
+            "hash": "8244578f02f8e051f56486d70c013955b3ce6a969393c90fe5fc7e4dc4fff577",
+            "extract_dir": "ffmpeg-n4.3.1-20-g8a2acdc6da-win64-gpl-4.3"
         }
     },
     "bin": [
@@ -21,19 +16,15 @@
         "bin\\ffprobe.exe"
     ],
     "checkver": {
-        "url": "https://ffmpeg.zeranoe.com/builds/win64/static/",
-        "regex": "ffmpeg-([\\d.]+)-win64-static\\.zip",
-        "reverse": true
+        "github": "https://github.com/BtbN/FFmpeg-Builds",
+        "re": "/autobuild-(?<time>[0-9-]+)/ffmpeg-n(?<version>[0-9.]+)-(?<build>[0-9]+)-g(?<hash>[a-z0-9]+)-(?<variant>win64-gpl)-(?<short>[0-9.]+).zip",
+        "replace": "${version}"
     },
     "autoupdate": {
         "architecture": {
             "64bit": {
-                "url": "https://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-$version-win64-static.zip",
-                "extract_dir": "ffmpeg-$version-win64-static"
-            },
-            "32bit": {
-                "url": "https://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-$version-win32-static.zip",
-                "extract_dir": "ffmpeg-$version-win32-static"
+                "url": "https://github.com/BtbN/FFmpeg-Builds/releases/download/autobuild-$matchTime/ffmpeg-n$matchVersion-$matchBuild-g$matchHash-$matchVariant-$matchShort.zip",
+                "extract_dir": "ffmpeg-n$matchVersion-$matchBuild-g$matchHash-$matchVariant-$matchShort"
             }
         }
     }