[ffmpeg/f30] Update to 4.1.5 release
commit 114792b5c8d7d108d56aab335e372cf3c0aec909
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jan 7 22:09:52 2020 +0000
Update to 4.1.5 release
4361293fcf59edb56879c36edcd25f0a91e0edf8.patch | 32 --------------------------
ffmpeg.spec | 11 ++++-----
sources | 2 +-
3 files changed, 6 insertions(+), 39 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 6f4627f..9a3dbc2 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -86,8 +86,8 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
-Version: 4.1.4
-Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
+Version: 4.1.5
+Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -95,9 +95,6 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
%else
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
-#Backport avutil/mem: Fix invalid use of av_alloc_size
-#See rfbz#5221
-Patch0: 4361293fcf59edb56879c36edcd25f0a91e0edf8.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel}
%{?_with_libnpp:BuildRequires: pkgconfig(nppc-%{_cuda_version})}
@@ -322,7 +319,6 @@ echo "git-snapshot-%{?branch}%{date}-rpmfusion" >
VERSION
%else
%setup -q -n ffmpeg-%{version}
%endif
-%patch0 -p1
# fix -O3 -g in host_cflags
sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
mkdir -p _doc/examples
@@ -429,6 +425,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Tue Jan 07 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.1.5-1
+- Update to 4.1.5 release
+
* Sat Sep 07 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 4.1.4-2
- Enable libjack (rfbz #5346)
diff --git a/sources b/sources
index fcf0ca9..49625b2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5307931aeb7aaee5e1509d9996040661 ffmpeg-4.1.4.tar.xz
+SHA512 (ffmpeg-4.1.5.tar.xz) =
3fe235bbd85b3d3b26eaadfc1105cd44f4029aa38afd6a7f1b9476aa3ffcdc9ab31f5df8510abf56bf01b79e98f542c0d5778a307b50bdb737f86e0c0c8a2dce