Revert "media-video/ffmpeg: Drop old versions"

This reverts commit eeca71e786b6fdc384121c61019a13ff77be8f0f.

Signed-off-by: Matt Turner <mattst88@gentoo.org>

2 files changed, 45 insertions, 0 deletions

diff --git a/media-video/ffmpeg/files/ffmpeg-4.3-altivec-novsx-yuv2rgb.patch b/media-video/ffmpeg/files/ffmpeg-4.3-altivec-novsx-yuv2rgb.patch
new file mode 100644
index 000000000000..40e7f9161726
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-4.3-altivec-novsx-yuv2rgb.patch
@@ -0,0 +1,23 @@
+Fixes build on ppc.

+https://trac.ffmpeg.org/attachment/ticket/8750/ffmpeg_altivec_yuv2rgb_novsx.patch

+diff --git a/libswscale/ppc/yuv2rgb_altivec.c b/libswscale/ppc/yuv2rgb_altivec.c

+index 536545293d..930ef6b98f 100644

+--- a/libswscale/ppc/yuv2rgb_altivec.c

++++ b/libswscale/ppc/yuv2rgb_altivec.c

+@@ -283,6 +283,16 @@ static inline void cvtyuvtoRGB(SwsContext *c, vector signed short Y,

+  * ------------------------------------------------------------------------------

+  */

+

++#if !HAVE_VSX

++static inline vector unsigned char vec_xl(signed long long offset, const ubyte *addr)

++{

++    const vector unsigned char *v_addr = (const vector unsigned char *) (addr + offset);

++    vector unsigned char align_perm = vec_lvsl(offset, addr);

++

++    return (vector unsigned char) vec_perm(v_addr[0], v_addr[1], align_perm);

++}

++#endif /* !HAVE_VSX */

++

+ #define DEFCSP420_CVT(name, out_pixels)                                       \

+ static int altivec_ ## name(SwsContext *c, const unsigned char **in,          \

+                             int *instrides, int srcSliceY, int srcSliceH,     \

diff --git a/media-video/ffmpeg/files/ffmpeg-4.3-fix-build-without-SSSE3.patch b/media-video/ffmpeg/files/ffmpeg-4.3-fix-build-without-SSSE3.patch
new file mode 100644
index 000000000000..c3e6733160f6
--- /dev/null
+++ b/media-video/ffmpeg/files/ffmpeg-4.3-fix-build-without-SSSE3.patch
@@ -0,0 +1,22 @@
+https://bugs.gentoo.org/728566
+http://ffmpeg.org/pipermail/ffmpeg-devel/2020-February/257474.html
+
+--- a/libswscale/x86/yuv2rgb.c
++++ b/libswscale/x86/yuv2rgb.c
+@@ -83,6 +83,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
+ #if HAVE_X86ASM
+     int cpu_flags = av_get_cpu_flags();
+ 
++#if HAVE_SSSE3
+     if (EXTERNAL_SSSE3(cpu_flags)) {
+         switch (c->dstFormat) {
+         case AV_PIX_FMT_RGB32:
+@@ -111,6 +112,7 @@ av_cold SwsFunc ff_yuv2rgb_init_x86(SwsContext *c)
+             return yuv420_rgb15_ssse3;
+         }
+     }
++#endif
+ 
+     if (EXTERNAL_MMXEXT(cpu_flags)) {
+         switch (c->dstFormat) {
+