enable x86_64 asm atadenoise only on x86_64

avoids empty object on %{ix86} causing errors during stripping

diff --git a/ffmpeg-atadenoise.patch b/ffmpeg-atadenoise.patch
new file mode 100644 (file)
index 0000000..6d7877c
--- /dev/null
+++ b/ffmpeg-atadenoise.patch
@@ -0,0 +1,12 @@
+--- ffmpeg-4.3/libavfilter/x86/Makefile.orig   2020-06-15 20:54:24.000000000 +0200
++++ ffmpeg-4.3/libavfilter/x86/Makefile        2020-06-30 11:50:18.575161000 +0200
+@@ -42,7 +42,9 @@
+ 
+ X86ASM-OBJS-$(CONFIG_AFIR_FILTER)            += x86/af_afir.o
+ X86ASM-OBJS-$(CONFIG_ANLMDN_FILTER)          += x86/af_anlmdn.o
++ifdef ARCH_X86_64
+ X86ASM-OBJS-$(CONFIG_ATADENOISE_FILTER)      += x86/vf_atadenoise.o
++endif
+ X86ASM-OBJS-$(CONFIG_BLEND_FILTER)           += x86/vf_blend.o
+ X86ASM-OBJS-$(CONFIG_BWDIF_FILTER)           += x86/vf_bwdif.o
+ X86ASM-OBJS-$(CONFIG_COLORSPACE_FILTER)      += x86/colorspacedsp.o

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 6e3129545785b634f95cc82199a73469f2fbe4bd..9c0f8eb410bb34e11691eac7591d420488acf13a 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -115,6 +115,7 @@ Group:              Applications/Multimedia
 Source0:       http://ffmpeg.org/releases/%{name}-%{version}.tar.xz
 # Source0-md5: 3adcf4f122fcc54624f5d509107d5625
 Patch0:                %{name}-omx-libnames.patch
+Patch1:                %{name}-atadenoise.patch
 URL:           http://www.ffmpeg.org/
 %{?with_decklink:BuildRequires:        Blackmagic_DeckLink_SDK >= 10.9.5}
 %{?with_openal:BuildRequires:  OpenAL-devel >= 1.1}
@@ -490,6 +491,7 @@ Dokumentacja pakietu FFmpeg w formacie HTML.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig