user/ffmpeg: bugfix bump to 4.1

2 files changed, 4 insertions, 53 deletions

diff --git a/user/ffmpeg/APKBUILD b/user/ffmpeg/APKBUILD
index b396a291e..8d576a7ed 100644
--- a/user/ffmpeg/APKBUILD
+++ b/user/ffmpeg/APKBUILD
@@ -3,8 +3,8 @@
 # Contributor: Jakub Skrzypnik <j.skrzypnik@openmailbox.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=ffmpeg
-pkgver=4.0.2
-pkgrel=1
+pkgver=4.1
+pkgrel=0
 pkgdesc="Record, convert, and stream audio and video"
 url="https://ffmpeg.org/"
 arch="all"
@@ -19,7 +19,6 @@ makedepends="gnutls-dev lame-dev libvorbis-dev xvidcore-dev zlib-dev libvdpau-de
 	ladspa-dev libcdio-dev libcdio-paranoia-dev wavpack-dev libwebp-dev"
 source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz
 	0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
-	altivec-fix.patch
 	"
 
 # secfixes:
@@ -100,6 +99,5 @@ libs() {
 	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
 }
 
-sha512sums="2dc2b8c66d9c31b6d06da5da336ef45415e3c24fac8c9063cd47f7d4cf688ec4846f88cdd9e841b956cea81e56bb3c6b7655aef503400c7367c32910c28990ac  ffmpeg-4.0.2.tar.xz
-32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb  0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch
-225a87ad4b5564e2cbf35e669cc54adddf7f8ca05fbcfc27ed92f4406d0fd3b27558477afaf4c3c13079b19035d0761d8b2f8af9bc25fcfd727183faa606e4f6  altivec-fix.patch"
+sha512sums="59db7e8a6238048c04c3b0bd5885aea2bf7951f79949fc0659a8d235c4cd809ac0c1a74544a4c218a38c8c739eea76f5ee1231bfb96439487212c6e65591780e  ffmpeg-4.1.tar.xz
+32652e18d4eb231a2e32ad1cacffdf33264aac9d459e0e2e6dd91484fced4e1ca5a62886057b1f0b4b1589c014bbe793d17c78adbaffec195f9a75733b5b18cb  0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch"
diff --git a/user/ffmpeg/altivec-fix.patch b/user/ffmpeg/altivec-fix.patch
deleted file mode 100644
index e0d6230a3..000000000
--- a/user/ffmpeg/altivec-fix.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c0f58c3d4da82aaf5774b1bc3a11b8a416664e18 Mon Sep 17 00:00:00 2001
-From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
-Date: Sat, 21 Jul 2018 00:42:00 -0500
-Subject: [PATCH] libavcodec/ppc: Fix HEVC AltiVec routines
-
-GCC requires the argument to vec_splat_u32 to be a literal.  The easiest
-way to accomplish this is to change 'shift' to be const in scale (as it
-is in the transform routine above), and convert both routines to be
-inline.  This way, GCC can coerce the values to literals.
-
-Tested on a 970 (Apple G5) and POWER9 (Talos II); passed fate and played
-a clip of Big Buck Bunny correctly.
-
-Signed-off-by: A. Wilcox <AWilcox@Wilcox-Tech.com>
----
- libavcodec/ppc/hevcdsp.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/libavcodec/ppc/hevcdsp.c b/libavcodec/ppc/hevcdsp.c
-index 4b1037d792..c8679c2de2 100644
---- a/libavcodec/ppc/hevcdsp.c
-+++ b/libavcodec/ppc/hevcdsp.c
-@@ -41,8 +41,9 @@ static const vec_u8 mask[2] = {
-     { 0x04, 0x05, 0x0C, 0x0D, 0x14, 0x15, 0x1C, 0x1D, 0x06, 0x07, 0x0E, 0x0F, 0x16, 0x17, 0x1E, 0x1F },
- };
- 
--static void transform4x4(vec_s16 src_01, vec_s16 src_23, vec_s32 res[4],
--                         const int shift, int16_t *coeffs)
-+static av_always_inline void transform4x4(vec_s16 src_01, vec_s16 src_23,
-+					  vec_s32 res[4], const int shift,
-+					  int16_t *coeffs)
- {
-     vec_s16 src_02, src_13;
-     vec_s32 zero = vec_splat_s32(0);
-@@ -67,7 +68,8 @@ static void transform4x4(vec_s16 src_01, vec_s16 src_23, vec_s32 res[4],
-     res[3] = vec_sub(e0, o0);
- }
- 
--static void scale(vec_s32 res[4], vec_s16 res_packed[2], int shift)
-+static av_always_inline void scale(vec_s32 res[4], vec_s16 res_packed[2],
-+				   const int shift)
- {
-     int i;
-     vec_u32 v_shift = vec_splat_u32(shift);
--- 
-2.17.1
-