commit 02dd402ab56e0cc09bd0cc05636ddaaa9db162b4 Author: leigh123linux <leigh123linux(a)googlemail.com&gt; Date: Sat Feb 22 10:12:31 2020 +0000 Update to 20200222git .gitignore | 1 + ffmpeg-snapshot.sh | 2 +- ffmpeg.spec | 11 ++++++----- fix_ppc_build.patch | 21 --------------------- sources | 2 +- 5 files changed, 9 insertions(+), 28 deletions(-) --- diff --git a/.gitignore b/.gitignore index 39cf62c..6bc1e22 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ ffmpeg-*.rpm /ffmpeg-20180211.tar.bz2 /ffmpeg-20180305.tar.bz2 /ffmpeg-20180419.tar.bz2 +/ffmpeg-20200222.tar.bz2 diff --git a/ffmpeg-snapshot.sh b/ffmpeg-snapshot.sh index 4f81b74..d4a9ab5 100644 --- a/ffmpeg-snapshot.sh +++ b/ffmpeg-snapshot.sh @@ -15,7 +15,7 @@ pwd=$(pwd) date=$(date +%Y%m%d) pushd "$tmp" -git clone git://git.videolan.org/ffmpeg.git +git clone git://git.ffmpeg.org/ffmpeg.git cd ffmpeg git archive --prefix="ffmpeg-${date}/" --format=tar master | bzip2 > "$pwd"/ffmpeg-${date}.tar.bz2 popd diff --git a/ffmpeg.spec b/ffmpeg.spec index 0217a5d..33245ed 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -1,7 +1,7 @@ # TODO: add make test to %%check section #global branch oldabi- -#global date 20180419 +%global date 20200222 #global rel rc1 # Cuda and others are only available on some arches @@ -82,8 +82,8 @@ ExclusiveArch: armv7hnl Summary: Digital VCR and streaming server Name: ffmpeg%{?flavor} -Version: 4.2.2 -Release: 2%{?date}%{?date:git}%{?rel}%{?dist} +Version: 4.3 +Release: 0.1.%{?date}%{?date:git}%{?rel}%{?dist} License: %{ffmpeg_license} URL: http://ffmpeg.org/ %if 0%{?date} @@ -91,7 +91,6 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2 %else Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz %endif -Patch0: fix_ppc_build.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})} @@ -320,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 @@ -427,6 +425,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir} %changelog +* Sat Feb 22 2020 Leigh Scott <leigh123linux(a)googlemail.com&gt; - 4.3-0.1.20200222git +- Update to 20200222git + * Tue Feb 04 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com&gt; - 4.2.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index accfe4e..2e9fc81 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ffmpeg-4.2.2.tar.xz) = 381cd6732fa699eb89000621cf34256920596ed1f9de3c2194dbad35fdf2165269eb7d3a147a0eb75dc18fbb6d601382b5801750e09fc63547766842f84208e3 +SHA512 (ffmpeg-20200222.tar.bz2) = 2a31ecffb01046d9520b86907024dbbcd4b7430bcf9988891b800230c9cb8e5391a7fe5d36d633dada1f5510068556d16ebb73ea6e7cdc07557b63699e736f7b