commit c91907d05e6e433fe1e380f8f7e33b30e36a51d7 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Mon Oct 16 00:11:50 2017 +0100 Updated to 3.4 LibOpenJPEG-2.2.patch | 95 --------------------------------------------------- LibOpenJPEG-2.3.patch | 95 --------------------------------------------------- ffmpeg.spec | 16 ++++----- sources | 2 +- 4 files changed, 7 insertions(+), 201 deletions(-) --- diff --git a/ffmpeg.spec b/ffmpeg.spec index d5772c8..ca8ad0c 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -70,8 +70,8 @@ Summary: Digital VCR and streaming server Name: ffmpeg%{?flavor} -Version: 3.3.4 -Release: 2%{?date}%{?date:git}%{?rel}%{?dist} +Version: 3.4 +Release: 1%{?date}%{?date:git}%{?rel}%{?dist} License: %{ffmpeg_license} URL: http://ffmpeg.org/ %if 0%{?date} @@ -79,10 +79,6 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2 %else Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz %endif -# Patch based on https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/078322f33ced4b2db6ac3e5002... -Patch0: LibOpenJPEG-2.2.patch -# Patch based on https://git.ffmpeg.org/gitweb/ffmpeg.git/patch/41d6d627024393c142cf7cd93e... -Patch1: LibOpenJPEG-2.3.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{?_with_cuda:BuildRequires: cuda-driver-dev-8-0 cuda-misc-headers-8-0 cuda-drivers-devel%{_isa}} %{?_with_libnpp:BuildRequires: cuda-cudart-dev-8-0 cuda-misc-headers-8-0 cuda-npp-dev-8-0} @@ -145,7 +141,6 @@ BuildRequires: opus-devel %{!?_without_pulse:BuildRequires: pulseaudio-libs-devel} BuildRequires: perl(Pod::Man) %{?_with_rubberband:BuildRequires: rubberband-devel} -BuildRequires: schroedinger-devel %{!?_without_tools:BuildRequires: SDL2-devel} %{?_with_snappy:BuildRequires: snappy-devel} BuildRequires: soxr-devel @@ -257,7 +252,6 @@ This package contains development files for %{name} %{!?_without_pulse:--enable-libpulse} \\\ %{?_with_rtmp:--enable-librtmp} \\\ %{?_with_rubberband:--enable-librubberband} \\\ - --enable-libschroedinger \\\ %{?_with_smb:--enable-libsmbclient} \\\ %{?_with_snappy:--enable-libsnappy} \\\ --enable-libsoxr \\\ @@ -293,8 +287,6 @@ echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION %else %setup -q -n ffmpeg-%{version} %endif -%patch0 -p1 -%patch1 -p1 # fix -O3 -g in host_cflags sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure mkdir -p _doc/examples @@ -396,6 +388,10 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir} %changelog +* Sun Oct 15 2017 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 3.4-1 +- Updated to 3.4 +- Remove build requires schroedinger-devel (wrapper was removed) + * Thu Oct 12 2017 Dominik Mierzejewski <rpm(a)greysector.net&gt; - 3.3.4-2 - add support for OpenJPEG v2.3 diff --git a/sources b/sources index cf56903..ee7e29f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e14a0200c78ce5c918427e57cd406a0d ffmpeg-3.3.4.tar.xz +c64ba7247bb91e516f6a5789348fd5b5 ffmpeg-3.4.tar.xz