commit 5f4f3566dc1056d0d8f15038bae61959efddc02d
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Jun 24 12:21:34 2020 +0100
Fix conditionals
ffmpeg.spec | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 1fd86e6..fcf8103 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -19,10 +19,12 @@
%global _without_frei0r 1
%global _without_opus 1
%global _without_vpx 1
-%global _without_vapoursynth 1
%endif
%if 0%{?fedora} || 0%{?rhel} > 7
+%ifarch x86_64 i686
+%global _with_vapoursynth 1
+%endif
%ifarch x86_64
%global _with_mfx 1
%global _with_vmaf 1
@@ -151,7 +153,7 @@ BuildRequires: libv4l-devel
%{?!_without_vaapi:BuildRequires: libva-devel >= 0.31.0}
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
-%{?!_without_vapoursynth:BuildRequires: vapoursynth-devel}
+%{?_with_vapoursynth:BuildRequires: vapoursynth-devel}
%{?!_without_vpx:BuildRequires: libvpx-devel >= 1.4.0}
%{?_with_mfx:BuildRequires: pkgconfig(libmfx) >= 1.23-1}
%ifarch %{ix86} x86_64
@@ -313,7 +315,7 @@ This package contains development files for %{name}
--enable-libv4l2 \\\
%{!?_without_vidstab:--enable-libvidstab} \\\
%{?_with_vmaf:--enable-libvmaf --enable-version3} \\\
- %{!?_without_vapoursynth:--enable-vapoursynth} \\\
+ %{?_with_vapoursynth:--enable-vapoursynth} \\\
%{!?_without_vpx:--enable-libvpx} \\\
%{!?_without_vulkan:--enable-vulkan --enable-libglslang} \\\
%{?_with_webp:--enable-libwebp} \\\
Show replies by date