Updated to the last version of FFMPEG supporting 57, 3.4.8

3 files changed, 12 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 236845dbbe3c..d9fb1bb85638 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ffmpeg-compat-57
 	pkgdesc = Compatibility package for ffmpeg to provide versions 57 of libavcodec, libavdevice and libavformat, not anymore provided by the ffmpeg package
-	pkgver = 3.4.2
-	pkgrel = 4
+	pkgver = 3.4.8
+	pkgrel = 1
 	url = http://ffmpeg.org/
 	arch = i686
 	arch = x86_64
@@ -63,15 +63,13 @@ pkgbase = ffmpeg-compat-57
 	provides = libpostproc.so=54
 	provides = libswresample.so=2
 	provides = libswscale.so=4
-	source = http://ffmpeg.org/releases/ffmpeg-3.4.2.tar.xz
-	source = http://ffmpeg.org/releases/ffmpeg-3.4.2.tar.xz.asc
+	source = http://ffmpeg.org/releases/ffmpeg-3.4.8.tar.xz
+	source = http://ffmpeg.org/releases/ffmpeg-3.4.8.tar.xz.asc
 	source = fs56089.patch
-	source = FFmpeg-devel-avutil-mem-Fix-invalid-use-of-av_alloc_size.patch
 	validpgpkeys = FCF986EA15E6E293A5644F10B4322F04D67658D8
-	sha256sums = 2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740
+	sha256sums = 09b9e4644e191a5e6c46b7293839297a7b6f5459fb8817d5255ff29c8ae307ae
 	sha256sums = SKIP
 	sha256sums = 0bfcd12d1992903f21c146ae56d9ad89b52818cfb2303197ee905347c25a5427
-	sha256sums = 5aeba39dcc8b23502e214310542f45ccc5fbcdb8104e88c9feca515fce1ae404
 
 pkgname = ffmpeg-compat-57
 
diff --git a/FFmpeg-devel-avutil-mem-Fix-invalid-use-of-av_alloc_size.patch b/FFmpeg-devel-avutil-mem-Fix-invalid-use-of-av_alloc_size.patch
deleted file mode 100644
index 65a21ef2520b..000000000000
--- a/FFmpeg-devel-avutil-mem-Fix-invalid-use-of-av_alloc_size.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libavutil/mem.h b/libavutil/mem.h
-index 55ae573ac9..5fb1a02dd9 100644
---- a/libavutil/mem.h
-+++ b/libavutil/mem.h
-@@ -339,7 +339,7 @@ av_alloc_size(2, 3) void *av_realloc_array(void *ptr, size_t nmemb, size_t size)
-  * @warning Unlike av_malloc(), the allocated memory is not guaranteed to be
-  *          correctly aligned.
-  */
--av_alloc_size(2, 3) int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
-+int av_reallocp_array(void *ptr, size_t nmemb, size_t size);
- 
- /**
-  * Reallocate the given buffer if it is not large enough, otherwise do nothing.
diff --git a/PKGBUILD b/PKGBUILD
index 694ef8af77d5..85d4ebad8de4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,10 @@
 # Contributor: Muflone http://www.muflone.com/contacts/english/
-# Last Maintainer: Matthew Sexton <wsdmatty@gmail.com>
+# Maintainer: Matthew Sexton <wsdmatty@gmail.com>
 # Maintainer: sgtxd <mark@sgtxd.de>
-# Maintainer: HurricanePootis <hurricanepootis@protonmail.com>
+# Latest Maintainer: HurricanePootis <hurricanepootis@protonmail.com>
 pkgname=ffmpeg-compat-57
-pkgver=3.4.2
-pkgrel=4
+pkgver=3.4.8
+pkgrel=1
 pkgdesc="Compatibility package for ffmpeg to provide versions 57 of libavcodec, libavdevice and libavformat, not anymore provided by the ffmpeg package"
 arch=('i686' 'x86_64')
 url="http://ffmpeg.org/"
@@ -23,12 +23,10 @@ provides=('libavcodec.so=57' 'libavdevice.so=57' 'libavfilter.so=6'
           'libavformat.so=57' 'libavresample.so=3' 'libavutil.so=55'
           'libpostproc.so=54' 'libswresample.so=2' 'libswscale.so=4')
 source=("http://ffmpeg.org/releases/ffmpeg-${pkgver}.tar.xz"{,.asc}
-        "fs56089.patch"
-	"FFmpeg-devel-avutil-mem-Fix-invalid-use-of-av_alloc_size.patch")
-sha256sums=('2b92e9578ef8b3e49eeab229e69305f5f4cbc1fdaa22e927fc7fca18acccd740'
+        "fs56089.patch")
+sha256sums=('09b9e4644e191a5e6c46b7293839297a7b6f5459fb8817d5255ff29c8ae307ae'
             'SKIP'
-            '0bfcd12d1992903f21c146ae56d9ad89b52818cfb2303197ee905347c25a5427'
-            '5aeba39dcc8b23502e214310542f45ccc5fbcdb8104e88c9feca515fce1ae404')
+            '0bfcd12d1992903f21c146ae56d9ad89b52818cfb2303197ee905347c25a5427')
 validpgpkeys=('FCF986EA15E6E293A5644F10B4322F04D67658D8')
 
 prepare() {
@@ -38,9 +36,6 @@ prepare() {
   # Backport of http://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=a606f27f4c610708fa96e35eed7b7537d3d8f712
   patch -Np1 -i ../fs56089.patch
 
-  # https://patchwork.ffmpeg.org/patch/11148/
-  # Fixes invalid attribute warning during build with gcc9
-  patch -Np1 -i ../FFmpeg-devel-avutil-mem-Fix-invalid-use-of-av_alloc_size.patch
 }
 
 build() {