Update to 2:7.0-2

1 files changed, 4 insertions, 22 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 07ece1fa9180..d9d0d15771cc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,8 +8,8 @@
 # Contributor: Paul Mattal <paul@archlinux.org>
 
 pkgname=ffmpeg-libfdk_aac
-pkgver=6.1.1
-pkgrel=8
+pkgver=7.0
+pkgrel=2
 epoch=2
 pkgdesc='Complete solution to record, convert and stream audio and video (Same as official package except with libfdk-aac support)'
 arch=(x86_64)
@@ -120,36 +120,18 @@ provides=(
 options=(
   debug
 )
-_tag=6f4048827982a8f48f71f551a6e1ed2362816eec
+_tag=fa053f314a0150bebe073438867e454182909c53
 source=(
   git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=${_tag}
   add-av_stream_get_first_dts-for-chromium.patch
 )
-b2sums=('SKIP'
+b2sums=('4b2057fb68a0137bf149779beee3b7066835216a830896d4de4d31d0c00c2ab13419d4a3f0ccba1ab6d0cb063bdc91f2fc35d5916ddd65288c327880cbdefc41'
         '555274228e09a233d92beb365d413ff5c718a782008075552cafb2130a3783cf976b51dfe4513c15777fb6e8397a34122d475080f2c4483e8feea5c0d878e6de')
 validpgpkeys=(DD1EC9E8DE085C629B3E1846B18E8928B3948D64) # Michael Niedermayer <michael@niedermayer.cc>
 
 prepare() {
   cd ffmpeg
-  # FS#79281: fix assembling with binutil as >= 2.41
-  git cherry-pick -n effadce6c756247ea8bae32dc13bb3e6f464f0eb
-  # FS#77813: fix playing ogg files with mplayer
-  git cherry-pick -n cbcc817353a019da4332ad43deb7bbc4e695d02a
   patch -Np1 -i ../add-av_stream_get_first_dts-for-chromium.patch # https://crbug.com/1251779
-  # use non-deprecated nvenc GUID for conftest
-  git cherry-pick -n 03823ac0c6a38bd6ba972539e3203a592579792f
-  git cherry-pick -n d2b46c1ef768bc31ba9180f6d469d5b8be677500
-  # Fix VDPAU vo
-  git cherry-pick -n e9c93009fc34ca9dfcf0c6f2ed90ef1df298abf7
-  # Fix bug in av_fft_end
-  git cherry-pick -n a562cfee2e214252f8b3f516527272ae32ef9532
-  git cherry-pick -n 250471ea1745fc703eb346a2a662304536a311b1
-  # Fix build with latest vulkan headers
-  git cherry-pick -n fef22c87ada4517441701e6e61e062c9f4399c8e
-  # avcodec/nvenc: stop using long deprecated format specifiers
-  git cherry-pick -n 3481f8d99fc44f5516957e774b7f2da74c33beb8
-  # avcodec/nvenc: support SDK 12.2 bit depth API
-  git cherry-pick -n 38346298973e3869d895e0ad3ca3b19dc598c5c8
 }
 
 pkgver() {