[ffmpeg] Fix missing libxvid (rfbz#4274)
commit 97cbc703d7e855809b983f1e296e2c98fa1f1676
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Sat Oct 1 13:22:14 2016 +0100
Fix missing libxvid (rfbz#4274)
.gitignore | 1 +
ffmpeg.spec | 9 ++++++---
sources | 2 +-
3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f5fe609..be956a0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ ffmpeg-2.8.7.tar.xz
/ffmpeg-3.1.2.tar.xz
/ffmpeg-3.1.3.tar.xz
/ffmpeg-3.1.4.tar.bz2
+/ffmpeg-3.1.4.tar.xz
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 427f05a..d75a3ea 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -20,7 +20,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 3.1.4
-Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr} || 0%{?_with_gmp}
License: GPLv3+
%else
@@ -106,7 +106,7 @@ BuildRequires: texinfo
%{?_with_wavpack:BuildRequires: wavpack-devel}
%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.31}
%{!?_without_x265:BuildRequires: x265-devel}
-%{?_with_xvid:BuildRequires: xvidcore-devel}
+%{!?_without_xvid:BuildRequires: xvidcore-devel}
BuildRequires: zlib-devel
%{?_with_zmq:BuildRequires: zeromq-devel}
%{?_with_zvbi:BuildRequires: zvbi-devel}
@@ -211,7 +211,7 @@ This package contains development files for %{name}
%{?_with_webp:--enable-libwebp} \\\
%{!?_without_x264:--enable-libx264} \\\
%{!?_without_x265:--enable-libx265} \\\
- %{?_with_xvid:--enable-libxvid} \\\
+ %{!?_without_xvid:--enable-libxvid} \\\
%{?_with_zmq:--enable-libzmq} \\\
%{?_with_zvbi:--enable-libzvbi} \\\
--enable-x11grab \\\
@@ -331,6 +331,9 @@ install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
%changelog
+* Sat Oct 01 2016 Leigh Scott <leigh123linux(a)googlemail.com> - 3.1.4-2
+- Fix missing libxvid (rfbz#4274)
+
* Sat Oct 01 2016 Julian Sikorski <belegdol(a)fedoraproject.org> - 3.1.4-1
- Updated to 3.1.4
diff --git a/sources b/sources
index 7c2c67e..a44d7a2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1c099ec01cef5caadd05a4f78561c560 ffmpeg-3.1.4.tar.bz2
+b54d3e3d2d14d64305b840bb3d287445 ffmpeg-3.1.4.tar.xz