From 7bb6cb220549d06111693c9ea597dbec2c551aeb Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Mon, 8 Nov 2021 20:19:46 +0000 Subject: [PATCH] Update to 4.5-0.1.20211108git45dc668 --- .gitignore | 1 + ffmpeg-snapshot.sh | 6 +++--- ffmpeg.spec | 14 ++++++++------ sources | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index fe98ec5..fcac6bb 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ ffmpeg-*.rpm /ffmpeg-20210312.tar.bz2 /ffmpeg-20210323.tar.bz2 /ffmpeg-20210408.tar.bz2 +/ffmpeg-20211108.tar.bz2 diff --git a/ffmpeg-snapshot.sh b/ffmpeg-snapshot.sh index 47dc104..fcca980 100755 --- a/ffmpeg-snapshot.sh +++ b/ffmpeg-snapshot.sh @@ -17,7 +17,7 @@ date=$(date +%Y%m%d) pushd "$tmp" git clone git://git.ffmpeg.org/ffmpeg.git cd ffmpeg -git checkout release/4.4 -git rev-parse HEAD -git archive --prefix="ffmpeg-${date}/" --format=tar release/4.4 | bzip2 > "$pwd"/ffmpeg-${date}.tar.bz2 +#git checkout release/4.4 +#git rev-parse HEAD +git archive --prefix="ffmpeg-${date}/" --format=tar master | bzip2 > "$pwd"/ffmpeg-${date}.tar.bz2 popd diff --git a/ffmpeg.spec b/ffmpeg.spec index acee7fc..8496f80 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -1,9 +1,9 @@ # TODO: add make test to %%check section #global branch oldabi- -#global date 20210408 -#global commit 25e794a1ea13ad0ed9f5c4792ab3727fe7a3ace1 -#global rel %(c=%{commit}; echo ${c:0:7}) +%global date 20211108 +%global commit 45dc668aea0edac34969b5a1ff76cf9ad3a09be1 +%global rel %(c=%{commit}; echo ${c:0:7}) %ifarch %{ix86} # Fails due to asm issue @@ -111,8 +111,8 @@ ExclusiveArch: armv7hnl Summary: Digital VCR and streaming server Name: ffmpeg%{?flavor} -Version: 4.4.1 -Release: 1%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist} +Version: 4.5 +Release: 0.1%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist} License: %{ffmpeg_license} URL: http://ffmpeg.org/ %if 0%{?date} @@ -354,7 +354,6 @@ This package contains development files for %{name} %{!?_without_zvbi:--enable-libzvbi} \\\ %{!?_without_lv2:--enable-lv2} \\\ --enable-avfilter \\\ - --enable-avresample \\\ --enable-libmodplug \\\ --enable-postproc \\\ --enable-pthreads \\\ @@ -479,6 +478,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir} %changelog +* Mon Nov 08 2021 Leigh Scott - 4.5-0.1.20211108git45dc668 +- Update to 4.5-0.1.20211108git45dc668 + * Mon Oct 25 2021 Leigh Scott - 4.4.1-1 - Update to 4.4.1 release diff --git a/sources b/sources index 9b95ea9..7cea84a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ffmpeg-4.4.1.tar.xz) = c651c120b71db6991ffc54abc291986e7d35d776203af327f9a28853d1d0af468ca0956e2d3d893f55a211f70a40c041d5aa9aa9664ef581302b27494be9374e +SHA512 (ffmpeg-20211108.tar.bz2) = 69bffe02fbbb9c51dd60d8fb67a1863ce7c689c025d745f35911eff961534620382e44c88d7a2e7ed2380ef35af55fe1be89ea95f0e0f9be40c3735a55c36c66