From 7fa1d8e5a96b8546a5e89db7299533e696514c97 Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 6 Sep 2022 12:50:25 +0000
Subject: [PATCH] extra/ffmpeg to 5.1.1-2

---
 extra/ffmpeg/PKGBUILD                          | 10 ++++------
 ...D1EC9E8DE085C629B3E1846B18E8928B3948D64.asc | 18 ++++++++++++++++++
 2 files changed, 22 insertions(+), 6 deletions(-)
 create mode 100644 extra/ffmpeg/keys/pgp/DD1EC9E8DE085C629B3E1846B18E8928B3948D64.asc

diff --git a/extra/ffmpeg/PKGBUILD b/extra/ffmpeg/PKGBUILD
index a9131b342..2a02b9419 100644
--- a/extra/ffmpeg/PKGBUILD
+++ b/extra/ffmpeg/PKGBUILD
@@ -16,7 +16,7 @@
 
 pkgname=ffmpeg
 pkgver=5.1.1
-pkgrel=1
+pkgrel=2
 epoch=2
 pkgdesc='Complete solution to record, convert and stream audio and video'
 arch=(x86_64)
@@ -99,17 +99,17 @@ provides=(
 options=(
   debug
 )
-_tag=1bad30dbe34f2d100b43e8f773d3fe0b5eb23523
+_tag=8536e629f0c35c0e8a2b67e65d3bc60a088fe413
 source=(
-  git+https://git.ffmpeg.org/ffmpeg.git#tag=${_tag}
+  git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=${_tag}
   add-av_stream_get_first_dts-for-chromium.patch
 )
 b2sums=('SKIP'
         '555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de')
+validpgpkeys=(DD1EC9E8DE085C629B3E1846B18E8928B3948D64) # Michael Niedermayer <michael@niedermayer.cc>
 
 prepare() {
   cd ffmpeg
-  git cherry-pick -n 412922cc6fa790897ef6bb2be5d6f9a5f030754d # remove default IPFS gateway
   patch -Np1 -i ../add-av_stream_get_first_dts-for-chromium.patch # https://crbug.com/1251779
 }
 
@@ -120,7 +120,6 @@ pkgver() {
 
 build() {
   cd ffmpeg
-
   [[ $CARCH == "armv7h" || $CARCH == "aarch64" ]] && CONFIG='--host-cflags="-fPIC"'
 
   ./configure \
@@ -172,7 +171,6 @@ build() {
     --enable-shared \
     --enable-version3 \
     $CONFIG
-
   make
   make tools/qt-faststart
   make doc/ff{mpeg,play}.1
diff --git a/extra/ffmpeg/keys/pgp/DD1EC9E8DE085C629B3E1846B18E8928B3948D64.asc b/extra/ffmpeg/keys/pgp/DD1EC9E8DE085C629B3E1846B18E8928B3948D64.asc
new file mode 100644
index 000000000..31aa50418
--- /dev/null
+++ b/extra/ffmpeg/keys/pgp/DD1EC9E8DE085C629B3E1846B18E8928B3948D64.asc
@@ -0,0 +1,18 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEYvA3sxYJKwYBBAHaRw8BAQdAhF26S5QlUZssryHGHLYw61FsF+0s54qWEDm1
+Rurfi5O0R01pY2hhZWwgTmllZGVybWF5ZXIgKGtleSB1c2VkIGZvciBnaXQgY29t
+bWl0cykgPG1pY2hhZWxAbmllZGVybWF5ZXIuY2M+iJYEExYIAD4WIQTdHsno3ghc
+Yps+GEaxjokos5SNZAUCYvK5qAIbAwUJA8JnAAULCQgHAgYVCgkICwIEFgIDAQIe
+AQIXgAAKCRCxjokos5SNZAYxAP98oPrhw3wio1JiJ7ujYgSc9+6ZwcFMY25vFKgp
+a+tGPQD9Gon4ZjIDGZeQ50JV3neFB5gKasqFAW+H/WiTtJFusQO0ME1pY2hhZWwg
+TmllZGVybWF5ZXIgPG1pY2hhZWwtZ2l0QG5pZWRlcm1heWVyLmNjPoiWBBMWCAA+
+FiEE3R7J6N4IXGKbPhhGsY6JKLOUjWQFAmLwN7MCGwMFCQPCZwAFCwkIBwIGFQoJ
+CAsCBBYCAwECHgECF4AACgkQsY6JKLOUjWTKMwD8DW39MrtvYdjP/CvxWTma+MEr
+gkFfrx67y+zO0r6vYmYA/063Y7s6+ef0Whydf5xlJLYFnX3ZwXnZubVsjJz0WV0E
+uDgEYvA3sxIKKwYBBAGXVQEFAQEHQD381bpdRfPa3DjWWFQx1IeRgeSavPep1v4C
+2noShjcTAwEIB4h4BBgWCAAgFiEE3R7J6N4IXGKbPhhGsY6JKLOUjWQFAmLwN7MC
+GwwACgkQsY6JKLOUjWRryQEA+nEGWw5ygbiYpSe34erzopoxh+iIUdzl+OnyU2fp
+NVsA/A91nhyyR8eMlAptr16FVoEnZBHtcK2cTcGxqkdLJMkG
+=0obf
+-----END PGP PUBLIC KEY BLOCK-----