From 1c686737ff9ad8e2fdf08aef3c1216c1d5dc32bd Mon Sep 17 00:00:00 2001 From: Dominik 'Rathann' Mierzejewski Date: Sat, 16 Jul 2016 00:15:38 +0200 Subject: [PATCH] make xvidcore support optional --- ffmpeg.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ffmpeg.spec b/ffmpeg.spec index 1b3b0e8..7bc6d7c 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -74,7 +74,7 @@ BuildRequires: subversion BuildRequires: texinfo %{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.31} %{!?_without_x265:BuildRequires: x265-devel} -BuildRequires: xvidcore-devel +%{?_with_xvid:BuildRequires: xvidcore-devel} BuildRequires: zlib-devel %ifarch %{ix86} x86_64 BuildRequires: yasm @@ -160,7 +160,7 @@ This package contains development files for %{name} %{!?_without_vpx:--enable-libvpx} \\\ %{!?_without_x264:--enable-libx264} \\\ %{!?_without_x265:--enable-libx265} \\\ - --enable-libxvid \\\ + %{?_with_xvid:--enable-libxvid} \\\ --enable-x11grab \\\ --enable-avfilter \\\ --enable-avresample \\\ @@ -271,6 +271,7 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir} - add conditional support for QSV via libmfx (rfbz#4043) - drop libcelt support (celt 0.11 no longer available in Fedora) - drop libdirac support (unsupported by FFmpeg) +- make xvidcore support optional * Thu Jul 07 2016 Julian Sikorski - 3.0.2-3 - Fixed build failure on rawhide due to newer opencv using a patch from upstream