From d0c6488c335c12fd8d87d2b83ac33a56dec232d29868075e83b02dbb16d36151 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 18 Jun 2020 03:55:02 +0000 Subject: [PATCH] Remove ffmpeg-altivec-build.patch again. osc build with qemu did not complete; and real build completed but failed to link. OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=124 --- ffmpeg-4.changes | 1 - ffmpeg-4.spec | 1 - ffmpeg-altivec-build.patch | 27 --------------------------- 3 files changed, 29 deletions(-) delete mode 100644 ffmpeg-altivec-build.patch diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index bfb2790..fd5c9b4 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -16,7 +16,6 @@ Wed Jun 17 16:32:04 UTC 2020 - Jan Engelhardt ffmpeg4_swscale_fix_altivec_vsx_recent_gcc.patch, 929e5159bc13da374b83f5627879c607acce180b.patch (merged) -- Add ffmpeg-altivec-build.patch ------------------------------------------------------------------- Fri Jun 5 16:21:42 UTC 2020 - Bjørn Lie diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 604e9cf..9a66f75 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -111,7 +111,6 @@ Patch1: ffmpeg-arm6l.diff Patch2: ffmpeg-new-coder-errors.diff Patch3: ffmpeg-codec-choice.diff Patch4: ffmpeg-4.2-dlopen-fdk_aac.patch -Patch5: ffmpeg-altivec-build.patch BuildRequires: ladspa-devel BuildRequires: libgsm-devel BuildRequires: libmp3lame-devel diff --git a/ffmpeg-altivec-build.patch b/ffmpeg-altivec-build.patch deleted file mode 100644 index 312a0d4..0000000 --- a/ffmpeg-altivec-build.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Jan Engelhardt -Date: 2020-06-18 00:40:03.633300733 +0200 - -The standard ppc64 build tries to compile yuv2rgb_altivec, but this fails -because -mvsx is not in use. - -libswscale/ppc/yuv2rgb_altivec.c: In function 'altivec_yuv2_abgr': -libswscale/ppc/yuv2rgb_altivec.c:338:18: error: implicit declaration of function 'vec_xl'; did you mean 'vec_rl'? [-Werror=implicit-funct -ion-declaration] - 338 | y0 = vec_xl(0, y1i); \ -libswscale/ppc/yuv2rgb_altivec.c:338:18: error: incompatible types when assigning to type '__vector unsigned char' {aka '__vector(16) unsigned char'} from type 'int' - 338 | y0 = vec_xl(0, y1i); \ - ---- - libswscale/ppc/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: ffmpeg-4.3/libswscale/ppc/Makefile -=================================================================== ---- ffmpeg-4.3.orig/libswscale/ppc/Makefile -+++ ffmpeg-4.3/libswscale/ppc/Makefile -@@ -1,4 +1,4 @@ --OBJS += ppc/swscale_altivec.o \ -+VSX-OBJS += ppc/swscale_altivec.o \ - ppc/yuv2rgb_altivec.o \ - ppc/yuv2yuv_altivec.o \ - ppc/swscale_vsx.o