commit a673ff08e68de2e19478e5653c5497f497e62d38 Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Mon Feb 27 22:24:09 2023 +0000 Update to 6.0 release ffmpeg-snapshot.sh | 4 ++-- ffmpeg.spec | 16 +++++++++++----- sources | 2 +- 3 files changed, 14 insertions(+), 8 deletions(-) --- diff --git a/ffmpeg-snapshot.sh b/ffmpeg-snapshot.sh index 0c9cc4e..48e5370 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/5.0 +git checkout release/6.0 git rev-parse HEAD -git archive --prefix="ffmpeg-${date}/" --format=tar release/5.0 | bzip2 > "$pwd"/ffmpeg-${date}.tar.bz2 +git archive --prefix="ffmpeg-${date}/" --format=tar release/6.0 | bzip2 > "$pwd"/ffmpeg-${date}.tar.bz2 popd diff --git a/ffmpeg.spec b/ffmpeg.spec index 897c0cd..4ed702c 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -1,8 +1,8 @@ # TODO: add make test to %%check section #global branch oldabi- -#global date 20220104 -#global commit 311ea9c529117fb8e38abd6ca7e81782b6b21257 +#global date 20230221 +#global commit 691d01989936d4b0681aa226aea8a19f06c04cea #global rel %(c=%{commit}; echo ${c:0:7}) %if 0%{?fedora} >= 37 || 0%{?rhel} >= 9 @@ -43,7 +43,8 @@ %global _without_vulkan 1 %endif %ifarch x86_64 -%global _with_mfx 1 +#global _with_mfx 1 +%global _with_vpl 1 %global _with_svtav1 1 %global _with_vapoursynth 1 %global _with_vmaf 1 @@ -110,8 +111,8 @@ ExclusiveArch: armv7hnl Summary: Digital VCR and streaming server Name: ffmpeg%{?flavor} -Version: 5.1.2 -Release: 9%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist} +Version: 6.0 +Release: 1%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist} License: %{ffmpeg_license} URL: http://ffmpeg.org/ %if 0%{?date} @@ -212,6 +213,7 @@ BuildRequires: pkgconfig(srt) BuildRequires: texinfo %{?_with_twolame:BuildRequires: twolame-devel} %{?_with_vmaf:BuildRequires: libvmaf-devel >= 1.5.2} +%{?_with_vpl:BuildRequires: pkgconfig(vpl) >= 2.6} %{?_with_wavpack:BuildRequires: wavpack-devel} %{!?_without_vidstab:BuildRequires: vid.stab-devel} %{!?_without_vulkan:BuildRequires: vulkan-loader-devel pkgconfig(shaderc)} @@ -416,6 +418,7 @@ cp -pr doc/examples/{*.c,Makefile,README} _doc/examples/ --cpu=%{_target_cpu} \ %endif %{?_with_mfx:--enable-libmfx} \ + %{?_with_vpl:--enable-libvpl} \ %ifarch %{ix86} x86_64 %{power64} --enable-runtime-cpudetect \ %endif @@ -520,6 +523,9 @@ strip %{buildroot}%{_libdir}/%{name}/libavcodec.so.* %changelog +* Tue Feb 21 2023 Leigh Scott <leigh123linux(a)gmail.com&gt; - 6.0-1 +- Update to 6.0 release + * Sun Jan 08 2023 Leigh Scott <leigh123linux(a)gmail.com&gt; - 5.1.2-9 - Enable libplacebo (rfbz#6549) diff --git a/sources b/sources index 7fc373f..9b86570 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ffmpeg-5.1.2.tar.xz) = 04d9ae2a0e9238c469941d2bb9929d59b58f4be3830846cf91b02a440da17803a04b147a4e0168c9ffd6f62ca82187508bc7b53255de9787a97168278e903b9b +SHA512 (ffmpeg-6.0.tar.xz) = 4d0e8f635d5a1633710f30cb3e0a854b6ca3bf85e33a289d1ec7aca2ad55dc4910010bc9cf3f13eee9f6decb9d50a0df6d7aa5a342f308c3868d2730f3a6b980